Merge tag 'upstream/3.21.90'

Upstream version 3.21.90

242 files changed, 28300 insertions, 25061 deletions

diff --git a/ABOUT-NLS b/ABOUT-NLS
new file mode 100644
index 0000000..1551426
--- /dev/null
+++ b/ABOUT-NLS
@@ -0,0 +1,1379 @@
+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 Jun 2014.
+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 bg bn bn_IN bs ca crh cs
+                        +---------------------------------------------------+
+     a2ps               |                       []                []     [] |
+     aegis              |                                                   |
+     anubis             |                                                   |
+     aspell             |                []                       []     [] |
+     bash               |                          []             []     [] |
+     bfd                |                                                   |
+     binutils           |                                         []        |
+     bison              |                                                   |
+     bison-runtime      |                []                                 |
+     buzztrax           |                                                [] |
+     ccd2cue            |                                                   |
+     ccide              |                                                   |
+     cflow              |                                                   |
+     clisp              |                                                   |
+     coreutils          |                                         []     [] |
+     cpio               |                                                   |
+     cppi               |                                                   |
+     cpplib             |                                         []        |
+     cryptsetup         |                                                [] |
+     datamash           |                                                   |
+     denemo             |                                         []     [] |
+     dfarc              |                                         []        |
+     dialog             |       []                                []     [] |
+     dico               |                                                   |
+     diffutils          |                                                [] |
+     dink               |                                         []        |
+     direvent           |                                                   |
+     doodle             |                                                [] |
+     dos2unix           |                                                   |
+     dos2unix-man       |                                                   |
+     e2fsprogs          |                                         []     [] |
+     enscript           |                                         []        |
+     exif               |                                                [] |
+     fetchmail          |                                         []     [] |
+     findutils          |                                                [] |
+     flex               |                                         []        |
+     freedink           |                                         []     [] |
+     fusionforge        |                                                   |
+     gas                |                                                   |
+     gawk               |                                         []        |
+     gcal               |                                         []        |
+     gcc                |                                                   |
+     gdbm               |                                                   |
+     gettext-examples   | []             []        []             []     [] |
+     gettext-runtime    |                          []             []     [] |
+     gettext-tools      |                          []             []        |
+     gjay               |                                                   |
+     glunarclock        |                []        []                    [] |
+     gnubiff            |                                                [] |
+     gnubik             |          []                                       |
+     gnucash            |          ()              ()             []        |
+     gnuchess           |                                                   |
+     gnulib             |                                                [] |
+     gnunet             |                                                   |
+     gnunet-gtk         |                                                   |
+     gold               |                                                   |
+     gphoto2            |                                                [] |
+     gprof              |                          []                       |
+     gramadoir          |                                                   |
+     grep               |                          []             []     [] |
+     grub               |                                         []        |
+     gsasl              |                                                   |
+     gss                |                                                   |
+     gst-plugins-bad    |                                                [] |
+     gst-plugins-base   |                          []             []     [] |
+     gst-plugins-good   |                          []             []     [] |
+     gst-plugins-ugly   |                          []             []     [] |
+     gstreamer          |                []        []             []     [] |
+     gtick              |                                                [] |
+     gtkam              |                       []                       [] |
+     gtkspell           | []             []     []                []     [] |
+     guix               |                                                   |
+     guix-packages      |                                                   |
+     gutenprint         |                                         []        |
+     hello              |                                         []        |
+     help2man           |                                                   |
+     help2man-texi      |                                                   |
+     hylafax            |                                                   |
+     idutils            |                                                   |
+     iso_15924          |                                                [] |
+     iso_3166           | []          []        [] [] []  []   [] [] []  [] |
+     iso_3166_2         |                                                   |
+     iso_4217           |                                                [] |
+     iso_639            |             [] []     [] [] []  []      [] []  [] |
+     iso_639_3          |                []                          []     |
+     iso_639_5          |                                                   |
+     jwhois             |                                                   |
+     kbd                |                                                [] |
+     klavaro            |          []              [] []          []     [] |
+     latrine            |                                                   |
+     ld                 |                          []                       |
+     leafpad            |                       [] []             []     [] |
+     libc               |                          []             []     [] |
+     libexif            |                       ()                          |
+     libextractor       |                                                   |
+     libgnutls          |                                                [] |
+     libgphoto2         |                                                [] |
+     libgphoto2_port    |                                                [] |
+     libgsasl           |                                                   |
+     libiconv           |                          []                    [] |
+     libidn             |                                                [] |
+     liferea            |          []    []                       []     [] |
+     lilypond           |                                         []     [] |
+     lordsawar          |                                         []        |
+     lprng              |                                                   |
+     lynx               |                                         []     [] |
+     m4                 |                                                [] |
+     mailfromd          |                                                   |
+     mailutils          |                                                   |
+     make               |                                                [] |
+     man-db             |                                         []     [] |
+     man-db-manpages    |                                                   |
+     midi-instruments   |          []                             []     [] |
+     minicom            |                                                [] |
+     mkisofs            |                                                [] |
+     myserver           |                                                [] |
+     nano               |                          []             []     [] |
+     opcodes            |                                                   |
+     parted             |                                                [] |
+     pies               |                                                   |
+     popt               |                                                [] |
+     procps-ng          |                                                   |
+     procps-ng-man      |                                                   |
+     psmisc             |                                                [] |
+     pspp               |                                         []        |
+     pushover           |                                                [] |
+     pwdutils           |                                                   |
+     pyspread           |                                                   |
+     radius             |                                         []        |
+     recode             |                       []                []     [] |
+     recutils           |                                                   |
+     rpm                |                                                   |
+     rush               |                                                   |
+     sarg               |                                                   |
+     sed                |                []                       []     [] |
+     sharutils          |                                                [] |
+     shishi             |                                                   |
+     skribilo           |                                                   |
+     solfege            |                                                [] |
+     solfege-manual     |                                                   |
+     spotmachine        |                                                   |
+     sudo               |                                         []     [] |
+     sudoers            |                                         []     [] |
+     sysstat            |                                                [] |
+     tar                |                          []             []     [] |
+     texinfo            |                                         []     [] |
+     texinfo_document   |                                         []        |
+     tigervnc           |                          []                       |
+     tin                |                                                   |
+     tin-man            |                                                   |
+     tracgoogleappsa... |                                                   |
+     trader             |                                                   |
+     util-linux         |                                                [] |
+     ve                 |                                                   |
+     vice               |                                                   |
+     vmm                |                                                   |
+     vorbis-tools       |                                                [] |
+     wastesedge         |                                                   |
+     wcd                |                                                   |
+     wcd-man            |                                                   |
+     wdiff              |                                         []     [] |
+     wget               |                                                [] |
+     wyslij-po          |                                                   |
+     xboard             |                                                   |
+     xdg-user-dirs      | []    []    [] []     [] []     []      [] []  [] |
+     xkeyboard-config   |                          []             []     [] |
+                        +---------------------------------------------------+
+                          af am an ar as ast az be bg bn bn_IN bs ca crh cs
+                           4  0  2  5  3 11   0  8 23  3   3    1 54  4  73
+
+                          da  de  el en en_GB en_ZA eo es et eu fa fi  fr
+                        +--------------------------------------------------+
+     a2ps               | []  []  []     []         [] [] []       []  []  |
+     aegis              | []  []                       []              []  |
+     anubis             | []  []                       []          []  []  |
+     aspell             | []  []         []         [] []          []  []  |
+     bash               |                           [] []              []  |
+     bfd                | []                           []          []  []  |
+     binutils           |                              []          []  []  |
+     bison              | []  []  []                [] [] []       []  []  |
+     bison-runtime      | []  []  []                [] [] []       []  []  |
+     buzztrax           | []  []                                   []  []  |
+     ccd2cue            | []  []                                       []  |
+     ccide              | []  []                    [] []          []  []  |
+     cflow              | []  []                    []             []  []  |
+     clisp              | []  []     []                []              []  |
+     coreutils          | []  []                       [] []           []  |
+     cpio               | []  []                       []          []  []  |
+     cppi               | []  []                    []             []  []  |
+     cpplib             | []  []                    [] []          []  []  |
+     cryptsetup         | []  []                       []          []  []  |
+     datamash           | []  []                    []                 []  |
+     denemo             | []                                               |
+     dfarc              | []  []                    [] []          []  []  |
+     dialog             | []  []  []                [] []    [] [] []  []  |
+     dico               | []  []                                   []  []  |
+     diffutils          | []  []  []                [] []              []  |
+     dink               | []  []                    [] []          []  []  |
+     direvent           | []  []                    []                 []  |
+     doodle             | []  []                    []             []      |
+     dos2unix           | []  []                    [] []              []  |
+     dos2unix-man       |     []                       []              []  |
+     e2fsprogs          | []  []                    [] []              []  |
+     enscript           | []  []         []         []             []  []  |
+     exif               | []  []                    [] []          []  []  |
+     fetchmail          | []  ()  []     []         [] []              []  |
+     findutils          | []  []  []                [] [] []       []  []  |
+     flex               | []  []                    [] []          []  []  |
+     freedink           | []  []  []                [] []    []    []  []  |
+     fusionforge        |     []                       []              []  |
+     gas                |                              []          []  []  |
+     gawk               | []  []                       []          []  []  |
+     gcal               | []  []                       []              []  |
+     gcc                |     []                       []                  |
+     gdbm               | []  []                    []             []  []  |
+     gettext-examples   | []  []  []                [] []          []  []  |
+     gettext-runtime    | []  []                    [] []          []  []  |
+     gettext-tools      | []  []                       []          []  []  |
+     gjay               |     []                    []             []  []  |
+     glunarclock        | []  []                    []             []  []  |
+     gnubiff            |     ()                    []             []  ()  |
+     gnubik             | []  []                    []             []  []  |
+     gnucash            | []  ()  ()     ()            ()          ()  ()  |
+     gnuchess           |     []                    [] []              []  |
+     gnulib             | []  []                    [] [] []       []  []  |
+     gnunet             |                              []                  |
+     gnunet-gtk         |     []                                           |
+     gold               |                              []          []  []  |
+     gphoto2            | []  ()                    []                 []  |
+     gprof              | []  []                    [] []          []  []  |
+     gramadoir          | []  []                    []             []  []  |
+     grep               | []  []                    [] [] []       []  []  |
+     grub               | []  []                       []          []  []  |
+     gsasl              | []  []                    []             []  []  |
+     gss                | []  []                    []             []  []  |
+     gst-plugins-bad    | []  []                                           |
+     gst-plugins-base   | []  []  []                   []          []  []  |
+     gst-plugins-good   | []  []  []                   []    []    []  []  |
+     gst-plugins-ugly   | []  []  []                [] []    []    []  []  |
+     gstreamer          | []  []  []                   []    []    []  []  |
+     gtick              | []  ()                    []             []  []  |
+     gtkam              | []  ()                    [] []          []  []  |
+     gtkspell           | []  []  []                [] []    []    []  []  |
+     guix               | []                        []                     |
+     guix-packages      |                                                  |
+     gutenprint         | []  []                                   []  []  |
+     hello              | []  []  []                [] [] []       []  []  |
+     help2man           | []  []  []                [] []          []  []  |
+     help2man-texi      |     []                       []              []  |
+     hylafax            |     []                       []                  |
+     idutils            | []  []                    []             []  []  |
+     iso_15924          | []  ()                    [] []    ()    []  ()  |
+     iso_3166           | []  ()  []                [] [] [] ()    []  ()  |
+     iso_3166_2         | []  ()                             ()        ()  |
+     iso_4217           | []  ()  []                   [] [] ()    []  ()  |
+     iso_639            | []  ()                    [] []    ()    []  ()  |
+     iso_639_3          |     ()                             ()        ()  |
+     iso_639_5          |     ()                             ()        ()  |
+     jwhois             |     []                    [] []          []  []  |
+     kbd                | []  []  []                [] []              []  |
+     klavaro            | []  []  []                [] []    []        []  |
+     latrine            | []  ()                    []             []      |
+     ld                 | []                           []          []  []  |
+     leafpad            | []  []  []                [] []    []    []  []  |
+     libc               | []  []                       []          []  []  |
+     libexif            | []  []         ()            []              []  |
+     libextractor       |     []                                           |
+     libgnutls          |     []                    []             []  []  |
+     libgphoto2         | []  ()                                       []  |
+     libgphoto2_port    | []  ()                       []    []    []  []  |
+     libgsasl           | []  []                    []             []  []  |
+     libiconv           | []  []                    [] [] []       []  []  |
+     libidn             | []  []                    []             []  []  |
+     liferea            | []  ()  []                   []    []    []  []  |
+     lilypond           | []  []  []                [] []              []  |
+     lordsawar          | []  []                                           |
+     lprng              |                                                  |
+     lynx               | []  []                    []    []       []  []  |
+     m4                 | []  []  []                []             []  []  |
+     mailfromd          |                                              []  |
+     mailutils          |     []                       []          []  []  |
+     make               | []  []                       []          []  []  |
+     man-db             | []  []                    []                 []  |
+     man-db-manpages    |     []                                       []  |
+     midi-instruments   | []  []  []                [] [] []    [] []  []  |
+     minicom            | []  []                       []          []  []  |
+     mkisofs            |                           []             []  []  |
+     myserver           |     []                    []             []  []  |
+     nano               | []  []                    [] []    []    []  []  |
+     opcodes            | []  []                       []          []  []  |
+     parted             | []  []                                       []  |
+     pies               |     []                                           |
+     popt               | []  []                    [] []          []  []  |
+     procps-ng          |     []                                       []  |
+     procps-ng-man      |     []                                       []  |
+     psmisc             | []  []  []                []       []    []  []  |
+     pspp               |     []                       []              []  |
+     pushover           |     ()                    [] []              []  |
+     pwdutils           | []  []                                       []  |
+     pyspread           | []  []                                       []  |
+     radius             |                              []              []  |
+     recode             | []  []  []                [] []          []  []  |
+     recutils           |     []                       []          []  []  |
+     rpm                | []  []                    []             []  []  |
+     rush               |     []                                   []  []  |
+     sarg               | []                                           []  |
+     sed                | []  []  []                [] [] []       []  []  |
+     sharutils          |     []                    []    []           []  |
+     shishi             |     []                                   []  []  |
+     skribilo           | []                                           []  |
+     solfege            | []  []                    [] [] []    [] []  []  |
+     solfege-manual     |     []                    [] [] []           []  |
+     spotmachine        | []  []                    []             []      |
+     sudo               | []  []                    [] []          []  []  |
+     sudoers            | []  []  []                []             []  []  |
+     sysstat            | []  []                    [] []          []  []  |
+     tar                | []  []                    [] [] []       []  []  |
+     texinfo            | []  []                    [] []              []  |
+     texinfo_document   |     []                    [] []              []  |
+     tigervnc           | []  []  []                []             []  []  |
+     tin                | []  []                          []           []  |
+     tin-man            |                []                                |
+     tracgoogleappsa... | []  []                    []             []  []  |
+     trader             | []  []         []         []             []  []  |
+     util-linux         | []  []                       []              []  |
+     ve                 |     []                    [] []          []  []  |
+     vice               | ()  ()                                       ()  |
+     vmm                |     []                                   []      |
+     vorbis-tools       | []  []                    []                 []  |
+     wastesedge         | []                                           ()  |
+     wcd                |     []                    [] []          []      |
+     wcd-man            |     []                                           |
+     wdiff              | []  []                    [] [] []       []  []  |
+     wget               |     []                    [] [] []       []  []  |
+     wyslij-po          |     []                    []             []  []  |
+     xboard             | []  []                       []              []  |
+     xdg-user-dirs      | []  []  []                [] [] [] [] [] []  []  |
+     xkeyboard-config   | []  []  []                [] []          []  []  |
+                        +--------------------------------------------------+
+                          da  de  el en en_GB en_ZA eo es et eu fa fi  fr
+                          120 130 32  1   6     0   94 95 22 13  4 103 136
+
+                          ga gd gl gu he hi hr hu hy ia id is it ja ka kk
+                        +-------------------------------------------------+
+     a2ps               |                   []          []    [] []       |
+     aegis              |                                     []          |
+     anubis             |                   [] []       []    []          |
+     aspell             | []                []          []    [] []       |
+     bash               |                               []    [] []       |
+     bfd                |                               []       []       |
+     binutils           |                               []    [] []       |
+     bison              |                   []                            |
+     bison-runtime      | []    []          [] []    [] []    [] []       |
+     buzztrax           |                                                 |
+     ccd2cue            |                      []                         |
+     ccide              |                   [] []                         |
+     cflow              | []                []          []                |
+     clisp              |                                                 |
+     coreutils          |                      []             [] []       |
+     cpio               | []                [] []       []    [] []       |
+     cppi               |       []          [] []             [] []       |
+     cpplib             |                               []       []       |
+     cryptsetup         |                                     []          |
+     datamash           |                                                 |
+     denemo             |                                     []          |
+     dfarc              |                   [] []             []          |
+     dialog             | [] [] []          [] []    [] [] [] [] []       |
+     dico               |                                                 |
+     diffutils          |                      []       []    [] []       |
+     dink               |                      []                         |
+     direvent           |                      []                         |
+     doodle             | []                                  []          |
+     dos2unix           |                      []                []       |
+     dos2unix-man       |                                                 |
+     e2fsprogs          |                               []                |
+     enscript           | []                []          []                |
+     exif               |       []          []          [] [] [] []       |
+     fetchmail          |                               []    [] []       |
+     findutils          | []    []          [] []       []    [] []       |
+     flex               | []                                              |
+     freedink           |                   [] []       []    []          |
+     fusionforge        |                                                 |
+     gas                |                               []                |
+     gawk               |                               []    () []       |
+     gcal               |                                                 |
+     gcc                |                                                 |
+     gdbm               |                                                 |
+     gettext-examples   | []    []          [] []       []    [] []       |
+     gettext-runtime    | []    []          [] []       []    [] []       |
+     gettext-tools      |                               []    [] []       |
+     gjay               |       []                                        |
+     glunarclock        | []    []          [] []       []    []          |
+     gnubiff            |                      []       []    ()          |
+     gnubik             |       []          []                []          |
+     gnucash            |          () () ()    ()             () []       |
+     gnuchess           |                                                 |
+     gnulib             | []    []             []             [] []       |
+     gnunet             |                                                 |
+     gnunet-gtk         |                                                 |
+     gold               |                               []    []          |
+     gphoto2            |                      []       []    [] []       |
+     gprof              | []                   []       []    []          |
+     gramadoir          | []                   []       []                |
+     grep               | []    []          [] []       []    [] []       |
+     grub               |       []             []             []          |
+     gsasl              | []                [] []       []    []          |
+     gss                | []                [] []       []    []          |
+     gst-plugins-bad    |                      []                         |
+     gst-plugins-base   |       []          [] []       []                |
+     gst-plugins-good   |       []          [] []       []    [] []       |
+     gst-plugins-ugly   |       []          [] []       []    [] []       |
+     gstreamer          |       []          [] []       []    []          |
+     gtick              | []    []             []       []    []          |
+     gtkam              |                      []       [] [] [] []       |
+     gtkspell           | []    []    []    [] [] []    [] [] [] []       |
+     guix               |                                                 |
+     guix-packages      |                                                 |
+     gutenprint         |       []             []             []          |
+     hello              | []    []          [] []       []                |
+     help2man           |                   []                [] []       |
+     help2man-texi      |                                                 |
+     hylafax            |                               []                |
+     idutils            |                      []       []                |
+     iso_15924          |       []             []    [] [] [] []          |
+     iso_3166           | []    [] [] [] [] [] []    [] [] [] [] []    [] |
+     iso_3166_2         |                               []    []          |
+     iso_4217           |                   [] []       [] [] [] []       |
+     iso_639            | []    [] []       [] []       [] [] [] []       |
+     iso_639_3          |       []                            []          |
+     iso_639_5          |                                                 |
+     jwhois             |       []             []       []    []          |
+     kbd                |                      []       []    []          |
+     klavaro            |       []          [] []             []       [] |
+     latrine            |                      []                         |
+     ld                 | []                            []    [] []       |
+     leafpad            | []    []    []    [] []       []    [] ()       |
+     libc               |       []          []          []    [] []       |
+     libexif            |                                     []          |
+     libextractor       |                                                 |
+     libgnutls          |                                     []          |
+     libgphoto2         |                                     [] []       |
+     libgphoto2_port    |                                     [] []       |
+     libgsasl           | []                   []       []    []          |
+     libiconv           | []    []          [] []       []    [] []       |
+     libidn             |                   [] []       []    []          |
+     liferea            |       []    []       []             [] []       |
+     lilypond           |                                     []          |
+     lordsawar          |                                                 |
+     lprng              |                               []                |
+     lynx               |                      []       []    [] []       |
+     m4                 | []    []          []          []       []       |
+     mailfromd          |                                                 |
+     mailutils          |                                                 |
+     make               |                   []          []    [] []       |
+     man-db             |                               []       []       |
+     man-db-manpages    |                               []       []       |
+     midi-instruments   |       []    []    [] [] []    [] [] [] []       |
+     minicom            |                      []       []       []       |
+     mkisofs            |                               []    []          |
+     myserver           |                                     []          |
+     nano               | []    []             []             [] []       |
+     opcodes            | []                            []    []          |
+     parted             |       []                      []    [] []       |
+     pies               |                                                 |
+     popt               | []    [] []       [] []    [] [] [] [] []       |
+     procps-ng          |                                                 |
+     procps-ng-man      |                                                 |
+     psmisc             |                   [] []       []    []          |
+     pspp               |       []                               []       |
+     pushover           |                                     []          |
+     pwdutils           |                               []                |
+     pyspread           |                                                 |
+     radius             |                               []                |
+     recode             | []    []    []    [] []       []    []          |
+     recutils           |                                                 |
+     rpm                |                               []                |
+     rush               |       []                                        |
+     sarg               |                                                 |
+     sed                | []    []          [] []       []    [] []       |
+     sharutils          |                                                 |
+     shishi             |                                                 |
+     skribilo           |                      []                         |
+     solfege            |       []                            []          |
+     solfege-manual     |                                                 |
+     spotmachine        |                                                 |
+     sudo               |       []          []                [] []       |
+     sudoers            |                   []                [] []       |
+     sysstat            |                      []       []       []       |
+     tar                | []                [] []       []    [] []       |
+     texinfo            |                   []          []    []          |
+     texinfo_document   |                      []             []          |
+     tigervnc           |                                                 |
+     tin                |                                                 |
+     tin-man            |                                                 |
+     tracgoogleappsa... |       []    []    [] []                         |
+     trader             |                   [] []                         |
+     util-linux         |                                        []       |
+     ve                 |                                     []          |
+     vice               |                      ()             ()          |
+     vmm                |                                                 |
+     vorbis-tools       |                   []          []                |
+     wastesedge         |                                     ()          |
+     wcd                |                                                 |
+     wcd-man            |                                                 |
+     wdiff              |       []             []             []          |
+     wget               |                      []             [] []       |
+     wyslij-po          |       []          []          []                |
+     xboard             |                                                 |
+     xdg-user-dirs      | [] [] [] [] [] [] [] []    [] [] [] [] []    [] |
+     xkeyboard-config   |       []             []       []    [] []       |
+                        +-------------------------------------------------+
+                          ga gd gl gu he hi hr hu hy ia id is it ja ka kk
+                          35  2 47  4  8  2 53 69  2  6 80 11 86 58  0  3
+
+                          kn ko ku ky lg lt lv mk ml mn mr ms mt nb ne nl
+                        +--------------------------------------------------+
+     a2ps               |                                  []          []  |
+     aegis              |                                              []  |
+     anubis             |                                  []    []    []  |
+     aspell             |                            []                []  |
+     bash               |                                        []    []  |
+     bfd                |                                                  |
+     binutils           |                                                  |
+     bison              |                                              []  |
+     bison-runtime      |          []    [] []             []    []    []  |
+     buzztrax           |                                                  |
+     ccd2cue            |                                                  |
+     ccide              |                   []                         []  |
+     cflow              |                                              []  |
+     clisp              |                                              []  |
+     coreutils          |                                        []    []  |
+     cpio               |                                              []  |
+     cppi               |                                                  |
+     cpplib             |                                              []  |
+     cryptsetup         |                                              []  |
+     datamash           |                                        []    []  |
+     denemo             |                                                  |
+     dfarc              |                      []                      []  |
+     dialog             |       []       [] []             []    []    []  |
+     dico               |                                                  |
+     diffutils          |                   []                   []    []  |
+     dink               |                                              []  |
+     direvent           |                                              []  |
+     doodle             |                                              []  |
+     dos2unix           |                                        []    []  |
+     dos2unix-man       |                                              []  |
+     e2fsprogs          |                                              []  |
+     enscript           |                                              []  |
+     exif               |                   []                         []  |
+     fetchmail          |                                              []  |
+     findutils          |                                        []    []  |
+     flex               |                                              []  |
+     freedink           |                                        []    []  |
+     fusionforge        |                                                  |
+     gas                |                                                  |
+     gawk               |                                              []  |
+     gcal               |                                                  |
+     gcc                |                                                  |
+     gdbm               |                                                  |
+     gettext-examples   |          []       []             [] [] []    []  |
+     gettext-runtime    |    []                                        []  |
+     gettext-tools      |    []                                            |
+     gjay               |                                                  |
+     glunarclock        |                   []                         []  |
+     gnubiff            |                                              []  |
+     gnubik             |                                        []    []  |
+     gnucash            | () ()          () ()          ()       () () []  |
+     gnuchess           |                                        []    []  |
+     gnulib             |                                              []  |
+     gnunet             |                                                  |
+     gnunet-gtk         |                                                  |
+     gold               |                                                  |
+     gphoto2            |                                              []  |
+     gprof              |                                  []          []  |
+     gramadoir          |                                              []  |
+     grep               |                                        []    []  |
+     grub               |                []                      []    []  |
+     gsasl              |                                              []  |
+     gss                |                                                  |
+     gst-plugins-bad    |                                        []    []  |
+     gst-plugins-base   |                   []                   []    []  |
+     gst-plugins-good   |                [] []                   []    []  |
+     gst-plugins-ugly   |                   []             [] [] []    []  |
+     gstreamer          |                []                            []  |
+     gtick              |                                              []  |
+     gtkam              |                                        []    []  |
+     gtkspell           |          []    [] []       []    []    []    []  |
+     guix               |                                                  |
+     guix-packages      |                                                  |
+     gutenprint         |                                              []  |
+     hello              |                   []                   []    []  |
+     help2man           |                                        []        |
+     help2man-texi      |                                                  |
+     hylafax            |                                              []  |
+     idutils            |                                              []  |
+     iso_15924          |                () []                         []  |
+     iso_3166           | [] [] []       () [] [] []    []       []    []  |
+     iso_3166_2         |                ()                            []  |
+     iso_4217           |                () []                   []    []  |
+     iso_639            | [] []          () []    []    []             []  |
+     iso_639_3          | []             ()             []                 |
+     iso_639_5          |                ()                                |
+     jwhois             |                   []                         []  |
+     kbd                |                                              []  |
+     klavaro            |                                        []    []  |
+     latrine            |                                                  |
+     ld                 |                                                  |
+     leafpad            |    []    []    [] []                         []  |
+     libc               |    []                                        []  |
+     libexif            |                                              []  |
+     libextractor       |                                              []  |
+     libgnutls          |                                  []          []  |
+     libgphoto2         |                                              []  |
+     libgphoto2_port    |                                              []  |
+     libgsasl           |                                              []  |
+     libiconv           |                []                            []  |
+     libidn             |                                              []  |
+     liferea            |                [] []                         []  |
+     lilypond           |                                              []  |
+     lordsawar          |                                                  |
+     lprng              |                                                  |
+     lynx               |                                              []  |
+     m4                 |                                              []  |
+     mailfromd          |                                                  |
+     mailutils          |                                                  |
+     make               |    []                                        []  |
+     man-db             |                                              []  |
+     man-db-manpages    |                                              []  |
+     midi-instruments   |    [] []       []          []    []       [] []  |
+     minicom            |                                        []        |
+     mkisofs            |                                              []  |
+     myserver           |                                                  |
+     nano               |                                  []    []    []  |
+     opcodes            |                                              []  |
+     parted             |                                              []  |
+     pies               |                                                  |
+     popt               | [] []             []                   []    []  |
+     procps-ng          |                                                  |
+     procps-ng-man      |                                                  |
+     psmisc             |                                              []  |
+     pspp               |                []                            []  |
+     pushover           |                                                  |
+     pwdutils           |                                              []  |
+     pyspread           |                                                  |
+     radius             |                                              []  |
+     recode             |                                        []    []  |
+     recutils           |                                              []  |
+     rpm                |                                              []  |
+     rush               |                                              []  |
+     sarg               |                                                  |
+     sed                |                                        []    []  |
+     sharutils          |                                              []  |
+     shishi             |                                                  |
+     skribilo           |                                                  |
+     solfege            |                                        []    []  |
+     solfege-manual     |                                              []  |
+     spotmachine        |                                              []  |
+     sudo               |                                        []    []  |
+     sudoers            |                                        []    []  |
+     sysstat            |                                        []    []  |
+     tar                |          []                            []    []  |
+     texinfo            |                                              []  |
+     texinfo_document   |                                              []  |
+     tigervnc           |                                              []  |
+     tin                |                                                  |
+     tin-man            |                                                  |
+     tracgoogleappsa... |                   []                   []    []  |
+     trader             |                                        []        |
+     util-linux         |                                              []  |
+     ve                 |                                              []  |
+     vice               |                                              []  |
+     vmm                |                                              []  |
+     vorbis-tools       |                                              []  |
+     wastesedge         |                                              []  |
+     wcd                |                                              []  |
+     wcd-man            |                                              []  |
+     wdiff              |                                              []  |
+     wget               |                                        []    []  |
+     wyslij-po          |                                              []  |
+     xboard             |                                              []  |
+     xdg-user-dirs      | [] [] [] []    [] [] [] []    []       []    []  |
+     xkeyboard-config   |    []          []                            []  |
+                        +--------------------------------------------------+
+                          kn ko ku ky lg lt lv mk ml mn mr ms mt nb ne nl
+                           5 11  4  6  0 13 22  3  3  3  4 11  2 40  1 124
+
+                          nn or os pa pl  ps pt pt_BR ro ru rw sk sl sq sr
+                        +--------------------------------------------------+
+     a2ps               |             []     []  []   [] []       []    [] |
+     aegis              |                        []      []                |
+     anubis             |             []                 []             [] |
+     aspell             |             []         []   [] []    [] []    [] |
+     bash               |             []                 []    [] []    [] |
+     bfd                |                                []                |
+     binutils           |                                []             [] |
+     bison              |             []         []                     [] |
+     bison-runtime      |             []     []  []   [] []       [] [] [] |
+     buzztrax           |                                                  |
+     ccd2cue            |                        []                        |
+     ccide              |             []                 []             [] |
+     cflow              |             []                                [] |
+     clisp              |                                []                |
+     coreutils          |             []                 []       []    [] |
+     cpio               |             []                 []             [] |
+     cppi               |             []         []                     [] |
+     cpplib             |                        []      []             [] |
+     cryptsetup         |             []                                [] |
+     datamash           |                        []                     [] |
+     denemo             |                                                  |
+     dfarc              |             []         []                     [] |
+     dialog             |             []         []   [] []    [] []    [] |
+     dico               |             []                                   |
+     diffutils          |             []                                [] |
+     dink               |                                                  |
+     direvent           |             []         []                        |
+     doodle             |                                            [] [] |
+     dos2unix           |             []         []      []             [] |
+     dos2unix-man       |             []         []                        |
+     e2fsprogs          |             []                                   |
+     enscript           |             []         []   [] []       []    [] |
+     exif               |             []         []   [] []    []       [] |
+     fetchmail          |             []                 []          []    |
+     findutils          |             []         []      []       []    [] |
+     flex               |             []         []   [] []             [] |
+     freedink           |             []         []      []       []    [] |
+     fusionforge        |                                                  |
+     gas                |                                                  |
+     gawk               |             []                                   |
+     gcal               |                                                  |
+     gcc                |                                                  |
+     gdbm               |             []         []                     [] |
+     gettext-examples   |             []     []  []   [] []    [] []    [] |
+     gettext-runtime    | []          []     []  []   [] []    [] []    [] |
+     gettext-tools      |             []         []   [] []    [] []    [] |
+     gjay               |                                               [] |
+     glunarclock        |             []         []   []       [] []    [] |
+     gnubiff            |                                               [] |
+     gnubik             |             []         []               []    [] |
+     gnucash            |             ()         ()   () ()             [] |
+     gnuchess           |                        []                     [] |
+     gnulib             |             []         []      []       []    [] |
+     gnunet             |                                                  |
+     gnunet-gtk         |                                                  |
+     gold               |                                                  |
+     gphoto2            |             []         []   [] []             [] |
+     gprof              |                        []   [] []             [] |
+     gramadoir          |                                      []       [] |
+     grep               |             []         []      []    [] []    [] |
+     grub               |             []         []      []       []    [] |
+     gsasl              |             []                       []       [] |
+     gss                |             []              []       []       [] |
+     gst-plugins-bad    |             []         []      []             [] |
+     gst-plugins-base   |             []         []      []    [] []    [] |
+     gst-plugins-good   |             []         []   [] []    [] []    [] |
+     gst-plugins-ugly   |             []         []   [] []    [] []    [] |
+     gstreamer          |             []         []   [] []    [] []    [] |
+     gtick              |             []         []      []    []       [] |
+     gtkam              |          [] []         []      []    []       [] |
+     gtkspell           |             []     []  []   [] []    [] [] [] [] |
+     guix               |                                                  |
+     guix-packages      |                                                  |
+     gutenprint         |                                      [] []       |
+     hello              |             []         []      []    [] []    [] |
+     help2man           |             []         []      []             [] |
+     help2man-texi      |             []                                   |
+     hylafax            |                                                  |
+     idutils            |             []                 []             [] |
+     iso_15924          |             []     ()       [] []       []    [] |
+     iso_3166           | [] []    [] []     ()  []   [] [] [] [] [] [] [] |
+     iso_3166_2         |             []     ()                         [] |
+     iso_4217           | []          []     ()       [] [] []    []    [] |
+     iso_639            |    []    [] []     ()       [] [] [] [] []    [] |
+     iso_639_3          |          []        ()                            |
+     iso_639_5          |                    ()                         [] |
+     jwhois             |             []         []   []                [] |
+     kbd                |             []                 []                |
+     klavaro            |          [] []         []      []       []       |
+     latrine            |                        []                        |
+     ld                 |                                                  |
+     leafpad            | []    []    []     []  []      []    [] []    [] |
+     libc               |             []                 []    []          |
+     libexif            |             []         ()            []          |
+     libextractor       |             []                                   |
+     libgnutls          |             []                                   |
+     libgphoto2         |             []                                   |
+     libgphoto2_port    |             []         []      []    []       [] |
+     libgsasl           |             []              []       []       [] |
+     libiconv           |             []         []            [] []    [] |
+     libidn             |             []         []                     [] |
+     liferea            |             []     []  []   [] ()    []    []    |
+     lilypond           |                                                  |
+     lordsawar          |                                                  |
+     lprng              |             []                                   |
+     lynx               |                        []      []                |
+     m4                 |             []         []   [] []             [] |
+     mailfromd          |             []                                   |
+     mailutils          |             []                                   |
+     make               |             []         []      []                |
+     man-db             |             []                 []             [] |
+     man-db-manpages    |             []                 []             [] |
+     midi-instruments   |             []     []  []   [] []    [] []    [] |
+     minicom            |             []         []   [] []                |
+     mkisofs            |             []                 []             [] |
+     myserver           |                                         []    [] |
+     nano               |             []         []   [] []       []    [] |
+     opcodes            |                                                  |
+     parted             |             []         []      []    [] []    [] |
+     pies               |             []                                   |
+     popt               |             []     []  []      []       []    [] |
+     procps-ng          |             []                                   |
+     procps-ng-man      |             []                                   |
+     psmisc             |             []         []      []             [] |
+     pspp               |             []                 []                |
+     pushover           |                                                  |
+     pwdutils           |             []                                   |
+     pyspread           | []                     []                        |
+     radius             |             []                 []                |
+     recode             |             []     []  []   [] []    [] []    [] |
+     recutils           |                                               [] |
+     rpm                |             []                                   |
+     rush               |             []         []                     [] |
+     sarg               |                        []      []                |
+     sed                |             []     []  []   [] []    [] []    [] |
+     sharutils          |             []         []                     [] |
+     shishi             |             []                                [] |
+     skribilo           |                                                  |
+     solfege            |             []         []      []                |
+     solfege-manual     |             []         []                        |
+     spotmachine        |                        []                     [] |
+     sudo               |             []         []      []    [] []    [] |
+     sudoers            |             []         []               []    [] |
+     sysstat            |             []         []      []    []       [] |
+     tar                |             []         []      []       []    [] |
+     texinfo            |             []         []      []                |
+     texinfo_document   |             []         []                        |
+     tigervnc           |                        []                        |
+     tin                |                                []                |
+     tin-man            |                                                  |
+     tracgoogleappsa... |             []         []      []             [] |
+     trader             |                                []                |
+     util-linux         |             []         []                        |
+     ve                 |             []         []                     [] |
+     vice               |                                                  |
+     vmm                |                                                  |
+     vorbis-tools       |             []                          []    [] |
+     wastesedge         |                                                  |
+     wcd                |                                                  |
+     wcd-man            |                                                  |
+     wdiff              |             []         []      []       []    [] |
+     wget               |             []         []      []    []          |
+     wyslij-po          | []          []         []                     [] |
+     xboard             |             []                 []             [] |
+     xdg-user-dirs      | [] []    [] []  [] []  []   [] []    [] [] [] [] |
+     xkeyboard-config   |             []         []      []       []       |
+                        +--------------------------------------------------+
+                          nn or os pa pl  ps pt pt_BR ro ru rw sk sl sq sr
+                           7  3  1  6 114  1 12  83   32 80  3 38 45  7 94
+
+                          sv sw ta te tg th tr uk  ur vi  wa wo zh_CN zh_HK
+                        +---------------------------------------------------+
+     a2ps               | []             [] [] []     []                    |
+     aegis              |                             []                    |
+     anubis             | []                [] []     []                    |
+     aspell             |                      []     []  []     []         |
+     bash               | []                   []     []         []         |
+     bfd                |                      []     []                    |
+     binutils           | []                   []     []                    |
+     bison              | []                   []     []         []         |
+     bison-runtime      | []             [] [] []     []         []         |
+     buzztrax           | []                          []         []         |
+     ccd2cue            |                      []     []         []         |
+     ccide              | []                   []     []         []         |
+     cflow              | []                   []     []         []         |
+     clisp              |                                                   |
+     coreutils          | []                   []     []         []         |
+     cpio               | []                [] []     []         []         |
+     cppi               | []                   []     []         []         |
+     cpplib             | []                [] []     []         []         |
+     cryptsetup         |                      []     []         []         |
+     datamash           | []                   []     []                    |
+     denemo             |                                                   |
+     dfarc              |                             []                    |
+     dialog             | [] []          []           []  []     []         |
+     dico               |                      []                           |
+     diffutils          | []                [] []     []         []         |
+     dink               |                                                   |
+     direvent           |                      []     []                    |
+     doodle             | []                          []                    |
+     dos2unix           | []                   []     []         []         |
+     dos2unix-man       | []                   []                []         |
+     e2fsprogs          | []                   []     []         []         |
+     enscript           | []                [] []     []                    |
+     exif               | []                [] []     []         []         |
+     fetchmail          | []                []        []         []         |
+     findutils          | []                [] []     []         []         |
+     flex               | []                []        []         []         |
+     freedink           |                []           []                    |
+     fusionforge        |                                                   |
+     gas                |                      []                           |
+     gawk               | []                          []                    |
+     gcal               | []                []                              |
+     gcc                | []                                     []         |
+     gdbm               |                      []     []                    |
+     gettext-examples   | []                [] []     []         []    []   |
+     gettext-runtime    | []                [] []     []         []    []   |
+     gettext-tools      | []                [] []     []         []         |
+     gjay               |                []           []                    |
+     glunarclock        | []                          []  []     []         |
+     gnubiff            | []                          []                    |
+     gnubik             | []                   []     []         []         |
+     gnucash            |       () ()              () ()         []         |
+     gnuchess           |                      []     []                    |
+     gnulib             | []                   []     []         []         |
+     gnunet             |                                                   |
+     gnunet-gtk         |                                                   |
+     gold               |                      []     []                    |
+     gphoto2            | []                   []     []         []         |
+     gprof              | []                [] []     []                    |
+     gramadoir          | []                          []         []         |
+     grep               | []             []    []     []         []         |
+     grub               | []                [] []     []                    |
+     gsasl              | []                   []     []         []         |
+     gss                | []                          []         []         |
+     gst-plugins-bad    | []                   []     []         []         |
+     gst-plugins-base   | []                [] []     []         []         |
+     gst-plugins-good   | []                [] []     []         []         |
+     gst-plugins-ugly   | []                [] []     []         []         |
+     gstreamer          | []                [] []     []         []         |
+     gtick              |                      []     []         []         |
+     gtkam              | []                   []     []         []         |
+     gtkspell           | []             [] [] []     []  []     []    []   |
+     guix               |                             []                    |
+     guix-packages      |                                                   |
+     gutenprint         |                   [] []     []         []         |
+     hello              | []             [] [] []     []         []         |
+     help2man           |                      []     []         []         |
+     help2man-texi      |                      []                           |
+     hylafax            |                             []                    |
+     idutils            |                      []     []         []         |
+     iso_15924          | []             () [] []     ()         []         |
+     iso_3166           | []       []    () [] []     ()  []     []    []   |
+     iso_3166_2         |                () [] []     ()         []         |
+     iso_4217           | []             () [] []     ()         []    []   |
+     iso_639            | []    [] []    () [] []     ()  []     []    []   |
+     iso_639_3          |       []       () [] []     ()                    |
+     iso_639_5          |                ()    []     ()                    |
+     jwhois             | []                []        []         []         |
+     kbd                |                      []     []         []         |
+     klavaro            | []                   []  [] []     []  []         |
+     latrine            |                             []         []         |
+     ld                 | []                [] []     []         []         |
+     leafpad            | []             [] [] []     []         []         |
+     libc               | []                [] []     []         []         |
+     libexif            |                             []         ()         |
+     libextractor       |                      []     []                    |
+     libgnutls          | []                   []     []         []         |
+     libgphoto2         |                      []     []                    |
+     libgphoto2_port    | []                   []     []         []         |
+     libgsasl           | []                   []     []         []         |
+     libiconv           | []                   []     []  []     []         |
+     libidn             | ()                   []     []         []         |
+     liferea            | []                [] []     []         []         |
+     lilypond           |                             []                    |
+     lordsawar          |                                                   |
+     lprng              |                             []                    |
+     lynx               | []                [] []     []                    |
+     m4                 | []                          []         []         |
+     mailfromd          |                      []     []                    |
+     mailutils          |                             []                    |
+     make               | []                   []     []         []         |
+     man-db             |                             []         []         |
+     man-db-manpages    |                                        []         |
+     midi-instruments   | []             [] [] []     []         []         |
+     minicom            | []                          []                    |
+     mkisofs            |                      []     []         []         |
+     myserver           |                             []                    |
+     nano               | []                   []     []         []         |
+     opcodes            |                      []     []         []         |
+     parted             | []                [] []     []         []         |
+     pies               |                      []     []                    |
+     popt               | []    []       [] [] []     []         []         |
+     procps-ng          |                      []     []                    |
+     procps-ng-man      |                      []                           |
+     psmisc             | []                   []     []         []         |
+     pspp               |                   [] []                []         |
+     pushover           | []                                                |
+     pwdutils           | []                          []                    |
+     pyspread           |                      []                           |
+     radius             |                      []     []                    |
+     recode             | []                []        []         []         |
+     recutils           | []                   []     []                    |
+     rpm                | []                   []     []         []         |
+     rush               |                      []     []                    |
+     sarg               |                                                   |
+     sed                | []                [] []     []         []         |
+     sharutils          |                      []     []         []         |
+     shishi             |                             []         []         |
+     skribilo           | []                                                |
+     solfege            |                   []        []         []         |
+     solfege-manual     |                   []                              |
+     spotmachine        | []                   []     []                    |
+     sudo               |                   [] []     []         []         |
+     sudoers            |                      []     []         []         |
+     sysstat            | []                [] []     []         []         |
+     tar                | []                [] []     []         []         |
+     texinfo            |                   [] []     []                    |
+     texinfo_document   |                      []                           |
+     tigervnc           | []                   []                           |
+     tin                |                                        []         |
+     tin-man            |                                                   |
+     tracgoogleappsa... | []             []    []     []         []         |
+     trader             | []                                                |
+     util-linux         |                      []     []         []         |
+     ve                 | []                   []     []         []         |
+     vice               | ()                ()                              |
+     vmm                |                                                   |
+     vorbis-tools       | []                          []                    |
+     wastesedge         |                                                   |
+     wcd                |                      []     []         []         |
+     wcd-man            |                      []                           |
+     wdiff              | []                   []     []         []         |
+     wget               |                      []     []         []         |
+     wyslij-po          |                      []     []                    |
+     xboard             |                      []                           |
+     xdg-user-dirs      | []    [] []    [] [] []     []         []    []   |
+     xkeyboard-config   | []                [] []     []                    |
+                        +---------------------------------------------------+
+                          sv sw ta te tg th tr uk  ur vi  wa wo zh_CN zh_HK
+                          91  1  4  3  0 13 50 113  1 126  7  1  95     7
+
+                          zh_TW
+                        +-------+
+     a2ps               |       | 30
+     aegis              |       |  9
+     anubis             |       | 19
+     aspell             |       | 28
+     bash               |  []   | 21
+     bfd                |       |  9
+     binutils           |       | 12
+     bison              |  []   | 18
+     bison-runtime      |  []   | 38
+     buzztrax           |       |  8
+     ccd2cue            |       |  8
+     ccide              |       | 17
+     cflow              |       | 15
+     clisp              |       | 10
+     coreutils          |       | 20
+     cpio               |       | 20
+     cppi               |       | 17
+     cpplib             |  []   | 19
+     cryptsetup         |       | 13
+     datamash           |       | 11
+     denemo             |       |  4
+     dfarc              |       | 16
+     dialog             |  []   | 42
+     dico               |       |  6
+     diffutils          |       | 21
+     dink               |       |  9
+     direvent           |       | 10
+     doodle             |       | 12
+     dos2unix           |  []   | 18
+     dos2unix-man       |       |  9
+     e2fsprogs          |       | 14
+     enscript           |       | 21
+     exif               |       | 26
+     fetchmail          |       | 19
+     findutils          |       | 28
+     flex               |  []   | 19
+     freedink           |       | 23
+     fusionforge        |       |  3
+     gas                |       |  5
+     gawk               |       | 12
+     gcal               |       |  7
+     gcc                |       |  4
+     gdbm               |       | 10
+     gettext-examples   |  []   | 40
+     gettext-runtime    |  []   | 34
+     gettext-tools      |  []   | 24
+     gjay               |       |  8
+     glunarclock        |  []   | 27
+     gnubiff            |       |  9
+     gnubik             |       | 19
+     gnucash            |  ()   |  7
+     gnuchess           |       | 10
+     gnulib             |       | 23
+     gnunet             |       |  1
+     gnunet-gtk         |       |  1
+     gold               |       |  7
+     gphoto2            |  []   | 19
+     gprof              |       | 21
+     gramadoir          |       | 14
+     grep               |  []   | 31
+     grub               |       | 21
+     gsasl              |  []   | 19
+     gss                |       | 17
+     gst-plugins-bad    |       | 14
+     gst-plugins-base   |       | 27
+     gst-plugins-good   |       | 32
+     gst-plugins-ugly   |       | 34
+     gstreamer          |  []   | 31
+     gtick              |       | 19
+     gtkam              |       | 24
+     gtkspell           |  []   | 48
+     guix               |       |  3
+     guix-packages      |       |  0
+     gutenprint         |       | 15
+     hello              |  []   | 30
+     help2man           |       | 18
+     help2man-texi      |       |  5
+     hylafax            |       |  5
+     idutils            |       | 14
+     iso_15924          |  []   | 23
+     iso_3166           |  []   | 58
+     iso_3166_2         |       |  9
+     iso_4217           |  []   | 28
+     iso_639            |  []   | 46
+     iso_639_3          |       | 10
+     iso_639_5          |       |  2
+     jwhois             |  []   | 20
+     kbd                |       | 16
+     klavaro            |       | 30
+     latrine            |       |  7
+     ld                 |  []   | 15
+     leafpad            |  []   | 40
+     libc               |  []   | 24
+     libexif            |       |  9
+     libextractor       |       |  5
+     libgnutls          |       | 13
+     libgphoto2         |       |  9
+     libgphoto2_port    |  []   | 19
+     libgsasl           |       | 18
+     libiconv           |  []   | 29
+     libidn             |       | 17
+     liferea            |       | 29
+     lilypond           |       | 11
+     lordsawar          |       |  3
+     lprng              |       |  3
+     lynx               |       | 19
+     m4                 |  []   | 22
+     mailfromd          |       |  4
+     mailutils          |       |  6
+     make               |       | 19
+     man-db             |       | 14
+     man-db-manpages    |       |  9
+     midi-instruments   |  []   | 43
+     minicom            |  []   | 17
+     mkisofs            |       | 13
+     myserver           |       |  9
+     nano               |  []   | 29
+     opcodes            |       | 12
+     parted             |  []   | 21
+     pies               |       |  4
+     popt               |  []   | 36
+     procps-ng          |       |  5
+     procps-ng-man      |       |  4
+     psmisc             |  []   | 22
+     pspp               |       | 13
+     pushover           |       |  6
+     pwdutils           |       |  8
+     pyspread           |       |  6
+     radius             |       |  9
+     recode             |       | 31
+     recutils           |       |  9
+     rpm                |  []   | 13
+     rush               |       | 10
+     sarg               |       |  4
+     sed                |  []   | 34
+     sharutils          |       | 12
+     shishi             |       |  7
+     skribilo           |       |  4
+     solfege            |       | 19
+     solfege-manual     |       |  9
+     spotmachine        |       | 10
+     sudo               |       | 24
+     sudoers            |       | 20
+     sysstat            |       | 22
+     tar                |  []   | 30
+     texinfo            |       | 17
+     texinfo_document   |       | 11
+     tigervnc           |       | 11
+     tin                |  []   |  7
+     tin-man            |       |  1
+     tracgoogleappsa... |  []   | 22
+     trader             |       | 11
+     util-linux         |       | 12
+     ve                 |       | 14
+     vice               |       |  1
+     vmm                |       |  3
+     vorbis-tools       |       | 13
+     wastesedge         |       |  2
+     wcd                |       |  8
+     wcd-man            |       |  3
+     wdiff              |  []   | 23
+     wget               |       | 19
+     wyslij-po          |       | 14
+     xboard             |       |  9
+     xdg-user-dirs      |  []   | 68
+     xkeyboard-config   |  []   | 27
+                        +-------+
+       90 teams           zh_TW
+      166 domains          42    2748
+
+   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 Jun 2014 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 Lesser 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/Makefile.in b/Makefile.in
index eb5a76e..4fafb73 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -85,11 +85,17 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/gsettings.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/yelp.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/appstream-xml.m4 \
+	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gsettings.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/nls.m4 \
+	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/yelp.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
@@ -156,8 +162,9 @@ ETAGS = etags
 CTAGS = ctags
 CSCOPE = cscope
 DIST_SUBDIRS = $(SUBDIRS)
-am__DIST_COMMON = $(srcdir)/Makefile.in COPYING NEWS compile depcomp \
-	install-sh missing
+am__DIST_COMMON = $(srcdir)/Makefile.in ABOUT-NLS COPYING NEWS compile \
+	config.guess config.rpath config.sub depcomp install-sh \
+	missing
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -201,9 +208,9 @@ am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
   | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
 distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
-ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+APPSTREAM_UTIL = @APPSTREAM_UTIL@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -223,10 +230,12 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
 GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
 GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 HELP_DIR = @HELP_DIR@
@@ -235,24 +244,23 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
-INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
-INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
-INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 ITSTOOL = @ITSTOOL@
 LDFLAGS = @LDFLAGS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LN_S = @LN_S@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
@@ -268,6 +276,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+POSUB = @POSUB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SIMPLE_SCAN_CFLAGS = @SIMPLE_SCAN_CFLAGS@
@@ -277,6 +287,8 @@ USE_NLS = @USE_NLS@
 VALAC = @VALAC@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 XMLLINT = @XMLLINT@
 YELP_LC_DIST = @YELP_LC_DIST@
 YELP_LC_MEDIA_LINKS = @YELP_LC_MEDIA_LINKS@
@@ -290,8 +302,13 @@ am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
+appstreamxmldir = @appstreamxmldir@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -299,13 +316,15 @@ docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gsettingsschemadir = @gsettingsschemadir@
+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@
-intltool__v_merge_options_ = @intltool__v_merge_options_@
-intltool__v_merge_options_0 = @intltool__v_merge_options_0@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
diff --git a/NEWS b/NEWS
index b9bda2a..91fd02e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+Overview of changes in simple-scan 3.21.90
+
+  * Use recent features of gettext, dropping intltool
+
 Overview of changes in simple-scan 3.21.1
 
   * Updated translations
diff --git a/aclocal.m4 b/aclocal.m4
index 73c4d59..a370d2f 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1224,8 +1224,16 @@ AC_DEFUN([AM_PROG_VALAC],
       m4_default([$2], [:])
     fi])
 
+m4_include([m4/appstream-xml.m4])
+m4_include([m4/gettext.m4])
 m4_include([m4/gsettings.m4])
-m4_include([m4/intltool.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/nls.m4])
 m4_include([m4/pkg.m4])
+m4_include([m4/po.m4])
+m4_include([m4/progtest.m4])
 m4_include([m4/yelp.m4])
diff --git a/autogen.sh b/autogen.sh
index 2f4d7e6..aaf9fdb 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -19,7 +19,6 @@ fi
 
 set -x
 aclocal --install || exit 1
-intltoolize --force --copy --automake || exit 1
 autoreconf --verbose --force --install -Wno-portability || exit 1
 { set +x; } 2>/dev/null
 
diff --git a/config.guess b/config.guess
new file mode 100755
index 0000000..0967f2a
--- /dev/null
+++ b/config.guess
@@ -0,0 +1,1454 @@
+#! /bin/sh
+# Attempt to guess a canonical system name.
+#   Copyright 1992-2016 Free Software Foundation, Inc.
+
+timestamp='2016-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
+# 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 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 Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
+#
+# 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
+#
+# Please send patches to <config-patches@gnu.org>.
+
+
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION]
+
+Output the configuration name of the system \`$me' is run on.
+
+Operation modes:
+  -h, --help         print this help, then exit
+  -t, --time-stamp   print date of last modification, then exit
+  -v, --version      print version number, then exit
+
+Report bugs and patches to <config-patches@gnu.org>."
+
+version="\
+GNU config.guess ($timestamp)
+
+Originally written by Per Bothner.
+Copyright 1992-2016 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."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+  case $1 in
+    --time-stamp | --time* | -t )
+       echo "$timestamp" ; exit ;;
+    --version | -v )
+       echo "$version" ; exit ;;
+    --help | --h* | -h )
+       echo "$usage"; exit ;;
+    -- )     # Stop option processing
+       shift; break ;;
+    - )	# Use stdin as input.
+       break ;;
+    -* )
+       echo "$me: invalid option $1$help" >&2
+       exit 1 ;;
+    * )
+       break ;;
+  esac
+done
+
+if test $# != 0; then
+  echo "$me: too many arguments$help" >&2
+  exit 1
+fi
+
+trap 'exit 1' 1 2 15
+
+# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
+# compiler to aid in system detection is discouraged as it requires
+# temporary files to be created and, as you can see below, it is a
+# headache to deal with in a portable fashion.
+
+# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
+# use `HOST_CC' if defined, but it is deprecated.
+
+# Portable tmp directory creation inspired by the Autoconf team.
+
+set_cc_for_build='
+trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
+: ${TMPDIR=/tmp} ;
+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
+dummy=$tmp/dummy ;
+tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
+case $CC_FOR_BUILD,$HOST_CC,$CC in
+ ,,)    echo "int x;" > $dummy.c ;
+	for c in cc gcc c89 c99 ; do
+	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
+	     CC_FOR_BUILD="$c"; break ;
+	  fi ;
+	done ;
+	if test x"$CC_FOR_BUILD" = x ; then
+	  CC_FOR_BUILD=no_compiler_found ;
+	fi
+	;;
+ ,,*)   CC_FOR_BUILD=$CC ;;
+ ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
+esac ; set_cc_for_build= ;'
+
+# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
+# (ghazi@noc.rutgers.edu 1994-08-24)
+if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
+	PATH=$PATH:/.attbin ; export PATH
+fi
+
+UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
+UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
+UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
+UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+
+case "${UNAME_SYSTEM}" in
+Linux|GNU|GNU/*)
+	# If the system lacks a compiler, then just pick glibc.
+	# We could probably try harder.
+	LIBC=gnu
+
+	eval $set_cc_for_build
+	cat <<-EOF > $dummy.c
+	#include <features.h>
+	#if defined(__UCLIBC__)
+	LIBC=uclibc
+	#elif defined(__dietlibc__)
+	LIBC=dietlibc
+	#else
+	LIBC=gnu
+	#endif
+	EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
+	;;
+esac
+
+# Note: order is significant - the case branches are not exclusive.
+
+case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+    *:NetBSD:*:*)
+	# NetBSD (nbsd) targets should (where applicable) match one or
+	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
+	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
+	# switched to ELF, *-*-netbsd* would select the old
+	# object file format.  This provides both forward
+	# compatibility and a consistent mechanism for selecting the
+	# object file format.
+	#
+	# Note: NetBSD doesn't particularly care about the vendor
+	# portion of the name.  We always set it to "unknown".
+	sysctl="sysctl -n hw.machine_arch"
+	UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
+	    /sbin/$sysctl 2>/dev/null || \
+	    /usr/sbin/$sysctl 2>/dev/null || \
+	    echo unknown)`
+	case "${UNAME_MACHINE_ARCH}" in
+	    armeb) machine=armeb-unknown ;;
+	    arm*) machine=arm-unknown ;;
+	    sh3el) machine=shl-unknown ;;
+	    sh3eb) machine=sh-unknown ;;
+	    sh5el) machine=sh5le-unknown ;;
+	    earmv*)
+		arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
+		endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'`
+		machine=${arch}${endian}-unknown
+		;;
+	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
+	esac
+	# The Operating System including object format, if it has switched
+	# to ELF recently, or will in the future.
+	case "${UNAME_MACHINE_ARCH}" in
+	    arm*|earm*|i386|m68k|ns32k|sh3*|sparc|vax)
+		eval $set_cc_for_build
+		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
+			| grep -q __ELF__
+		then
+		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
+		    # Return netbsd for either.  FIX?
+		    os=netbsd
+		else
+		    os=netbsdelf
+		fi
+		;;
+	    *)
+		os=netbsd
+		;;
+	esac
+	# Determine ABI tags.
+	case "${UNAME_MACHINE_ARCH}" in
+	    earm*)
+		expr='s/^earmv[0-9]/-eabi/;s/eb$//'
+		abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"`
+		;;
+	esac
+	# The OS release
+	# Debian GNU/NetBSD machines have a different userland, and
+	# thus, need a distinct triplet. However, they do not need
+	# kernel version information, so it can be replaced with a
+	# suitable tag, in the style of linux-gnu.
+	case "${UNAME_VERSION}" in
+	    Debian*)
+		release='-gnu'
+		;;
+	    *)
+		release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2`
+		;;
+	esac
+	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
+	# contains redundant information, the shorter form:
+	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
+	echo "${machine}-${os}${release}${abi}"
+	exit ;;
+    *:Bitrig:*:*)
+	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
+	echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
+	exit ;;
+    *:OpenBSD:*:*)
+	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 ;;
+    *:SolidBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+	exit ;;
+    macppc:MirBSD:*:*)
+	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
+	exit ;;
+    *:MirBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+	exit ;;
+    *:Sortix:*:*)
+	echo ${UNAME_MACHINE}-unknown-sortix
+	exit ;;
+    alpha:OSF1:*:*)
+	case $UNAME_RELEASE in
+	*4.0)
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
+		;;
+	*5.*)
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+		;;
+	esac
+	# According to Compaq, /usr/sbin/psrinfo has been available on
+	# OSF/1 and Tru64 systems produced since 1995.  I hope that
+	# covers most systems running today.  This code pipes the CPU
+	# types through head -n 1, so we only detect the type of CPU 0.
+	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 ;;
+	    "EV4.5 (21064)")
+		UNAME_MACHINE=alpha ;;
+	    "LCA4 (21066/21068)")
+		UNAME_MACHINE=alpha ;;
+	    "EV5 (21164)")
+		UNAME_MACHINE=alphaev5 ;;
+	    "EV5.6 (21164A)")
+		UNAME_MACHINE=alphaev56 ;;
+	    "EV5.6 (21164PC)")
+		UNAME_MACHINE=alphapca56 ;;
+	    "EV5.7 (21164PC)")
+		UNAME_MACHINE=alphapca57 ;;
+	    "EV6 (21264)")
+		UNAME_MACHINE=alphaev6 ;;
+	    "EV6.7 (21264A)")
+		UNAME_MACHINE=alphaev67 ;;
+	    "EV6.8CB (21264C)")
+		UNAME_MACHINE=alphaev68 ;;
+	    "EV6.8AL (21264B)")
+		UNAME_MACHINE=alphaev68 ;;
+	    "EV6.8CX (21264D)")
+		UNAME_MACHINE=alphaev68 ;;
+	    "EV6.9A (21264/EV69A)")
+		UNAME_MACHINE=alphaev69 ;;
+	    "EV7 (21364)")
+		UNAME_MACHINE=alphaev7 ;;
+	    "EV7.9 (21364A)")
+		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`
+	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
+	exitcode=$?
+	trap '' 0
+	exit $exitcode ;;
+    Alpha\ *:Windows_NT*:*)
+	# How do we know it's Interix rather than the generic POSIX subsystem?
+	# Should we change UNAME_MACHINE based on the output of uname instead
+	# of the specific Alpha model?
+	echo alpha-pc-interix
+	exit ;;
+    21064:Windows_NT:50:3)
+	echo alpha-dec-winnt3.5
+	exit ;;
+    Amiga*:UNIX_System_V:4.0:*)
+	echo m68k-unknown-sysv4
+	exit ;;
+    *:[Aa]miga[Oo][Ss]:*:*)
+	echo ${UNAME_MACHINE}-unknown-amigaos
+	exit ;;
+    *:[Mm]orph[Oo][Ss]:*:*)
+	echo ${UNAME_MACHINE}-unknown-morphos
+	exit ;;
+    *:OS/390:*:*)
+	echo i370-ibm-openedition
+	exit ;;
+    *:z/VM:*:*)
+	echo s390-ibm-zvmoe
+	exit ;;
+    *:OS400:*:*)
+	echo powerpc-ibm-os400
+	exit ;;
+    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
+	echo arm-acorn-riscix${UNAME_RELEASE}
+	exit ;;
+    arm*:riscos:*:*|arm*:RISCOS:*:*)
+	echo arm-unknown-riscos
+	exit ;;
+    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
+	echo hppa1.1-hitachi-hiuxmpp
+	exit ;;
+    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
+	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
+	if test "`(/bin/universe) 2>/dev/null`" = att ; then
+		echo pyramid-pyramid-sysv3
+	else
+		echo pyramid-pyramid-bsd
+	fi
+	exit ;;
+    NILE*:*:*:dcosx)
+	echo pyramid-pyramid-svr4
+	exit ;;
+    DRS?6000:unix:4.0:6*)
+	echo sparc-icl-nx6
+	exit ;;
+    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
+	case `/usr/bin/uname -p` in
+	    sparc) echo sparc-icl-nx7; exit ;;
+	esac ;;
+    s390x:SunOS:*:*)
+	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    sun4H:SunOS:5.*:*)
+	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
+	echo i386-pc-auroraux${UNAME_RELEASE}
+	exit ;;
+    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+	eval $set_cc_for_build
+	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 (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
+		(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+		grep IS_64BIT_ARCH >/dev/null
+	    then
+		SUN_ARCH=x86_64
+	    fi
+	fi
+	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    sun4*:SunOS:6*:*)
+	# According to config.sub, this is the proper way to canonicalize
+	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
+	# it's likely to be more like Solaris than SunOS4.
+	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    sun4*:SunOS:*:*)
+	case "`/usr/bin/arch -k`" in
+	    Series*|S4*)
+		UNAME_RELEASE=`uname -v`
+		;;
+	esac
+	# Japanese Language versions have a version number like `4.1.3-JL'.
+	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
+	exit ;;
+    sun3*:SunOS:*:*)
+	echo m68k-sun-sunos${UNAME_RELEASE}
+	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
+	case "`/bin/arch`" in
+	    sun3)
+		echo m68k-sun-sunos${UNAME_RELEASE}
+		;;
+	    sun4)
+		echo sparc-sun-sunos${UNAME_RELEASE}
+		;;
+	esac
+	exit ;;
+    aushp:SunOS:*:*)
+	echo sparc-auspex-sunos${UNAME_RELEASE}
+	exit ;;
+    # The situation for MiNT is a little confusing.  The machine name
+    # can be virtually everything (everything which is not
+    # "atarist" or "atariste" at least should have a processor
+    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
+    # to the lowercase version "mint" (or "freemint").  Finally
+    # the system name "TOS" denotes a system which is actually not
+    # MiNT.  But MiNT is downward compatible to TOS, so this should
+    # be no problem.
+    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
+	echo m68k-atari-mint${UNAME_RELEASE}
+	exit ;;
+    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
+	echo m68k-atari-mint${UNAME_RELEASE}
+	exit ;;
+    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
+	echo m68k-atari-mint${UNAME_RELEASE}
+	exit ;;
+    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
+	echo m68k-milan-mint${UNAME_RELEASE}
+	exit ;;
+    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
+	echo m68k-hades-mint${UNAME_RELEASE}
+	exit ;;
+    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
+	echo m68k-unknown-mint${UNAME_RELEASE}
+	exit ;;
+    m68k:machten:*:*)
+	echo m68k-apple-machten${UNAME_RELEASE}
+	exit ;;
+    powerpc:machten:*:*)
+	echo powerpc-apple-machten${UNAME_RELEASE}
+	exit ;;
+    RISC*:Mach:*:*)
+	echo mips-dec-mach_bsd4.3
+	exit ;;
+    RISC*:ULTRIX:*:*)
+	echo mips-dec-ultrix${UNAME_RELEASE}
+	exit ;;
+    VAX*:ULTRIX*:*:*)
+	echo vax-dec-ultrix${UNAME_RELEASE}
+	exit ;;
+    2020:CLIX:*:* | 2430:CLIX:*:*)
+	echo clipper-intergraph-clix${UNAME_RELEASE}
+	exit ;;
+    mips:*:*:UMIPS | mips:*:*:RISCos)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+#ifdef __cplusplus
+#include <stdio.h>  /* for printf() prototype */
+	int main (int argc, char *argv[]) {
+#else
+	int main (argc, argv) int argc; char *argv[]; {
+#endif
+	#if defined (host_mips) && defined (MIPSEB)
+	#if defined (SYSTYPE_SYSV)
+	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
+	#endif
+	#if defined (SYSTYPE_SVR4)
+	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
+	#endif
+	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
+	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
+	#endif
+	#endif
+	  exit (-1);
+	}
+EOF
+	$CC_FOR_BUILD -o $dummy $dummy.c &&
+	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
+	  SYSTEM_NAME=`$dummy $dummyarg` &&
+	    { echo "$SYSTEM_NAME"; exit; }
+	echo mips-mips-riscos${UNAME_RELEASE}
+	exit ;;
+    Motorola:PowerMAX_OS:*:*)
+	echo powerpc-motorola-powermax
+	exit ;;
+    Motorola:*:4.3:PL8-*)
+	echo powerpc-harris-powermax
+	exit ;;
+    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
+	echo powerpc-harris-powermax
+	exit ;;
+    Night_Hawk:Power_UNIX:*:*)
+	echo powerpc-harris-powerunix
+	exit ;;
+    m88k:CX/UX:7*:*)
+	echo m88k-harris-cxux7
+	exit ;;
+    m88k:*:4*:R4*)
+	echo m88k-motorola-sysv4
+	exit ;;
+    m88k:*:3*:R3*)
+	echo m88k-motorola-sysv3
+	exit ;;
+    AViiON:dgux:*:*)
+	# DG/UX returns AViiON for all architectures
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
+	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
+	then
+	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
+	       [ ${TARGET_BINARY_INTERFACE}x = x ]
+	    then
+		echo m88k-dg-dgux${UNAME_RELEASE}
+	    else
+		echo m88k-dg-dguxbcs${UNAME_RELEASE}
+	    fi
+	else
+	    echo i586-dg-dgux${UNAME_RELEASE}
+	fi
+	exit ;;
+    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
+	echo m88k-dolphin-sysv3
+	exit ;;
+    M88*:*:R3*:*)
+	# Delta 88k system running SVR3
+	echo m88k-motorola-sysv3
+	exit ;;
+    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
+	echo m88k-tektronix-sysv3
+	exit ;;
+    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
+	echo m68k-tektronix-bsd
+	exit ;;
+    *:IRIX*:*:*)
+	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
+	exit ;;
+    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
+	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
+	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
+    i*86:AIX:*:*)
+	echo i386-ibm-aix
+	exit ;;
+    ia64:AIX:*:*)
+	if [ -x /usr/bin/oslevel ] ; then
+		IBM_REV=`/usr/bin/oslevel`
+	else
+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+	fi
+	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
+	exit ;;
+    *:AIX:2:3)
+	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
+		eval $set_cc_for_build
+		sed 's/^		//' << EOF >$dummy.c
+		#include <sys/systemcfg.h>
+
+		main()
+			{
+			if (!__power_pc())
+				exit(1);
+			puts("powerpc-ibm-aix3.2.5");
+			exit(0);
+			}
+EOF
+		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
+		then
+			echo "$SYSTEM_NAME"
+		else
+			echo rs6000-ibm-aix3.2.5
+		fi
+	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
+		echo rs6000-ibm-aix3.2.4
+	else
+		echo rs6000-ibm-aix3.2
+	fi
+	exit ;;
+    *:AIX:*:[4567])
+	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
+	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+		IBM_ARCH=rs6000
+	else
+		IBM_ARCH=powerpc
+	fi
+	if [ -x /usr/bin/lslpp ] ; then
+		IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
+			   awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
+	else
+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+	fi
+	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
+	exit ;;
+    *:AIX:*:*)
+	echo rs6000-ibm-aix
+	exit ;;
+    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
+	echo romp-ibm-bsd4.4
+	exit ;;
+    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
+	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
+	exit ;;                             # report: romp-ibm BSD 4.3
+    *:BOSX:*:*)
+	echo rs6000-bull-bosx
+	exit ;;
+    DPX/2?00:B.O.S.:*:*)
+	echo m68k-bull-sysv3
+	exit ;;
+    9000/[34]??:4.3bsd:1.*:*)
+	echo m68k-hp-bsd
+	exit ;;
+    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
+	echo m68k-hp-bsd4.4
+	exit ;;
+    9000/[34678]??:HP-UX:*:*)
+	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+	case "${UNAME_MACHINE}" in
+	    9000/31? )            HP_ARCH=m68000 ;;
+	    9000/[34]?? )         HP_ARCH=m68k ;;
+	    9000/[678][0-9][0-9])
+		if [ -x /usr/bin/getconf ]; then
+		    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
+		      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
+			esac ;;
+		    esac
+		fi
+		if [ "${HP_ARCH}" = "" ]; then
+		    eval $set_cc_for_build
+		    sed 's/^		//' << EOF >$dummy.c
+
+		#define _HPUX_SOURCE
+		#include <stdlib.h>
+		#include <unistd.h>
+
+		int main ()
+		{
+		#if defined(_SC_KERNEL_BITS)
+		    long bits = sysconf(_SC_KERNEL_BITS);
+		#endif
+		    long cpu  = sysconf (_SC_CPU_VERSION);
+
+		    switch (cpu)
+			{
+			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+			case CPU_PA_RISC2_0:
+		#if defined(_SC_KERNEL_BITS)
+			    switch (bits)
+				{
+				case 64: puts ("hppa2.0w"); break;
+				case 32: puts ("hppa2.0n"); break;
+				default: puts ("hppa2.0"); break;
+				} break;
+		#else  /* !defined(_SC_KERNEL_BITS) */
+			    puts ("hppa2.0"); break;
+		#endif
+			default: puts ("hppa1.0"); break;
+			}
+		    exit (0);
+		}
+EOF
+		    (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 ]
+	then
+	    eval $set_cc_for_build
+
+	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
+	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
+	    # generating 64-bit code.  GNU and HP use different nomenclature:
+	    #
+	    # $ CC_FOR_BUILD=cc ./config.guess
+	    # => hppa2.0w-hp-hpux11.23
+	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
+	    # => hppa64-hp-hpux11.23
+
+	    if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) |
+		grep -q __LP64__
+	    then
+		HP_ARCH=hppa2.0w
+	    else
+		HP_ARCH=hppa64
+	    fi
+	fi
+	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
+	exit ;;
+    ia64:HP-UX:*:*)
+	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+	echo ia64-hp-hpux${HPUX_REV}
+	exit ;;
+    3050*:HI-UX:*:*)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#include <unistd.h>
+	int
+	main ()
+	{
+	  long cpu = sysconf (_SC_CPU_VERSION);
+	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
+	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
+	     results, however.  */
+	  if (CPU_IS_PA_RISC (cpu))
+	    {
+	      switch (cpu)
+		{
+		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
+		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
+		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
+		  default: puts ("hppa-hitachi-hiuxwe2"); break;
+		}
+	    }
+	  else if (CPU_IS_HP_MC68K (cpu))
+	    puts ("m68k-hitachi-hiuxwe2");
+	  else puts ("unknown-hitachi-hiuxwe2");
+	  exit (0);
+	}
+EOF
+	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
+		{ echo "$SYSTEM_NAME"; exit; }
+	echo unknown-hitachi-hiuxwe2
+	exit ;;
+    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
+	echo hppa1.1-hp-bsd
+	exit ;;
+    9000/8??:4.3bsd:*:*)
+	echo hppa1.0-hp-bsd
+	exit ;;
+    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
+	echo hppa1.0-hp-mpeix
+	exit ;;
+    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
+	echo hppa1.1-hp-osf
+	exit ;;
+    hp8??:OSF1:*:*)
+	echo hppa1.0-hp-osf
+	exit ;;
+    i*86:OSF1:*:*)
+	if [ -x /usr/sbin/sysversion ] ; then
+	    echo ${UNAME_MACHINE}-unknown-osf1mk
+	else
+	    echo ${UNAME_MACHINE}-unknown-osf1
+	fi
+	exit ;;
+    parisc*:Lites*:*:*)
+	echo hppa1.1-hp-lites
+	exit ;;
+    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
+	echo c1-convex-bsd
+	exit ;;
+    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
+	if getsysinfo -f scalar_acc
+	then echo c32-convex-bsd
+	else echo c2-convex-bsd
+	fi
+	exit ;;
+    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
+	echo c34-convex-bsd
+	exit ;;
+    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
+	echo c38-convex-bsd
+	exit ;;
+    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
+	echo c4-convex-bsd
+	exit ;;
+    CRAY*Y-MP:*:*:*)
+	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*[A-Z]90:*:*:*)
+	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
+	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
+	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
+	      -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*TS:*:*:*)
+	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*T3E:*:*:*)
+	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*SV1:*:*:*)
+	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    *:UNICOS/mp:*:*)
+	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_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/ /_/'`
+	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	exit ;;
+    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
+	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+	exit ;;
+    sparc*:BSD/OS:*:*)
+	echo sparc-unknown-bsdi${UNAME_RELEASE}
+	exit ;;
+    *:BSD/OS:*:*)
+	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+	exit ;;
+    *:FreeBSD:*:*)
+	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/[-(].*//'` ;;
+	esac
+	exit ;;
+    i*:CYGWIN*:*)
+	echo ${UNAME_MACHINE}-pc-cygwin
+	exit ;;
+    *:MINGW64*:*)
+	echo ${UNAME_MACHINE}-pc-mingw64
+	exit ;;
+    *:MINGW*:*)
+	echo ${UNAME_MACHINE}-pc-mingw32
+	exit ;;
+    *:MSYS*:*)
+	echo ${UNAME_MACHINE}-pc-msys
+	exit ;;
+    i*:windows32*:*)
+	# uname -m includes "-pc" on this system.
+	echo ${UNAME_MACHINE}-mingw32
+	exit ;;
+    i*:PW*:*)
+	echo ${UNAME_MACHINE}-pc-pw32
+	exit ;;
+    *:Interix*:*)
+	case ${UNAME_MACHINE} in
+	    x86)
+		echo i586-pc-interix${UNAME_RELEASE}
+		exit ;;
+	    authenticamd | genuineintel | EM64T)
+		echo x86_64-unknown-interix${UNAME_RELEASE}
+		exit ;;
+	    IA64)
+		echo ia64-unknown-interix${UNAME_RELEASE}
+		exit ;;
+	esac ;;
+    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
+	echo i${UNAME_MACHINE}-pc-mks
+	exit ;;
+    8664:Windows_NT:*)
+	echo x86_64-pc-mks
+	exit ;;
+    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
+	# How do we know it's Interix rather than the generic POSIX subsystem?
+	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
+	# UNAME_MACHINE based on the output of uname instead of i386?
+	echo i586-pc-interix
+	exit ;;
+    i*:UWIN*:*)
+	echo ${UNAME_MACHINE}-pc-uwin
+	exit ;;
+    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
+	echo x86_64-unknown-cygwin
+	exit ;;
+    p*:CYGWIN*:*)
+	echo powerpcle-unknown-cygwin
+	exit ;;
+    prep*:SunOS:5.*:*)
+	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    *:GNU:*:*)
+	# the GNU system
+	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+	exit ;;
+    *:GNU/*:*:*)
+	# other systems with GNU libc and userland
+	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
+	exit ;;
+    aarch64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    aarch64_be:Linux:*:*)
+	UNAME_MACHINE=aarch64_be
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    alpha:Linux:*:*)
+	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+	  EV5)   UNAME_MACHINE=alphaev5 ;;
+	  EV56)  UNAME_MACHINE=alphaev56 ;;
+	  PCA56) UNAME_MACHINE=alphapca56 ;;
+	  PCA57) UNAME_MACHINE=alphapca56 ;;
+	  EV6)   UNAME_MACHINE=alphaev6 ;;
+	  EV67)  UNAME_MACHINE=alphaev67 ;;
+	  EV68*) UNAME_MACHINE=alphaev68 ;;
+	esac
+	objdump --private-headers /bin/sh | grep -q ld.so.1
+	if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    arc:Linux:*:* | arceb:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    arm*:Linux:*:*)
+	eval $set_cc_for_build
+	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+	    | grep -q __ARM_EABI__
+	then
+	    echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	else
+	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+		| grep -q __ARM_PCS_VFP
+	    then
+		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
+	    else
+		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
+	    fi
+	fi
+	exit ;;
+    avr32*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    cris:Linux:*:*)
+	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
+	exit ;;
+    crisv32:Linux:*:*)
+	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
+	exit ;;
+    e2k:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    frv:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    hexagon:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    i*86:Linux:*:*)
+	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
+	exit ;;
+    ia64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    k1om:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    m32r*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    m68*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    mips:Linux:*:* | mips64:Linux:*:*)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#undef CPU
+	#undef ${UNAME_MACHINE}
+	#undef ${UNAME_MACHINE}el
+	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+	CPU=${UNAME_MACHINE}el
+	#else
+	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+	CPU=${UNAME_MACHINE}
+	#else
+	CPU=
+	#endif
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
+	;;
+    openrisc*:Linux:*:*)
+	echo or1k-unknown-linux-${LIBC}
+	exit ;;
+    or32:Linux:*:* | or1k*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    padre:Linux:*:*)
+	echo sparc-unknown-linux-${LIBC}
+	exit ;;
+    parisc64:Linux:*:* | hppa64:Linux:*:*)
+	echo hppa64-unknown-linux-${LIBC}
+	exit ;;
+    parisc:Linux:*:* | hppa:Linux:*:*)
+	# Look for CPU level
+	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+	  PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
+	  PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
+	  *)    echo hppa-unknown-linux-${LIBC} ;;
+	esac
+	exit ;;
+    ppc64:Linux:*:*)
+	echo powerpc64-unknown-linux-${LIBC}
+	exit ;;
+    ppc:Linux:*:*)
+	echo powerpc-unknown-linux-${LIBC}
+	exit ;;
+    ppc64le:Linux:*:*)
+	echo powerpc64le-unknown-linux-${LIBC}
+	exit ;;
+    ppcle:Linux:*:*)
+	echo powerpcle-unknown-linux-${LIBC}
+	exit ;;
+    s390:Linux:*:* | s390x:Linux:*:*)
+	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
+	exit ;;
+    sh64*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    sh*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    sparc:Linux:*:* | sparc64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    tile*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    vax:Linux:*:*)
+	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
+	exit ;;
+    x86_64:Linux:*:*)
+	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
+	exit ;;
+    xtensa*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    i*86:DYNIX/ptx:4*:*)
+	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+	# earlier versions are messed up and put the nodename in both
+	# sysname and nodename.
+	echo i386-sequent-sysv4
+	exit ;;
+    i*86:UNIX_SV:4.2MP:2.*)
+	# Unixware is an offshoot of SVR4, but it has its own version
+	# number series starting with 2...
+	# I am not positive that other SVR4 systems won't match this,
+	# I just have to hope.  -- rms.
+	# Use sysv4.2uw... so that sysv4* matches it.
+	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
+	exit ;;
+    i*86:OS/2:*:*)
+	# If we were able to find `uname', then EMX Unix compatibility
+	# is probably installed.
+	echo ${UNAME_MACHINE}-pc-os2-emx
+	exit ;;
+    i*86:XTS-300:*:STOP)
+	echo ${UNAME_MACHINE}-unknown-stop
+	exit ;;
+    i*86:atheos:*:*)
+	echo ${UNAME_MACHINE}-unknown-atheos
+	exit ;;
+    i*86:syllable:*:*)
+	echo ${UNAME_MACHINE}-pc-syllable
+	exit ;;
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
+	echo i386-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    i*86:*DOS:*:*)
+	echo ${UNAME_MACHINE}-pc-msdosdjgpp
+	exit ;;
+    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
+	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
+	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
+		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
+	else
+		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
+	fi
+	exit ;;
+    i*86:*:5:[678]*)
+	# UnixWare 7.x, OpenUNIX and OpenServer 6.
+	case `/bin/uname -X | grep "^Machine"` in
+	    *486*)	     UNAME_MACHINE=i486 ;;
+	    *Pentium)	     UNAME_MACHINE=i586 ;;
+	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
+	esac
+	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
+	exit ;;
+    i*86:*:3.2:*)
+	if test -f /usr/options/cb.name; then
+		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
+		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
+	elif /bin/uname -X 2>/dev/null >/dev/null ; then
+		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
+		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
+		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
+			&& UNAME_MACHINE=i586
+		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
+			&& UNAME_MACHINE=i686
+		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
+			&& UNAME_MACHINE=i686
+		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
+	else
+		echo ${UNAME_MACHINE}-pc-sysv32
+	fi
+	exit ;;
+    pc:*:*:*)
+	# Left here for compatibility:
+	# 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 configure will decide that
+	# this is a cross-build.
+	echo i586-pc-msdosdjgpp
+	exit ;;
+    Intel:Mach:3*:*)
+	echo i386-pc-mach3
+	exit ;;
+    paragon:*:*:*)
+	echo i860-intel-osf1
+	exit ;;
+    i860:*:4.*:*) # i860-SVR4
+	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
+	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
+	else # Add other i860-SVR4 vendors below as they are discovered.
+	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
+	fi
+	exit ;;
+    mini*:CTIX:SYS*5:*)
+	# "miniframe"
+	echo m68010-convergent-sysv
+	exit ;;
+    mc68k:UNIX:SYSTEM5:3.51m)
+	echo m68k-convergent-sysv
+	exit ;;
+    M680?0:D-NIX:5.3:*)
+	echo m68k-diab-dnix
+	exit ;;
+    M68*:*:R3V[5678]*:*)
+	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
+    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
+	OS_REL=''
+	test -r /etc/.relid \
+	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	  && { echo i486-ncr-sysv4; exit; } ;;
+    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
+	OS_REL='.3'
+	test -r /etc/.relid \
+	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
+	echo m68k-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    mc68030:UNIX_System_V:4.*:*)
+	echo m68k-atari-sysv4
+	exit ;;
+    TSUNAMI:LynxOS:2.*:*)
+	echo sparc-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    rs6000:LynxOS:2.*:*)
+	echo rs6000-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
+	echo powerpc-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    SM[BE]S:UNIX_SV:*:*)
+	echo mips-dde-sysv${UNAME_RELEASE}
+	exit ;;
+    RM*:ReliantUNIX-*:*:*)
+	echo mips-sni-sysv4
+	exit ;;
+    RM*:SINIX-*:*:*)
+	echo mips-sni-sysv4
+	exit ;;
+    *:SINIX-*:*:*)
+	if uname -p 2>/dev/null >/dev/null ; then
+		UNAME_MACHINE=`(uname -p) 2>/dev/null`
+		echo ${UNAME_MACHINE}-sni-sysv4
+	else
+		echo ns32k-sni-sysv
+	fi
+	exit ;;
+    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+			# says <Richard.M.Bartel@ccMail.Census.GOV>
+	echo i586-unisys-sysv4
+	exit ;;
+    *:UNIX_System_V:4*:FTX*)
+	# From Gerald Hewes <hewes@openmarket.com>.
+	# How about differentiating between stratus architectures? -djm
+	echo hppa1.1-stratus-sysv4
+	exit ;;
+    *:*:*:FTX*)
+	# From seanf@swdc.stratus.com.
+	echo i860-stratus-sysv4
+	exit ;;
+    i*86:VOS:*:*)
+	# From Paul.Green@stratus.com.
+	echo ${UNAME_MACHINE}-stratus-vos
+	exit ;;
+    *:VOS:*:*)
+	# From Paul.Green@stratus.com.
+	echo hppa1.1-stratus-vos
+	exit ;;
+    mc68*:A/UX:*:*)
+	echo m68k-apple-aux${UNAME_RELEASE}
+	exit ;;
+    news*:NEWS-OS:6*:*)
+	echo mips-sony-newsos6
+	exit ;;
+    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
+	if [ -d /usr/nec ]; then
+		echo mips-nec-sysv${UNAME_RELEASE}
+	else
+		echo mips-unknown-sysv${UNAME_RELEASE}
+	fi
+	exit ;;
+    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
+	echo powerpc-be-beos
+	exit ;;
+    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
+	echo powerpc-apple-beos
+	exit ;;
+    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
+	echo i586-pc-beos
+	exit ;;
+    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
+	echo i586-pc-haiku
+	exit ;;
+    x86_64:Haiku:*:*)
+	echo x86_64-unknown-haiku
+	exit ;;
+    SX-4:SUPER-UX:*:*)
+	echo sx4-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-5:SUPER-UX:*:*)
+	echo sx5-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-6:SUPER-UX:*:*)
+	echo sx6-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-7:SUPER-UX:*:*)
+	echo sx7-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-8:SUPER-UX:*:*)
+	echo sx8-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-8R:SUPER-UX:*:*)
+	echo sx8r-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-ACE:SUPER-UX:*:*)
+	echo sxace-nec-superux${UNAME_RELEASE}
+	exit ;;
+    Power*:Rhapsody:*:*)
+	echo powerpc-apple-rhapsody${UNAME_RELEASE}
+	exit ;;
+    *:Rhapsody:*:*)
+	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
+	exit ;;
+    *:Darwin:*:*)
+	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+	eval $set_cc_for_build
+	if test "$UNAME_PROCESSOR" = unknown ; then
+	    UNAME_PROCESSOR=powerpc
+	fi
+	if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; 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) | \
+		    grep IS_64BIT_ARCH >/dev/null
+		then
+		    case $UNAME_PROCESSOR in
+			i386) UNAME_PROCESSOR=x86_64 ;;
+			powerpc) UNAME_PROCESSOR=powerpc64 ;;
+		    esac
+		fi
+	    fi
+	elif test "$UNAME_PROCESSOR" = i386 ; then
+	    # Avoid executing cc on OS X 10.9, as it ships with a stub
+	    # that puts up a graphical alert prompting to install
+	    # developer tools.  Any system running Mac OS X 10.7 or
+	    # later (Darwin 11 and later) is required to have a 64-bit
+	    # processor. This is not true of the ARM version of Darwin
+	    # that Apple uses in portable devices.
+	    UNAME_PROCESSOR=x86_64
+	fi
+	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+	exit ;;
+    *:procnto*:*:* | *:QNX:[0123456789]*:*)
+	UNAME_PROCESSOR=`uname -p`
+	if test "$UNAME_PROCESSOR" = x86; then
+		UNAME_PROCESSOR=i386
+		UNAME_MACHINE=pc
+	fi
+	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
+	exit ;;
+    *:QNX:*:4*)
+	echo i386-pc-qnx
+	exit ;;
+    NEO-?:NONSTOP_KERNEL:*:*)
+	echo neo-tandem-nsk${UNAME_RELEASE}
+	exit ;;
+    NSE-*:NONSTOP_KERNEL:*:*)
+	echo nse-tandem-nsk${UNAME_RELEASE}
+	exit ;;
+    NSR-?:NONSTOP_KERNEL:*:*)
+	echo nsr-tandem-nsk${UNAME_RELEASE}
+	exit ;;
+    *:NonStop-UX:*:*)
+	echo mips-compaq-nonstopux
+	exit ;;
+    BS2000:POSIX*:*:*)
+	echo bs2000-siemens-sysv
+	exit ;;
+    DS/*:UNIX_System_V:*:*)
+	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
+	exit ;;
+    *:Plan9:*:*)
+	# "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
+	    UNAME_MACHINE=i386
+	else
+	    UNAME_MACHINE="$cputype"
+	fi
+	echo ${UNAME_MACHINE}-unknown-plan9
+	exit ;;
+    *:TOPS-10:*:*)
+	echo pdp10-unknown-tops10
+	exit ;;
+    *:TENEX:*:*)
+	echo pdp10-unknown-tenex
+	exit ;;
+    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
+	echo pdp10-dec-tops20
+	exit ;;
+    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
+	echo pdp10-xkl-tops20
+	exit ;;
+    *:TOPS-20:*:*)
+	echo pdp10-unknown-tops20
+	exit ;;
+    *:ITS:*:*)
+	echo pdp10-unknown-its
+	exit ;;
+    SEI:*:*:SEIUX)
+	echo mips-sei-seiux${UNAME_RELEASE}
+	exit ;;
+    *:DragonFly:*:*)
+	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+	exit ;;
+    *:*VMS:*:*)
+	UNAME_MACHINE=`(uname -p) 2>/dev/null`
+	case "${UNAME_MACHINE}" in
+	    A*) echo alpha-dec-vms ; exit ;;
+	    I*) echo ia64-dec-vms ; exit ;;
+	    V*) echo vax-dec-vms ; exit ;;
+	esac ;;
+    *:XENIX:*:SysV)
+	echo i386-pc-xenix
+	exit ;;
+    i*86:skyos:*:*)
+	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE} | sed -e 's/ .*$//'`
+	exit ;;
+    i*86:rdos:*:*)
+	echo ${UNAME_MACHINE}-pc-rdos
+	exit ;;
+    i*86:AROS:*:*)
+	echo ${UNAME_MACHINE}-pc-aros
+	exit ;;
+    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
+
+  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
+
+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.
+
+config.guess timestamp = $timestamp
+
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
+
+hostinfo               = `(hostinfo) 2>/dev/null`
+/bin/universe          = `(/bin/universe) 2>/dev/null`
+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
+/bin/arch              = `(/bin/arch) 2>/dev/null`
+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
+
+UNAME_MACHINE = ${UNAME_MACHINE}
+UNAME_RELEASE = ${UNAME_RELEASE}
+UNAME_SYSTEM  = ${UNAME_SYSTEM}
+UNAME_VERSION = ${UNAME_VERSION}
+EOF
+
+exit 1
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "timestamp='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
diff --git a/config.rpath b/config.rpath
new file mode 100755
index 0000000..a3e25c8
--- /dev/null
+++ b/config.rpath
@@ -0,0 +1,684 @@
+#! /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-2015 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,'
+      ;;
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
+      ;;
+    hpux9* | hpux10* | hpux11*)
+      wl='-Wl,'
+      ;;
+    irix5* | irix6* | nonstopux*)
+      wl='-Wl,'
+      ;;
+    linux* | k*bsd*-gnu | kopensolaris*-gnu)
+      case $cc_basename in
+        ecc*)
+          wl='-Wl,'
+          ;;
+        icc* | ifort*)
+          wl='-Wl,'
+          ;;
+        lf95*)
+          wl='-Wl,'
+          ;;
+        nagfor*)
+          wl='-Wl,-Wl,,'
+          ;;
+        pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
+          wl='-Wl,'
+          ;;
+        ccc*)
+          wl='-Wl,'
+          ;;
+        xl* | bgxl* | bgf* | mpixl*)
+          wl='-Wl,'
+          ;;
+        como)
+          wl='-lopt='
+          ;;
+        *)
+          case `$CC -V 2>&1 | sed 5q` in
+            *Sun\ F* | *Sun*Fortran*)
+              wl=
+              ;;
+            *Sun\ C*)
+              wl='-Wl,'
+              ;;
+          esac
+          ;;
+      esac
+      ;;
+    newsos6)
+      ;;
+    *nto* | *qnx*)
+      ;;
+    osf3* | osf4* | osf5*)
+      wl='-Wl,'
+      ;;
+    rdos*)
+      ;;
+    solaris*)
+      case $cc_basename in
+        f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
+          wl='-Qoption ld '
+          ;;
+        *)
+          wl='-Wl,'
+          ;;
+      esac
+      ;;
+    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*)
+      case "$host_cpu" in
+        powerpc)
+          ;;
+        m68k)
+          hardcode_libdir_flag_spec='-L$libdir'
+          hardcode_minus_L=yes
+          ;;
+      esac
+      ;;
+    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
+      ;;
+    haiku*)
+      ;;
+    interix[3-9]*)
+      hardcode_direct=no
+      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+      ;;
+    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-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*)
+      case "$host_cpu" in
+        powerpc)
+          ;;
+        m68k)
+          hardcode_libdir_flag_spec='-L$libdir'
+          hardcode_minus_L=yes
+          ;;
+      esac
+      ;;
+    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 { case $cc_basename in ifort*) true;; *) test "$GCC" = yes;; esac; }; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
+    dgux*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      ;;
+    freebsd2.[01]*)
+      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=:
+      ;;
+    *nto* | *qnx*)
+      ;;
+    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*)
+    case "$host_cpu" in
+      powerpc*)
+        library_names_spec='$libname$shrext' ;;
+      m68k)
+        library_names_spec='$libname.a' ;;
+    esac
+    ;;
+  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'
+    ;;
+  freebsd[23].*)
+    library_names_spec='$libname$shrext$versuffix'
+    ;;
+  freebsd* | dragonfly*)
+    library_names_spec='$libname$shrext'
+    ;;
+  gnu*)
+    library_names_spec='$libname$shrext'
+    ;;
+  haiku*)
+    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 | kopensolaris*-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'
+    ;;
+  tpf*)
+    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
new file mode 100755
index 0000000..8d39c4b
--- /dev/null
+++ b/config.sub
@@ -0,0 +1,1815 @@
+#! /bin/sh
+# Configuration validation subroutine script.
+#   Copyright 1992-2016 Free Software Foundation, Inc.
+
+timestamp='2016-03-30'
+
+# 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
+# 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 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 Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
+
+
+# Please send patches to <config-patches@gnu.org>.
+#
+# Configuration subroutine to validate and canonicalize a configuration type.
+# Supply the specified configuration type as an argument.
+# If it is invalid, we print an error message on stderr and exit with code 1.
+# 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
+
+# This file is supposed to be the same for all GNU packages
+# and recognize all the CPU types, system types and aliases
+# that are meaningful with *any* GNU software.
+# Each package is responsible for reporting which valid configurations
+# it does not support.  The user should be able to distinguish
+# a failure to support a valid configuration from a meaningless
+# configuration.
+
+# The goal of this file is to map all the various variations of a given
+# machine specification into a single specification in the form:
+#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+# or in some cases, the newer four-part form:
+#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+# It is wrong to echo any other type of specification.
+
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS
+
+Canonicalize a configuration name.
+
+Operation modes:
+  -h, --help         print this help, then exit
+  -t, --time-stamp   print date of last modification, then exit
+  -v, --version      print version number, then exit
+
+Report bugs and patches to <config-patches@gnu.org>."
+
+version="\
+GNU config.sub ($timestamp)
+
+Copyright 1992-2016 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."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+  case $1 in
+    --time-stamp | --time* | -t )
+       echo "$timestamp" ; exit ;;
+    --version | -v )
+       echo "$version" ; exit ;;
+    --help | --h* | -h )
+       echo "$usage"; exit ;;
+    -- )     # Stop option processing
+       shift; break ;;
+    - )	# Use stdin as input.
+       break ;;
+    -* )
+       echo "$me: invalid option $1$help"
+       exit 1 ;;
+
+    *local*)
+       # First pass through any local machine types.
+       echo $1
+       exit ;;
+
+    * )
+       break ;;
+  esac
+done
+
+case $# in
+ 0) echo "$me: missing argument$help" >&2
+    exit 1;;
+ 1) ;;
+ *) echo "$me: too many arguments$help" >&2
+    exit 1;;
+esac
+
+# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
+# Here we must recognize all the valid KERNEL-OS combinations.
+maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+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* | \
+  storm-chaos* | os2-emx* | rtmk-nova*)
+    os=-$maybe_os
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+    ;;
+  android-linux)
+    os=-linux-android
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
+    ;;
+  *)
+    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
+    if [ $basic_machine != $1 ]
+    then os=`echo $1 | sed 's/.*-/-/'`
+    else os=; fi
+    ;;
+esac
+
+### Let's recognize common machines as not being operating systems so
+### that things like config.sub decstation-3100 work.  We also
+### recognize some manufacturers as not being operating systems, so we
+### can provide default operating systems below.
+case $os in
+	-sun*os*)
+		# Prevent following clause from handling this invalid input.
+		;;
+	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
+	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
+	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
+	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
+	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
+	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+	-apple | -axis | -knuth | -cray | -microblaze*)
+		os=
+		basic_machine=$1
+		;;
+	-bluegene*)
+		os=-cnk
+		;;
+	-sim | -cisco | -oki | -wec | -winbond)
+		os=
+		basic_machine=$1
+		;;
+	-scout)
+		;;
+	-wrs)
+		os=-vxworks
+		basic_machine=$1
+		;;
+	-chorusos*)
+		os=-chorusos
+		basic_machine=$1
+		;;
+	-chorusrdb)
+		os=-chorusrdb
+		basic_machine=$1
+		;;
+	-hiux*)
+		os=-hiuxwe2
+		;;
+	-sco6)
+		os=-sco5v6
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco5)
+		os=-sco3.2v5
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco4)
+		os=-sco3.2v4
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco3.2.[4-9]*)
+		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco3.2v[4-9]*)
+		# Don't forget version if it is 3.2v4 or newer.
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco5v6*)
+		# Don't forget version if it is 3.2v4 or newer.
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco*)
+		os=-sco3.2v2
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-udk*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-isc)
+		os=-isc2.2
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-clix*)
+		basic_machine=clipper-intergraph
+		;;
+	-isc*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-lynx*178)
+		os=-lynxos178
+		;;
+	-lynx*5)
+		os=-lynxos5
+		;;
+	-lynx*)
+		os=-lynxos
+		;;
+	-ptx*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
+		;;
+	-windowsnt*)
+		os=`echo $os | sed -e 's/windowsnt/winnt/'`
+		;;
+	-psos*)
+		os=-psos
+		;;
+	-mint | -mint[0-9]*)
+		basic_machine=m68k-atari
+		os=-mint
+		;;
+esac
+
+# Decode aliases for certain CPU-COMPANY combinations.
+case $basic_machine in
+	# Recognize the basic CPU types without company name.
+	# Some are omitted here because they have special meanings below.
+	1750a | 580 \
+	| a29k \
+	| aarch64 | aarch64_be \
+	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+	| am33_2.0 \
+	| arc | arceb \
+	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
+	| avr | avr32 \
+	| ba \
+	| be32 | be64 \
+	| bfin \
+	| c4x | c8051 | clipper \
+	| d10v | d30v | dlx | dsp16xx \
+	| e2k | epiphany \
+	| fido | fr30 | frv | ft32 \
+	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+	| hexagon \
+	| i370 | i860 | i960 | ia64 \
+	| ip2k | iq2000 \
+	| k1om \
+	| le32 | le64 \
+	| lm32 \
+	| m32c | m32r | m32rle | m68000 | m68k | m88k \
+	| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
+	| mips | mipsbe | mipseb | mipsel | mipsle \
+	| mips16 \
+	| mips64 | mips64el \
+	| mips64octeon | mips64octeonel \
+	| mips64orion | mips64orionel \
+	| mips64r5900 | mips64r5900el \
+	| mips64vr | mips64vrel \
+	| mips64vr4100 | mips64vr4100el \
+	| mips64vr4300 | mips64vr4300el \
+	| mips64vr5000 | mips64vr5000el \
+	| mips64vr5900 | mips64vr5900el \
+	| mipsisa32 | mipsisa32el \
+	| mipsisa32r2 | mipsisa32r2el \
+	| mipsisa32r6 | mipsisa32r6el \
+	| mipsisa64 | mipsisa64el \
+	| mipsisa64r2 | mipsisa64r2el \
+	| mipsisa64r6 | mipsisa64r6el \
+	| mipsisa64sb1 | mipsisa64sb1el \
+	| mipsisa64sr71k | mipsisa64sr71kel \
+	| mipsr5900 | mipsr5900el \
+	| mipstx39 | mipstx39el \
+	| mn10200 | mn10300 \
+	| moxie \
+	| mt \
+	| msp430 \
+	| nds32 | nds32le | nds32be \
+	| nios | nios2 | nios2eb | nios2el \
+	| ns16k | ns32k \
+	| open8 | or1k | or1knd | or32 \
+	| pdp10 | pdp11 | pj | pjl \
+	| powerpc | powerpc64 | powerpc64le | powerpcle \
+	| pyramid \
+	| riscv32 | riscv64 \
+	| rl78 | rx \
+	| score \
+	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+	| sh64 | sh64le \
+	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+	| spu \
+	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
+	| ubicom32 \
+	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
+	| visium \
+	| we32k \
+	| x86 | xc16x | xstormy16 | xtensa \
+	| z8k | z80)
+		basic_machine=$basic_machine-unknown
+		;;
+	c54x)
+		basic_machine=tic54x-unknown
+		;;
+	c55x)
+		basic_machine=tic55x-unknown
+		;;
+	c6x)
+		basic_machine=tic6x-unknown
+		;;
+	leon|leon[3-9])
+		basic_machine=sparc-$basic_machine
+		;;
+	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
+		basic_machine=$basic_machine-unknown
+		os=-none
+		;;
+	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
+		;;
+	ms1)
+		basic_machine=mt-unknown
+		;;
+
+	strongarm | thumb | xscale)
+		basic_machine=arm-unknown
+		;;
+	xgate)
+		basic_machine=$basic_machine-unknown
+		os=-none
+		;;
+	xscaleeb)
+		basic_machine=armeb-unknown
+		;;
+
+	xscaleel)
+		basic_machine=armel-unknown
+		;;
+
+	# We use `pc' rather than `unknown'
+	# because (1) that's what they normally are, and
+	# (2) the word "unknown" tends to confuse beginning users.
+	i*86 | x86_64)
+	  basic_machine=$basic_machine-pc
+	  ;;
+	# Object if more than one company name word.
+	*-*-*)
+		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+		exit 1
+		;;
+	# Recognize the basic CPU types with company name.
+	580-* \
+	| a29k-* \
+	| aarch64-* | aarch64_be-* \
+	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
+	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
+	| avr-* | avr32-* \
+	| ba-* \
+	| be32-* | be64-* \
+	| bfin-* | bs2000-* \
+	| c[123]* | c30-* | [cjt]90-* | c4x-* \
+	| c8051-* | clipper-* | craynv-* | cydra-* \
+	| d10v-* | d30v-* | dlx-* \
+	| e2k-* | elxsi-* \
+	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
+	| h8300-* | h8500-* \
+	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+	| hexagon-* \
+	| i*86-* | i860-* | i960-* | ia64-* \
+	| ip2k-* | iq2000-* \
+	| k1om-* \
+	| le32-* | le64-* \
+	| lm32-* \
+	| m32c-* | m32r-* | m32rle-* \
+	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
+	| microblaze-* | microblazeel-* \
+	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+	| mips16-* \
+	| mips64-* | mips64el-* \
+	| mips64octeon-* | mips64octeonel-* \
+	| mips64orion-* | mips64orionel-* \
+	| mips64r5900-* | mips64r5900el-* \
+	| mips64vr-* | mips64vrel-* \
+	| mips64vr4100-* | mips64vr4100el-* \
+	| mips64vr4300-* | mips64vr4300el-* \
+	| mips64vr5000-* | mips64vr5000el-* \
+	| mips64vr5900-* | mips64vr5900el-* \
+	| mipsisa32-* | mipsisa32el-* \
+	| mipsisa32r2-* | mipsisa32r2el-* \
+	| mipsisa32r6-* | mipsisa32r6el-* \
+	| mipsisa64-* | mipsisa64el-* \
+	| mipsisa64r2-* | mipsisa64r2el-* \
+	| mipsisa64r6-* | mipsisa64r6el-* \
+	| mipsisa64sb1-* | mipsisa64sb1el-* \
+	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
+	| mipsr5900-* | mipsr5900el-* \
+	| mipstx39-* | mipstx39el-* \
+	| mmix-* \
+	| mt-* \
+	| msp430-* \
+	| nds32-* | nds32le-* | nds32be-* \
+	| nios-* | nios2-* | nios2eb-* | nios2el-* \
+	| none-* | np1-* | ns16k-* | ns32k-* \
+	| open8-* \
+	| or1k*-* \
+	| orion-* \
+	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
+	| pyramid-* \
+	| riscv32-* | riscv64-* \
+	| rl78-* | romp-* | rs6000-* | rx-* \
+	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+	| sparclite-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \
+	| tahoe-* \
+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+	| tile*-* \
+	| tron-* \
+	| ubicom32-* \
+	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
+	| vax-* \
+	| visium-* \
+	| we32k-* \
+	| x86-* | x86_64-* | xc16x-* | xps100-* \
+	| xstormy16-* | xtensa*-* \
+	| ymp-* \
+	| z8k-* | z80-*)
+		;;
+	# Recognize the basic CPU types without company name, with glob match.
+	xtensa*)
+		basic_machine=$basic_machine-unknown
+		;;
+	# Recognize the various machine names and aliases which stand
+	# for a CPU type and a company and sometimes even an OS.
+	386bsd)
+		basic_machine=i386-unknown
+		os=-bsd
+		;;
+	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
+		basic_machine=m68000-att
+		;;
+	3b*)
+		basic_machine=we32k-att
+		;;
+	a29khif)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	abacus)
+		basic_machine=abacus-unknown
+		;;
+	adobe68k)
+		basic_machine=m68010-adobe
+		os=-scout
+		;;
+	alliant | fx80)
+		basic_machine=fx80-alliant
+		;;
+	altos | altos3068)
+		basic_machine=m68k-altos
+		;;
+	am29k)
+		basic_machine=a29k-none
+		os=-bsd
+		;;
+	amd64)
+		basic_machine=x86_64-pc
+		;;
+	amd64-*)
+		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	amdahl)
+		basic_machine=580-amdahl
+		os=-sysv
+		;;
+	amiga | amiga-*)
+		basic_machine=m68k-unknown
+		;;
+	amigaos | amigados)
+		basic_machine=m68k-unknown
+		os=-amigaos
+		;;
+	amigaunix | amix)
+		basic_machine=m68k-unknown
+		os=-sysv4
+		;;
+	apollo68)
+		basic_machine=m68k-apollo
+		os=-sysv
+		;;
+	apollo68bsd)
+		basic_machine=m68k-apollo
+		os=-bsd
+		;;
+	aros)
+		basic_machine=i386-pc
+		os=-aros
+		;;
+	asmjs)
+		basic_machine=asmjs-unknown
+		;;
+	aux)
+		basic_machine=m68k-apple
+		os=-aux
+		;;
+	balance)
+		basic_machine=ns32k-sequent
+		os=-dynix
+		;;
+	blackfin)
+		basic_machine=bfin-unknown
+		os=-linux
+		;;
+	blackfin-*)
+		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
+	bluegene*)
+		basic_machine=powerpc-ibm
+		os=-cnk
+		;;
+	c54x-*)
+		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c55x-*)
+		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c6x-*)
+		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c90)
+		basic_machine=c90-cray
+		os=-unicos
+		;;
+	cegcc)
+		basic_machine=arm-unknown
+		os=-cegcc
+		;;
+	convex-c1)
+		basic_machine=c1-convex
+		os=-bsd
+		;;
+	convex-c2)
+		basic_machine=c2-convex
+		os=-bsd
+		;;
+	convex-c32)
+		basic_machine=c32-convex
+		os=-bsd
+		;;
+	convex-c34)
+		basic_machine=c34-convex
+		os=-bsd
+		;;
+	convex-c38)
+		basic_machine=c38-convex
+		os=-bsd
+		;;
+	cray | j90)
+		basic_machine=j90-cray
+		os=-unicos
+		;;
+	craynv)
+		basic_machine=craynv-cray
+		os=-unicosmp
+		;;
+	cr16 | cr16-*)
+		basic_machine=cr16-unknown
+		os=-elf
+		;;
+	crds | unos)
+		basic_machine=m68k-crds
+		;;
+	crisv32 | crisv32-* | etraxfs*)
+		basic_machine=crisv32-axis
+		;;
+	cris | cris-* | etrax*)
+		basic_machine=cris-axis
+		;;
+	crx)
+		basic_machine=crx-unknown
+		os=-elf
+		;;
+	da30 | da30-*)
+		basic_machine=m68k-da30
+		;;
+	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
+		basic_machine=mips-dec
+		;;
+	decsystem10* | dec10*)
+		basic_machine=pdp10-dec
+		os=-tops10
+		;;
+	decsystem20* | dec20*)
+		basic_machine=pdp10-dec
+		os=-tops20
+		;;
+	delta | 3300 | motorola-3300 | motorola-delta \
+	      | 3300-motorola | delta-motorola)
+		basic_machine=m68k-motorola
+		;;
+	delta88)
+		basic_machine=m88k-motorola
+		os=-sysv3
+		;;
+	dicos)
+		basic_machine=i686-pc
+		os=-dicos
+		;;
+	djgpp)
+		basic_machine=i586-pc
+		os=-msdosdjgpp
+		;;
+	dpx20 | dpx20-*)
+		basic_machine=rs6000-bull
+		os=-bosx
+		;;
+	dpx2* | dpx2*-bull)
+		basic_machine=m68k-bull
+		os=-sysv3
+		;;
+	ebmon29k)
+		basic_machine=a29k-amd
+		os=-ebmon
+		;;
+	elxsi)
+		basic_machine=elxsi-elxsi
+		os=-bsd
+		;;
+	encore | umax | mmax)
+		basic_machine=ns32k-encore
+		;;
+	es1800 | OSE68k | ose68k | ose | OSE)
+		basic_machine=m68k-ericsson
+		os=-ose
+		;;
+	fx2800)
+		basic_machine=i860-alliant
+		;;
+	genix)
+		basic_machine=ns32k-ns
+		;;
+	gmicro)
+		basic_machine=tron-gmicro
+		os=-sysv
+		;;
+	go32)
+		basic_machine=i386-pc
+		os=-go32
+		;;
+	h3050r* | hiux*)
+		basic_machine=hppa1.1-hitachi
+		os=-hiuxwe2
+		;;
+	h8300hms)
+		basic_machine=h8300-hitachi
+		os=-hms
+		;;
+	h8300xray)
+		basic_machine=h8300-hitachi
+		os=-xray
+		;;
+	h8500hms)
+		basic_machine=h8500-hitachi
+		os=-hms
+		;;
+	harris)
+		basic_machine=m88k-harris
+		os=-sysv3
+		;;
+	hp300-*)
+		basic_machine=m68k-hp
+		;;
+	hp300bsd)
+		basic_machine=m68k-hp
+		os=-bsd
+		;;
+	hp300hpux)
+		basic_machine=m68k-hp
+		os=-hpux
+		;;
+	hp3k9[0-9][0-9] | hp9[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hp9k2[0-9][0-9] | hp9k31[0-9])
+		basic_machine=m68000-hp
+		;;
+	hp9k3[2-9][0-9])
+		basic_machine=m68k-hp
+		;;
+	hp9k6[0-9][0-9] | hp6[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hp9k7[0-79][0-9] | hp7[0-79][0-9])
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k78[0-9] | hp78[0-9])
+		# FIXME: really hppa2.0-hp
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
+		# FIXME: really hppa2.0-hp
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[0-9][13679] | hp8[0-9][13679])
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[0-9][0-9] | hp8[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hppa-next)
+		os=-nextstep3
+		;;
+	hppaosf)
+		basic_machine=hppa1.1-hp
+		os=-osf
+		;;
+	hppro)
+		basic_machine=hppa1.1-hp
+		os=-proelf
+		;;
+	i370-ibm* | ibm*)
+		basic_machine=i370-ibm
+		;;
+	i*86v32)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv32
+		;;
+	i*86v4*)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv4
+		;;
+	i*86v)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv
+		;;
+	i*86sol2)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-solaris2
+		;;
+	i386mach)
+		basic_machine=i386-mach
+		os=-mach
+		;;
+	i386-vsta | vsta)
+		basic_machine=i386-unknown
+		os=-vsta
+		;;
+	iris | iris4d)
+		basic_machine=mips-sgi
+		case $os in
+		    -irix*)
+			;;
+		    *)
+			os=-irix4
+			;;
+		esac
+		;;
+	isi68 | isi)
+		basic_machine=m68k-isi
+		os=-sysv
+		;;
+	leon-*|leon[3-9]-*)
+		basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'`
+		;;
+	m68knommu)
+		basic_machine=m68k-unknown
+		os=-linux
+		;;
+	m68knommu-*)
+		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
+	m88k-omron*)
+		basic_machine=m88k-omron
+		;;
+	magnum | m3230)
+		basic_machine=mips-mips
+		os=-sysv
+		;;
+	merlin)
+		basic_machine=ns32k-utek
+		os=-sysv
+		;;
+	microblaze*)
+		basic_machine=microblaze-xilinx
+		;;
+	mingw64)
+		basic_machine=x86_64-pc
+		os=-mingw64
+		;;
+	mingw32)
+		basic_machine=i686-pc
+		os=-mingw32
+		;;
+	mingw32ce)
+		basic_machine=arm-unknown
+		os=-mingw32ce
+		;;
+	miniframe)
+		basic_machine=m68000-convergent
+		;;
+	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
+		basic_machine=m68k-atari
+		os=-mint
+		;;
+	mips3*-*)
+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
+		;;
+	mips3*)
+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
+		;;
+	monitor)
+		basic_machine=m68k-rom68k
+		os=-coff
+		;;
+	morphos)
+		basic_machine=powerpc-unknown
+		os=-morphos
+		;;
+	moxiebox)
+		basic_machine=moxie-unknown
+		os=-moxiebox
+		;;
+	msdos)
+		basic_machine=i386-pc
+		os=-msdos
+		;;
+	ms1-*)
+		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+		;;
+	msys)
+		basic_machine=i686-pc
+		os=-msys
+		;;
+	mvs)
+		basic_machine=i370-ibm
+		os=-mvs
+		;;
+	nacl)
+		basic_machine=le32-unknown
+		os=-nacl
+		;;
+	ncr3000)
+		basic_machine=i486-ncr
+		os=-sysv4
+		;;
+	netbsd386)
+		basic_machine=i386-unknown
+		os=-netbsd
+		;;
+	netwinder)
+		basic_machine=armv4l-rebel
+		os=-linux
+		;;
+	news | news700 | news800 | news900)
+		basic_machine=m68k-sony
+		os=-newsos
+		;;
+	news1000)
+		basic_machine=m68030-sony
+		os=-newsos
+		;;
+	news-3600 | risc-news)
+		basic_machine=mips-sony
+		os=-newsos
+		;;
+	necv70)
+		basic_machine=v70-nec
+		os=-sysv
+		;;
+	next | m*-next )
+		basic_machine=m68k-next
+		case $os in
+		    -nextstep* )
+			;;
+		    -ns2*)
+		      os=-nextstep2
+			;;
+		    *)
+		      os=-nextstep3
+			;;
+		esac
+		;;
+	nh3000)
+		basic_machine=m68k-harris
+		os=-cxux
+		;;
+	nh[45]000)
+		basic_machine=m88k-harris
+		os=-cxux
+		;;
+	nindy960)
+		basic_machine=i960-intel
+		os=-nindy
+		;;
+	mon960)
+		basic_machine=i960-intel
+		os=-mon960
+		;;
+	nonstopux)
+		basic_machine=mips-compaq
+		os=-nonstopux
+		;;
+	np1)
+		basic_machine=np1-gould
+		;;
+	neo-tandem)
+		basic_machine=neo-tandem
+		;;
+	nse-tandem)
+		basic_machine=nse-tandem
+		;;
+	nsr-tandem)
+		basic_machine=nsr-tandem
+		;;
+	op50n-* | op60c-*)
+		basic_machine=hppa1.1-oki
+		os=-proelf
+		;;
+	openrisc | openrisc-*)
+		basic_machine=or32-unknown
+		;;
+	os400)
+		basic_machine=powerpc-ibm
+		os=-os400
+		;;
+	OSE68000 | ose68000)
+		basic_machine=m68000-ericsson
+		os=-ose
+		;;
+	os68k)
+		basic_machine=m68k-none
+		os=-os68k
+		;;
+	pa-hitachi)
+		basic_machine=hppa1.1-hitachi
+		os=-hiuxwe2
+		;;
+	paragon)
+		basic_machine=i860-intel
+		os=-osf
+		;;
+	parisc)
+		basic_machine=hppa-unknown
+		os=-linux
+		;;
+	parisc-*)
+		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
+	pbd)
+		basic_machine=sparc-tti
+		;;
+	pbb)
+		basic_machine=m68k-tti
+		;;
+	pc532 | pc532-*)
+		basic_machine=ns32k-pc532
+		;;
+	pc98)
+		basic_machine=i386-pc
+		;;
+	pc98-*)
+		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentium | p5 | k5 | k6 | nexgen | viac3)
+		basic_machine=i586-pc
+		;;
+	pentiumpro | p6 | 6x86 | athlon | athlon_*)
+		basic_machine=i686-pc
+		;;
+	pentiumii | pentium2 | pentiumiii | pentium3)
+		basic_machine=i686-pc
+		;;
+	pentium4)
+		basic_machine=i786-pc
+		;;
+	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
+		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentiumpro-* | p6-* | 6x86-* | athlon-*)
+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentium4-*)
+		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pn)
+		basic_machine=pn-gould
+		;;
+	power)	basic_machine=power-ibm
+		;;
+	ppc | ppcbe)	basic_machine=powerpc-unknown
+		;;
+	ppc-* | ppcbe-*)
+		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppcle | powerpclittle | ppc-le | powerpc-little)
+		basic_machine=powerpcle-unknown
+		;;
+	ppcle-* | powerpclittle-*)
+		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppc64)	basic_machine=powerpc64-unknown
+		;;
+	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
+		basic_machine=powerpc64le-unknown
+		;;
+	ppc64le-* | powerpc64little-*)
+		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ps2)
+		basic_machine=i386-ibm
+		;;
+	pw32)
+		basic_machine=i586-unknown
+		os=-pw32
+		;;
+	rdos | rdos64)
+		basic_machine=x86_64-pc
+		os=-rdos
+		;;
+	rdos32)
+		basic_machine=i386-pc
+		os=-rdos
+		;;
+	rom68k)
+		basic_machine=m68k-rom68k
+		os=-coff
+		;;
+	rm[46]00)
+		basic_machine=mips-siemens
+		;;
+	rtpc | rtpc-*)
+		basic_machine=romp-ibm
+		;;
+	s390 | s390-*)
+		basic_machine=s390-ibm
+		;;
+	s390x | s390x-*)
+		basic_machine=s390x-ibm
+		;;
+	sa29200)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	sb1)
+		basic_machine=mipsisa64sb1-unknown
+		;;
+	sb1el)
+		basic_machine=mipsisa64sb1el-unknown
+		;;
+	sde)
+		basic_machine=mipsisa32-sde
+		os=-elf
+		;;
+	sei)
+		basic_machine=mips-sei
+		os=-seiux
+		;;
+	sequent)
+		basic_machine=i386-sequent
+		;;
+	sh)
+		basic_machine=sh-hitachi
+		os=-hms
+		;;
+	sh5el)
+		basic_machine=sh5le-unknown
+		;;
+	sh64)
+		basic_machine=sh64-unknown
+		;;
+	sparclite-wrs | simso-wrs)
+		basic_machine=sparclite-wrs
+		os=-vxworks
+		;;
+	sps7)
+		basic_machine=m68k-bull
+		os=-sysv2
+		;;
+	spur)
+		basic_machine=spur-unknown
+		;;
+	st2000)
+		basic_machine=m68k-tandem
+		;;
+	stratus)
+		basic_machine=i860-stratus
+		os=-sysv4
+		;;
+	strongarm-* | thumb-*)
+		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	sun2)
+		basic_machine=m68000-sun
+		;;
+	sun2os3)
+		basic_machine=m68000-sun
+		os=-sunos3
+		;;
+	sun2os4)
+		basic_machine=m68000-sun
+		os=-sunos4
+		;;
+	sun3os3)
+		basic_machine=m68k-sun
+		os=-sunos3
+		;;
+	sun3os4)
+		basic_machine=m68k-sun
+		os=-sunos4
+		;;
+	sun4os3)
+		basic_machine=sparc-sun
+		os=-sunos3
+		;;
+	sun4os4)
+		basic_machine=sparc-sun
+		os=-sunos4
+		;;
+	sun4sol2)
+		basic_machine=sparc-sun
+		os=-solaris2
+		;;
+	sun3 | sun3-*)
+		basic_machine=m68k-sun
+		;;
+	sun4)
+		basic_machine=sparc-sun
+		;;
+	sun386 | sun386i | roadrunner)
+		basic_machine=i386-sun
+		;;
+	sv1)
+		basic_machine=sv1-cray
+		os=-unicos
+		;;
+	symmetry)
+		basic_machine=i386-sequent
+		os=-dynix
+		;;
+	t3e)
+		basic_machine=alphaev5-cray
+		os=-unicos
+		;;
+	t90)
+		basic_machine=t90-cray
+		os=-unicos
+		;;
+	tile*)
+		basic_machine=$basic_machine-unknown
+		os=-linux-gnu
+		;;
+	tx39)
+		basic_machine=mipstx39-unknown
+		;;
+	tx39el)
+		basic_machine=mipstx39el-unknown
+		;;
+	toad1)
+		basic_machine=pdp10-xkl
+		os=-tops20
+		;;
+	tower | tower-32)
+		basic_machine=m68k-ncr
+		;;
+	tpf)
+		basic_machine=s390x-ibm
+		os=-tpf
+		;;
+	udi29k)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	ultra3)
+		basic_machine=a29k-nyu
+		os=-sym1
+		;;
+	v810 | necv810)
+		basic_machine=v810-nec
+		os=-none
+		;;
+	vaxv)
+		basic_machine=vax-dec
+		os=-sysv
+		;;
+	vms)
+		basic_machine=vax-dec
+		os=-vms
+		;;
+	vpp*|vx|vx-*)
+		basic_machine=f301-fujitsu
+		;;
+	vxworks960)
+		basic_machine=i960-wrs
+		os=-vxworks
+		;;
+	vxworks68)
+		basic_machine=m68k-wrs
+		os=-vxworks
+		;;
+	vxworks29k)
+		basic_machine=a29k-wrs
+		os=-vxworks
+		;;
+	w65*)
+		basic_machine=w65-wdc
+		os=-none
+		;;
+	w89k-*)
+		basic_machine=hppa1.1-winbond
+		os=-proelf
+		;;
+	xbox)
+		basic_machine=i686-pc
+		os=-mingw32
+		;;
+	xps | xps100)
+		basic_machine=xps100-honeywell
+		;;
+	xscale-* | xscalee[bl]-*)
+		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
+		;;
+	ymp)
+		basic_machine=ymp-cray
+		os=-unicos
+		;;
+	z8k-*-coff)
+		basic_machine=z8k-unknown
+		os=-sim
+		;;
+	z80-*-coff)
+		basic_machine=z80-unknown
+		os=-sim
+		;;
+	none)
+		basic_machine=none-none
+		os=-none
+		;;
+
+# Here we handle the default manufacturer of certain CPU types.  It is in
+# some cases the only manufacturer, in others, it is the most popular.
+	w89k)
+		basic_machine=hppa1.1-winbond
+		;;
+	op50n)
+		basic_machine=hppa1.1-oki
+		;;
+	op60c)
+		basic_machine=hppa1.1-oki
+		;;
+	romp)
+		basic_machine=romp-ibm
+		;;
+	mmix)
+		basic_machine=mmix-knuth
+		;;
+	rs6000)
+		basic_machine=rs6000-ibm
+		;;
+	vax)
+		basic_machine=vax-dec
+		;;
+	pdp10)
+		# there are many clones, so DEC is not a safe bet
+		basic_machine=pdp10-unknown
+		;;
+	pdp11)
+		basic_machine=pdp11-dec
+		;;
+	we32k)
+		basic_machine=we32k-att
+		;;
+	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
+		basic_machine=sh-unknown
+		;;
+	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
+		basic_machine=sparc-sun
+		;;
+	cydra)
+		basic_machine=cydra-cydrome
+		;;
+	orion)
+		basic_machine=orion-highlevel
+		;;
+	orion105)
+		basic_machine=clipper-highlevel
+		;;
+	mac | mpw | mac-mpw)
+		basic_machine=m68k-apple
+		;;
+	pmac | pmac-mpw)
+		basic_machine=powerpc-apple
+		;;
+	*-unknown)
+		# Make sure to match an already-canonicalized machine name.
+		;;
+	*)
+		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+		exit 1
+		;;
+esac
+
+# Here we canonicalize certain aliases for manufacturers.
+case $basic_machine in
+	*-digital*)
+		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
+		;;
+	*-commodore*)
+		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
+		;;
+	*)
+		;;
+esac
+
+# Decode manufacturer-specific aliases for certain operating systems.
+
+if [ x"$os" != x"" ]
+then
+case $os in
+	# First match some system type aliases
+	# that might get confused with valid system types.
+	# -solaris* is a basic system type, with this one exception.
+	-auroraux)
+		os=-auroraux
+		;;
+	-solaris1 | -solaris1.*)
+		os=`echo $os | sed -e 's|solaris1|sunos4|'`
+		;;
+	-solaris)
+		os=-solaris2
+		;;
+	-svr4*)
+		os=-sysv4
+		;;
+	-unixware*)
+		os=-sysv4.2uw
+		;;
+	-gnu/linux*)
+		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
+		;;
+	# First accept the basic system types.
+	# The portable systems comes first.
+	# Each alternative MUST END IN A *, to match a version number.
+	# -sysv* is not here because it comes later, after sysvr4.
+	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
+	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
+	      | -sym* | -kopensolaris* | -plan9* \
+	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
+	      | -aos* | -aros* | -cloudabi* | -sortix* \
+	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+	      | -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* \
+	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
+	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
+	      | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
+	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
+	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
+	      | -onefs* | -tirtos*)
+	# Remember, each alternative MUST END IN *, to match a version number.
+		;;
+	-qnx*)
+		case $basic_machine in
+		    x86-* | i*86-*)
+			;;
+		    *)
+			os=-nto$os
+			;;
+		esac
+		;;
+	-nto-qnx*)
+		;;
+	-nto*)
+		os=`echo $os | sed -e 's|nto|nto-qnx|'`
+		;;
+	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
+	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
+	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
+		;;
+	-mac*)
+		os=`echo $os | sed -e 's|mac|macos|'`
+		;;
+	-linux-dietlibc)
+		os=-linux-dietlibc
+		;;
+	-linux*)
+		os=`echo $os | sed -e 's|linux|linux-gnu|'`
+		;;
+	-sunos5*)
+		os=`echo $os | sed -e 's|sunos5|solaris2|'`
+		;;
+	-sunos6*)
+		os=`echo $os | sed -e 's|sunos6|solaris3|'`
+		;;
+	-opened*)
+		os=-openedition
+		;;
+	-os400*)
+		os=-os400
+		;;
+	-wince*)
+		os=-wince
+		;;
+	-osfrose*)
+		os=-osfrose
+		;;
+	-osf*)
+		os=-osf
+		;;
+	-utek*)
+		os=-bsd
+		;;
+	-dynix*)
+		os=-bsd
+		;;
+	-acis*)
+		os=-aos
+		;;
+	-atheos*)
+		os=-atheos
+		;;
+	-syllable*)
+		os=-syllable
+		;;
+	-386bsd)
+		os=-bsd
+		;;
+	-ctix* | -uts*)
+		os=-sysv
+		;;
+	-nova*)
+		os=-rtmk-nova
+		;;
+	-ns2 )
+		os=-nextstep2
+		;;
+	-nsk*)
+		os=-nsk
+		;;
+	# Preserve the version number of sinix5.
+	-sinix5.*)
+		os=`echo $os | sed -e 's|sinix|sysv|'`
+		;;
+	-sinix*)
+		os=-sysv4
+		;;
+	-tpf*)
+		os=-tpf
+		;;
+	-triton*)
+		os=-sysv3
+		;;
+	-oss*)
+		os=-sysv3
+		;;
+	-svr4)
+		os=-sysv4
+		;;
+	-svr3)
+		os=-sysv3
+		;;
+	-sysvr4)
+		os=-sysv4
+		;;
+	# This must come after -sysvr4.
+	-sysv*)
+		;;
+	-ose*)
+		os=-ose
+		;;
+	-es1800*)
+		os=-ose
+		;;
+	-xenix)
+		os=-xenix
+		;;
+	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+		os=-mint
+		;;
+	-aros*)
+		os=-aros
+		;;
+	-zvmoe)
+		os=-zvmoe
+		;;
+	-dicos*)
+		os=-dicos
+		;;
+	-nacl*)
+		;;
+	-ios)
+		;;
+	-none)
+		;;
+	*)
+		# Get rid of the `-' at the beginning of $os.
+		os=`echo $os | sed 's/[^-]*-//'`
+		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
+		exit 1
+		;;
+esac
+else
+
+# Here we handle the default operating systems that come with various machines.
+# The value should be what the vendor currently ships out the door with their
+# machine or put another way, the most popular os provided with the machine.
+
+# Note that if you're going to try to match "-MANUFACTURER" here (say,
+# "-sun"), then you have to tell the case statement up towards the top
+# that MANUFACTURER isn't an operating system.  Otherwise, code above
+# will signal an error saying that MANUFACTURER isn't an operating
+# system, and we'll never get to this point.
+
+case $basic_machine in
+	score-*)
+		os=-elf
+		;;
+	spu-*)
+		os=-elf
+		;;
+	*-acorn)
+		os=-riscix1.2
+		;;
+	arm*-rebel)
+		os=-linux
+		;;
+	arm*-semi)
+		os=-aout
+		;;
+	c4x-* | tic4x-*)
+		os=-coff
+		;;
+	c8051-*)
+		os=-elf
+		;;
+	hexagon-*)
+		os=-elf
+		;;
+	tic54x-*)
+		os=-coff
+		;;
+	tic55x-*)
+		os=-coff
+		;;
+	tic6x-*)
+		os=-coff
+		;;
+	# This must come before the *-dec entry.
+	pdp10-*)
+		os=-tops20
+		;;
+	pdp11-*)
+		os=-none
+		;;
+	*-dec | vax-*)
+		os=-ultrix4.2
+		;;
+	m68*-apollo)
+		os=-domain
+		;;
+	i386-sun)
+		os=-sunos4.0.2
+		;;
+	m68000-sun)
+		os=-sunos3
+		;;
+	m68*-cisco)
+		os=-aout
+		;;
+	mep-*)
+		os=-elf
+		;;
+	mips*-cisco)
+		os=-elf
+		;;
+	mips*-*)
+		os=-elf
+		;;
+	or32-*)
+		os=-coff
+		;;
+	*-tti)	# must be before sparc entry or we get the wrong os.
+		os=-sysv3
+		;;
+	sparc-* | *-sun)
+		os=-sunos4.1.1
+		;;
+	*-be)
+		os=-beos
+		;;
+	*-haiku)
+		os=-haiku
+		;;
+	*-ibm)
+		os=-aix
+		;;
+	*-knuth)
+		os=-mmixware
+		;;
+	*-wec)
+		os=-proelf
+		;;
+	*-winbond)
+		os=-proelf
+		;;
+	*-oki)
+		os=-proelf
+		;;
+	*-hp)
+		os=-hpux
+		;;
+	*-hitachi)
+		os=-hiux
+		;;
+	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
+		os=-sysv
+		;;
+	*-cbm)
+		os=-amigaos
+		;;
+	*-dg)
+		os=-dgux
+		;;
+	*-dolphin)
+		os=-sysv3
+		;;
+	m68k-ccur)
+		os=-rtu
+		;;
+	m88k-omron*)
+		os=-luna
+		;;
+	*-next )
+		os=-nextstep
+		;;
+	*-sequent)
+		os=-ptx
+		;;
+	*-crds)
+		os=-unos
+		;;
+	*-ns)
+		os=-genix
+		;;
+	i370-*)
+		os=-mvs
+		;;
+	*-next)
+		os=-nextstep3
+		;;
+	*-gould)
+		os=-sysv
+		;;
+	*-highlevel)
+		os=-bsd
+		;;
+	*-encore)
+		os=-bsd
+		;;
+	*-sgi)
+		os=-irix
+		;;
+	*-siemens)
+		os=-sysv4
+		;;
+	*-masscomp)
+		os=-rtu
+		;;
+	f30[01]-fujitsu | f700-fujitsu)
+		os=-uxpv
+		;;
+	*-rom68k)
+		os=-coff
+		;;
+	*-*bug)
+		os=-coff
+		;;
+	*-apple)
+		os=-macos
+		;;
+	*-atari*)
+		os=-mint
+		;;
+	*)
+		os=-none
+		;;
+esac
+fi
+
+# Here we handle the case where we know the os, and the CPU type, but not the
+# manufacturer.  We pick the logical manufacturer.
+vendor=unknown
+case $basic_machine in
+	*-unknown)
+		case $os in
+			-riscix*)
+				vendor=acorn
+				;;
+			-sunos*)
+				vendor=sun
+				;;
+			-cnk*|-aix*)
+				vendor=ibm
+				;;
+			-beos*)
+				vendor=be
+				;;
+			-hpux*)
+				vendor=hp
+				;;
+			-mpeix*)
+				vendor=hp
+				;;
+			-hiux*)
+				vendor=hitachi
+				;;
+			-unos*)
+				vendor=crds
+				;;
+			-dgux*)
+				vendor=dg
+				;;
+			-luna*)
+				vendor=omron
+				;;
+			-genix*)
+				vendor=ns
+				;;
+			-mvs* | -opened*)
+				vendor=ibm
+				;;
+			-os400*)
+				vendor=ibm
+				;;
+			-ptx*)
+				vendor=sequent
+				;;
+			-tpf*)
+				vendor=ibm
+				;;
+			-vxsim* | -vxworks* | -windiss*)
+				vendor=wrs
+				;;
+			-aux*)
+				vendor=apple
+				;;
+			-hms*)
+				vendor=hitachi
+				;;
+			-mpw* | -macos*)
+				vendor=apple
+				;;
+			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+				vendor=atari
+				;;
+			-vos*)
+				vendor=stratus
+				;;
+		esac
+		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
+		;;
+esac
+
+echo $basic_machine$os
+exit
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "timestamp='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
diff --git a/configure b/configure
index a5fe4a1..684d32a 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 simple-scan 3.21.1.
+# Generated by GNU Autoconf 2.69 for simple-scan 3.21.90.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -637,8 +637,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='simple-scan'
 PACKAGE_TARNAME='simple-scan'
-PACKAGE_VERSION='3.21.1'
-PACKAGE_STRING='simple-scan 3.21.1'
+PACKAGE_VERSION='3.21.90'
+PACKAGE_STRING='simple-scan 3.21.90'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -678,46 +678,38 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
+gt_needs=
 ac_subst_vars='am__EXEEXT_FALSE
 am__EXEEXT_TRUE
 LTLIBOBJS
 LIBOBJS
 GETTEXT_PACKAGE
-ALL_LINGUAS
-INTLTOOL_PERL
-GMSGFMT
-MSGFMT
+POSUB
+LTLIBINTL
+LIBINTL
+INTLLIBS
+LTLIBICONV
+LIBICONV
+INTL_MACOSX_LIBS
+host_os
+host_vendor
+host_cpu
+host
+build_os
+build_vendor
+build_cpu
+build
+XGETTEXT_EXTRA_OPTIONS
 MSGMERGE
+XGETTEXT_015
 XGETTEXT
-INTLTOOL_POLICY_RULE
-INTLTOOL_SERVICE_RULE
-INTLTOOL_THEME_RULE
-INTLTOOL_SCHEMAS_RULE
-INTLTOOL_CAVES_RULE
-INTLTOOL_XML_NOMERGE_RULE
-INTLTOOL_XML_RULE
-INTLTOOL_KBD_RULE
-INTLTOOL_XAM_RULE
-INTLTOOL_UI_RULE
-INTLTOOL_SOUNDLIST_RULE
-INTLTOOL_SHEET_RULE
-INTLTOOL_SERVER_RULE
-INTLTOOL_PONG_RULE
-INTLTOOL_OAF_RULE
-INTLTOOL_PROP_RULE
-INTLTOOL_KEYS_RULE
-INTLTOOL_DIRECTORY_RULE
-INTLTOOL_DESKTOP_RULE
-intltool__v_merge_options_0
-intltool__v_merge_options_
-INTLTOOL_V_MERGE_OPTIONS
-INTLTOOL__v_MERGE_0
-INTLTOOL__v_MERGE_
-INTLTOOL_V_MERGE
-INTLTOOL_EXTRACT
-INTLTOOL_MERGE
-INTLTOOL_UPDATE
+GMSGFMT_015
+MSGFMT_015
+GMSGFMT
+MSGFMT
+GETTEXT_MACRO_VERSION
 USE_NLS
+SED
 YELP_HELP_RULES
 XMLLINT
 ITSTOOL
@@ -738,6 +730,9 @@ COLORD_LIBS
 COLORD_CFLAGS
 SIMPLE_SCAN_LIBS
 SIMPLE_SCAN_CFLAGS
+APPSTREAM_XML_RULES
+appstreamxmldir
+APPSTREAM_UTIL
 GLIB_COMPILE_RESOURCES
 GSETTINGS_RULES
 GLIB_COMPILE_SCHEMAS
@@ -840,10 +835,15 @@ enable_silent_rules
 enable_maintainer_mode
 enable_dependency_tracking
 enable_schemas_compile
+enable_appstream_util
 enable_colord
 enable_packagekit
 with_help_dir
 enable_nls
+with_gnu_ld
+enable_rpath
+with_libiconv_prefix
+with_libintl_prefix
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1415,7 +1415,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 simple-scan 3.21.1 to adapt to many kinds of systems.
+\`configure' configures simple-scan 3.21.90 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1477,12 +1477,16 @@ Program names:
   --program-prefix=PREFIX            prepend PREFIX to installed program names
   --program-suffix=SUFFIX            append SUFFIX to installed program names
   --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
+
+System types:
+  --build=BUILD     configure for building on BUILD [guessed]
+  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
 _ACEOF
 fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of simple-scan 3.21.1:";;
+     short | recursive ) echo "Configuration of simple-scan 3.21.90:";;
    esac
   cat <<\_ACEOF
 
@@ -1501,14 +1505,23 @@ Optional Features:
                           speeds up one-time build
   --disable-schemas-compile
                           Disable regeneration of gschemas.compiled on install
+  --disable-appstream-util
+                          Disable validating AppData XML files during check
+                          phase
   --enable-colord         Enable colord support[[default=auto]]
   --enable-packagekit     Enable packagekit support[[default=auto]]
   --disable-nls           do not use Native Language Support
+  --disable-rpath         do not hardcode runtime library paths
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   --with-help-dir=DIR     path where help files are installed
+  --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
 
 Some influential environment variables:
   CC          C compiler command
@@ -1604,7 +1617,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-simple-scan configure 3.21.1
+simple-scan configure 3.21.90
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1852,11 +1865,57 @@ $as_echo "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_header_compile
+
+# ac_fn_c_try_link LINENO
+# -----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_link ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext conftest$ac_exeext
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 test -x conftest$ac_exeext
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
+  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
+  # interfere with the next link command; also delete a directory that is
+  # left behind by Apple's compiler.  We do this before executing the actions.
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_link
 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 simple-scan $as_me 3.21.1, which was
+It was created by simple-scan $as_me 3.21.90, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2136,6 +2195,7 @@ $as_echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
 
+gt_needs="$gt_needs "
 # Check that the precious variables saved in the cache have kept the same
 # value.
 ac_cache_corrupted=false
@@ -2719,7 +2779,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='simple-scan'
- VERSION='3.21.1'
+ VERSION='3.21.90'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -4260,6 +4320,119 @@ fi
 
 
 
+  # Check whether --enable-appstream-util was given.
+if test "${enable_appstream_util+set}" = set; then :
+  enableval=$enable_appstream_util;
+fi
+
+
+  if test "x$enable_appstream_validate" != "xno"; then :
+  # Extract the first word of "appstream-util", so it can be a program name with args.
+set dummy appstream-util; 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_APPSTREAM_UTIL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $APPSTREAM_UTIL in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_APPSTREAM_UTIL="$APPSTREAM_UTIL" # 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_APPSTREAM_UTIL="$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
+APPSTREAM_UTIL=$ac_cv_path_APPSTREAM_UTIL
+if test -n "$APPSTREAM_UTIL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $APPSTREAM_UTIL" >&5
+$as_echo "$APPSTREAM_UTIL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+         if test "x$APPSTREAM_UTIL" = "x"; then :
+  have_appstream_validate=no
+else
+  have_appstream_validate=yes
+
+fi
+else
+  have_appstream_validate=no
+fi
+
+  if test "x$have_appstream_validate" != "xno"; then :
+  appstream_validate=yes
+else
+  appstream_validate=no
+         if test "x$enable_appstream_validate" = "xyes"; then :
+  as_fn_error $? "AppData validation was requested but appstream-util was not found" "$LINENO" 5
+fi
+fi
+
+  appstreamxmldir=${datadir}/appdata
+
+
+  APPSTREAM_XML_RULES='
+.PHONY : uninstall-appstream-xml install-appstream-xml clean-appstream-xml
+
+mostlyclean-am: clean-appstream-xml
+
+%.appdata.valid: %.appdata.xml
+	$(AM_V_GEN) if test -f "$<"; then d=; else d="$(srcdir)/"; fi; \
+		if test -n "$(APPSTREAM_UTIL)"; \
+			then $(APPSTREAM_UTIL) --nonet validate $${d}$<; fi \
+		&& touch $@
+
+check-am: $(appstream_XML:.appdata.xml=.appdata.valid)
+uninstall-am: uninstall-appstream-xml
+install-data-am: install-appstream-xml
+
+.SECONDARY: $(appstream_XML)
+
+install-appstream-xml: $(appstream_XML)
+	@$(NORMAL_INSTALL)
+	if test -n "$^"; then \
+		test -z "$(appstreamxmldir)" || $(MKDIR_P) "$(DESTDIR)$(appstreamxmldir)"; \
+		$(INSTALL_DATA) $^ "$(DESTDIR)$(appstreamxmldir)"; \
+	fi
+
+uninstall-appstream-xml:
+	@$(NORMAL_UNINSTALL)
+	@list='\''$(appstream_XML)'\''; test -n "$(appstreamxmldir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e '\''s|^.*/||'\''`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '\''$(DESTDIR)$(appstreamxmldir)'\'' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(appstreamxmldir)" && rm -f $$files
+
+clean-appstream-xml:
+	rm -f $(appstream_XML:.appdata.xml=.appdata.valid)
+'
+
+
+
+
+
+
+
+
+
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SIMPLE_SCAN" >&5
@@ -5365,7 +5538,13 @@ install-help: $(_HELP_LC_FILES)
 	    elif test "x$$lc" != "xC"; then \
 	      if test "x$(YELP_LC_MEDIA_LINKS)" != "x"; then \
 	        echo "$(LN_S) -f $(HELP_DIR)/C/$(HELP_ID)/$$f $$helpdir$$f"; \
-	        $(LN_S) -f "$(HELP_DIR)/C/$(HELP_ID)/$$f" "$$helpdir$$f" || exit 1; \
+	        dname="$$f"; \
+	        pars="../"; \
+	        while test "$$dname" != "." -a "$$dname" != "/"; do \
+	          pars="../$$pars"; \
+	          dname=$$(dirname "$$dname"); \
+	        done; \
+	        $(LN_S) -f $$pars"C/$(HELP_ID)/$$f" "$$helpdir$$f" || exit 1; \
 	      fi; \
 	    fi; \
 	  done; \
@@ -5398,6 +5577,75 @@ uninstall-help:
 
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
+$as_echo_n "checking for a sed that does not truncate output... " >&6; }
+if ${ac_cv_path_SED+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+            ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+     for ac_i in 1 2 3 4 5 6 7; do
+       ac_script="$ac_script$as_nl$ac_script"
+     done
+     echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
+     { ac_script=; unset ac_script;}
+     if test -z "$SED"; then
+  ac_path_SED_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in sed gsed; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_SED" || continue
+# Check for GNU ac_path_SED and select it if it is found.
+  # Check for GNU $ac_path_SED
+case `"$ac_path_SED" --version 2>&1` in
+*GNU*)
+  ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo '' >> "conftest.nl"
+    "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_SED_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_SED="$ac_path_SED"
+      ac_path_SED_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_SED_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_SED"; then
+    as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
+  fi
+else
+  ac_cv_path_SED=$SED
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
+$as_echo "$ac_cv_path_SED" >&6; }
+ SED="$ac_cv_path_SED"
+  rm -f conftest.sed
+
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
 $as_echo_n "checking whether NLS is requested... " >&6; }
@@ -5414,36 +5662,89 @@ $as_echo "$USE_NLS" >&6; }
 
 
 
-case "$am__api_version" in
-    1.01234)
-	as_fn_error $? "Automake 1.5 or newer is required to use intltool" "$LINENO" 5
+      GETTEXT_MACRO_VERSION=0.19
+
+
+
+
+# Prepare PATH_SEPARATOR.
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
+  # contains only /bin. Note that ksh looks also at the FPATH variable,
+  # so we have to set that as well for the test.
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+    && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+           || PATH_SEPARATOR=';'
+       }
+fi
+
+# 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
-
-INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.35.0 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
-INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-if test -n "0.35.0"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= 0.35.0" >&5
-$as_echo_n "checking for intltool >= 0.35.0... " >&6; }
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5
-$as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; }
-    test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
-	as_fn_error $? "Your intltool is too old.  You need intltool 0.35.0 or later." "$LINENO" 5
+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 "intltool-update", so it can be a program name with args.
-set dummy intltool-update; ac_word=$2
+  # 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_INTLTOOL_UPDATE+:} false; then :
+if ${ac_cv_path_GMSGFMT+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  case $INTLTOOL_UPDATE in
+  case $GMSGFMT in
   [\\/]* | ?:[\\/]*)
-  ac_cv_path_INTLTOOL_UPDATE="$INTLTOOL_UPDATE" # Let the user override the test with a path.
+  ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
   ;;
   *)
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -5453,7 +5754,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_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext"
+    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
@@ -5461,153 +5762,489 @@ done
   done
 IFS=$as_save_IFS
 
+  test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
   ;;
 esac
 fi
-INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE
-if test -n "$INTLTOOL_UPDATE"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_UPDATE" >&5
-$as_echo "$INTLTOOL_UPDATE" >&6; }
+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
 
 
-# Extract the first word of "intltool-merge", so it can be a program name with args.
-set dummy intltool-merge; ac_word=$2
+
+    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
+  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
+  # contains only /bin. Note that ksh looks also at the FPATH variable,
+  # so we have to set that as well for the test.
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+    && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+           || PATH_SEPARATOR=';'
+       }
+fi
+
+# 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_INTLTOOL_MERGE+:} false; then :
+if ${ac_cv_path_XGETTEXT+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  case $INTLTOOL_MERGE in
+  case "$XGETTEXT" in
   [\\/]* | ?:[\\/]*)
-  ac_cv_path_INTLTOOL_MERGE="$INTLTOOL_MERGE" # Let the user override the test with a path.
-  ;;
+    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_INTLTOOL_MERGE="$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
-
-  ;;
+    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
-INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE
-if test -n "$INTLTOOL_MERGE"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_MERGE" >&5
-$as_echo "$INTLTOOL_MERGE" >&6; }
+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
 
-# Extract the first word of "intltool-extract", so it can be a program name with args.
-set dummy intltool-extract; ac_word=$2
+    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
+  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
+  # contains only /bin. Note that ksh looks also at the FPATH variable,
+  # so we have to set that as well for the test.
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+    && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+           || PATH_SEPARATOR=';'
+       }
+fi
+
+# 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_INTLTOOL_EXTRACT+:} false; then :
+if ${ac_cv_path_MSGMERGE+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  case $INTLTOOL_EXTRACT in
+  case "$MSGMERGE" in
   [\\/]* | ?:[\\/]*)
-  ac_cv_path_INTLTOOL_EXTRACT="$INTLTOOL_EXTRACT" # Let the user override the test with a path.
-  ;;
+    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_INTLTOOL_EXTRACT="$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
-
-  ;;
+    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
-INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT
-if test -n "$INTLTOOL_EXTRACT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_EXTRACT" >&5
-$as_echo "$INTLTOOL_EXTRACT" >&6; }
+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
 
 
-if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
-    as_fn_error $? "The intltool scripts were not found. Please install intltool." "$LINENO" 5
+        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"
+
+# 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
 
-if test -z "$AM_DEFAULT_VERBOSITY"; then
-  AM_DEFAULT_VERBOSITY=1
 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
 
 
-INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))'
-INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))'
-INTLTOOL__v_MERGE_0='@echo "  ITMRG " $@;'
 
 
+# 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
+  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
+  # contains only /bin. Note that ksh looks also at the FPATH variable,
+  # so we have to set that as well for the test.
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+    && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+           || PATH_SEPARATOR=';'
+       }
+fi
+
+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 $CC" >&5
+$as_echo_n "checking for ld used by $CC... " >&6; }
+  case $host in
+  *-*-mingw*)
+    # gcc leaves a trailing carriage return which upsets mingw
+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+  *)
+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+  esac
+  case $ac_prog in
+    # Accept absolute paths.
+    [\\/]* | ?:[\\/]*)
+      re_direlt='/[^/][^/]*/\.\./'
+      # Canonicalize the pathname of ld
+      ac_prog=`echo "$ac_prog"| sed 's%\\\\%/%g'`
+      while echo "$ac_prog" | grep "$re_direlt" > /dev/null 2>&1; do
+        ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
+      done
+      test -z "$LD" && LD="$ac_prog"
+      ;;
+  "")
+    # If it fails, then pretend we aren't using GCC.
+    ac_prog=ld
+    ;;
+  *)
+    # If it is relative, then search for the first ld in PATH.
+    with_gnu_ld=unknown
+    ;;
+  esac
+elif test "$with_gnu_ld" = yes; then
+  { $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
+  acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  for ac_dir in $PATH; do
+    IFS="$acl_save_ifs"
+    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 variants of GNU ld 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="$acl_save_ifs"
+else
+  acl_cv_path_LD="$LD" # Let the user override the test with a path.
+fi
+fi
 
-INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))'
-intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))'
-intltool__v_merge_options_0='-q'
+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 lds 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
 
 
 
 
-  INTLTOOL_DESKTOP_RULE='%.desktop:   %.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-     INTLTOOL_KEYS_RULE='%.keys:      %.keys.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-     INTLTOOL_PROP_RULE='%.prop:      %.prop.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-      INTLTOOL_OAF_RULE='%.oaf:       %.oaf.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< $@'
-     INTLTOOL_PONG_RULE='%.pong:      %.pong.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-   INTLTOOL_SERVER_RULE='%.server:    %.server.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-    INTLTOOL_SHEET_RULE='%.sheet:     %.sheet.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-       INTLTOOL_UI_RULE='%.ui:        %.ui.in        $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-      INTLTOOL_XML_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then
-      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< $@'
+                                                { $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
-      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.$$RANDOM && mkdir $$_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u $$_it_tmp_dir $< $@ && rmdir $$_it_tmp_dir'
+
+    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
-      INTLTOOL_XAM_RULE='%.xam:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-      INTLTOOL_KBD_RULE='%.kbd:       %.kbd.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-    INTLTOOL_CAVES_RULE='%.caves:     %.caves.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-  INTLTOOL_SCHEMAS_RULE='%.schemas:   %.schemas.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-    INTLTOOL_THEME_RULE='%.theme:     %.theme.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-    INTLTOOL_SERVICE_RULE='%.service: %.service.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-   INTLTOOL_POLICY_RULE='%.policy:    %.policy.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
 
 
 
 
+  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"
 
 
 
@@ -5620,17 +6257,454 @@ fi
 
 
 
+    use_additional=yes
 
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
 
+    eval additional_includedir=\"$includedir\"
+    eval additional_libdir=\"$libdir\"
 
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
 
 
+# Check whether --with-libiconv-prefix was given.
+if test "${with_libiconv_prefix+set}" = set; then :
+  withval=$with_libiconv_prefix;
+    if test "X$withval" = "Xno"; then
+      use_additional=no
+    else
+      if test "X$withval" = "X"; then
 
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
 
+          eval additional_includedir=\"$includedir\"
+          eval additional_libdir=\"$libdir\"
 
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
 
+      else
+        additional_includedir="$withval/include"
+        additional_libdir="$withval/$acl_libdirstem"
+        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
 
 
 
@@ -5662,278 +6736,1055 @@ 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>
 
-# Check the gettext tools to make sure they are GNU
-# 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 :
+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
-  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
 
-  ;;
-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; }
+                  am_save_LIBS="$LIBS"
+      if test $am_cv_lib_iconv = yes; then
+        LIBS="$LIBS $LIBICONV"
+      fi
+      am_cv_func_iconv_works=no
+      for ac_iconv_const in '' 'const'; do
+        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
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 
+#include <iconv.h>
+#include <string.h>
 
-# 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.
-  ;;
-  *)
-  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
+#ifndef ICONV_CONST
+# define ICONV_CONST $ac_iconv_const
+#endif
 
-  ;;
-esac
+int
+main ()
+{
+int result = 0;
+  /* 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 ICONV_CONST char input[] = "\342\202\254"; /* EURO SIGN */
+        char buf[10];
+        ICONV_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,
+                            &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if (res == 0)
+          result |= 1;
+        iconv_close (cd_utf8_to_88591);
+      }
+  }
+  /* 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 ICONV_CONST char input[] = "\263";
+        char buf[10];
+        ICONV_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,
+                            &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if (res == 0)
+          result |= 2;
+        iconv_close (cd_ascii_to_88591);
+      }
+  }
+  /* Test against AIX 6.1..7.1 bug: Buffer overrun.  */
+  {
+    iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1");
+    if (cd_88591_to_utf8 != (iconv_t)(-1))
+      {
+        static ICONV_CONST char input[] = "\304";
+        static char buf[2] = { (char)0xDE, (char)0xAD };
+        ICONV_CONST char *inptr = input;
+        size_t inbytesleft = 1;
+        char *outptr = buf;
+        size_t outbytesleft = 1;
+        size_t res = iconv (cd_88591_to_utf8,
+                            &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD)
+          result |= 4;
+        iconv_close (cd_88591_to_utf8);
+      }
+  }
+#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 ICONV_CONST char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
+        char buf[50];
+        ICONV_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,
+                            &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if ((int)res > 0)
+          result |= 8;
+        iconv_close (cd_88591_to_utf8);
+      }
+  }
+#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))
+    result |= 16;
+  return result;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  am_cv_func_iconv_works=yes
 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; }
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
+        test "$am_cv_func_iconv_works" = no || break
+      done
+      LIBS="$am_save_LIBS"
 
-# 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.
-  ;;
-  *)
-  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
+{ $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
-done
-  done
-IFS=$as_save_IFS
+  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
 
-  ;;
-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
 
+      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
 
-# 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 "$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
-  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
+  gt_save_CPPFLAGS="$CPPFLAGS"
+            CPPFLAGS="$CPPFLAGS $INCINTL"
+            gt_save_LIBS="$LIBS"
+            LIBS="$LIBS $LIBINTL"
+                        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 
-  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; }
+#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
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  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"
 
-if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
-    as_fn_error $? "GNU gettext tools not found; required for intltool" "$LINENO" 5
 fi
-xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
-mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
-mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
-if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
-    as_fn_error $? "GNU gettext tools not found; required for intltool" "$LINENO" 5
+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
 
-# Extract the first word of "perl", so it can be a program name with args.
-set dummy perl; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_INTLTOOL_PERL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $INTLTOOL_PERL in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_INTLTOOL_PERL="$INTLTOOL_PERL" # 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_INTLTOOL_PERL="$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
+                                        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
-done
+
+  { $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
-IFS=$as_save_IFS
 
-  ;;
-esac
-fi
-INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
-if test -n "$INTLTOOL_PERL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_PERL" >&5
-$as_echo "$INTLTOOL_PERL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
+      fi
+
+
+$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h
+
+
+$as_echo "#define HAVE_DCGETTEXT 1" >>confdefs.h
+
+    fi
+
+        POSUB=po
+  fi
 
 
-if test -z "$INTLTOOL_PERL"; then
-   as_fn_error $? "perl not found" "$LINENO" 5
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl >= 5.8.1" >&5
-$as_echo_n "checking for perl >= 5.8.1... " >&6; }
-$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
-if test $? -ne 0; then
-   as_fn_error $? "perl 5.8.1 is required for intltool" "$LINENO" 5
-else
-   IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"`
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5
-$as_echo "$IT_PERL_VERSION" >&6; }
-fi
-if test "x" != "xno-xml"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML::Parser" >&5
-$as_echo_n "checking for XML::Parser... " >&6; }
-   if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
-       { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-$as_echo "ok" >&6; }
-   else
-       as_fn_error $? "XML::Parser perl module is required for intltool" "$LINENO" 5
-   fi
-fi
 
-# Substitute ALL_LINGUAS so we can use it in po/Makefile
+    INTLLIBS="$LIBINTL"
+
+
 
 
 
@@ -5943,7 +7794,7 @@ GETTEXT_PACKAGE=simple-scan
 
 
 
-ac_config_files="$ac_config_files Makefile data/Makefile data/appdata/Makefile data/icons/Makefile help/Makefile po/Makefile.in src/Makefile"
+ac_config_files="$ac_config_files Makefile data/Makefile data/icons/Makefile help/Makefile po/Makefile.in src/Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -6127,10 +7978,6 @@ if test -z "${HAVE_PACKAGEKIT_TRUE}" && test -z "${HAVE_PACKAGEKIT_FALSE}"; then
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 
-  ac_config_commands="$ac_config_commands po/stamp-it"
-
-
-
 : "${CONFIG_STATUS=./config.status}"
 ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
@@ -6527,7 +8374,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 simple-scan $as_me 3.21.1, which was
+This file was extended by simple-scan $as_me 3.21.90, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -6584,7 +8431,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="\\
-simple-scan config.status 3.21.1
+simple-scan config.status 3.21.90
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -6693,6 +8540,13 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 # INIT-COMMANDS
 #
 AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
+# 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%}"
+
 
 _ACEOF
 
@@ -6703,14 +8557,13 @@ for ac_config_target in $ac_config_targets
 do
   case $ac_config_target in
     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+    "po-directories") CONFIG_COMMANDS="$CONFIG_COMMANDS po-directories" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;;
-    "data/appdata/Makefile") CONFIG_FILES="$CONFIG_FILES data/appdata/Makefile" ;;
     "data/icons/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/Makefile" ;;
     "help/Makefile") CONFIG_FILES="$CONFIG_FILES help/Makefile" ;;
     "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
-    "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
@@ -7233,26 +9086,120 @@ $as_echo X"$file" |
   done
 }
  ;;
-    "po/stamp-it":C)
-    if  ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then
-       as_fn_error $? "po/Makefile.in.in was not created by intltoolize." "$LINENO" 5
-    fi
-    rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
-    >"po/stamp-it.tmp"
-    sed '/^#/d
-	 s/^[[].*] *//
-	 /^[ 	]*$/d
-	'"s|^|	$ac_top_srcdir/|" \
-      "$srcdir/po/POTFILES.in" | sed '$!s/$/ \\/' >"po/POTFILES"
-
-    sed '/^POTFILES =/,/[^\\]$/ {
-		/^POTFILES =/!d
-		r po/POTFILES
-	  }
-	 ' "po/Makefile.in" >"po/Makefile"
-    rm -f "po/Makefile.tmp"
-    mv "po/stamp-it.tmp" "po/stamp-it"
-   ;;
+    "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"
+          gt_tab=`printf '\t'`
+          cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ${gt_tab}]*\$/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 assignment 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 assignment 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 ;;
 
   esac
 done # for ac_tag
diff --git a/configure.ac b/configure.ac
index 0686693..19c9a0a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT(simple-scan, 3.21.1)
+AC_INIT(simple-scan, 3.21.90)
 AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz foreign])
 AM_SILENT_RULES([yes])
 AM_MAINTAINER_MODE
@@ -12,6 +12,8 @@ AM_PROG_CC_C_O
 GLIB_GSETTINGS
 AC_PATH_PROG(GLIB_COMPILE_RESOURCES, glib-compile-resources)
 
+APPSTREAM_XML
+
 dnl ###########################################################################
 dnl Dependencies
 dnl ###########################################################################
@@ -80,8 +82,9 @@ dnl ###########################################################################
 dnl Internationalization
 dnl ###########################################################################
 
-IT_PROG_INTLTOOL([0.35.0])
-AC_SUBST(GETTEXT_PACKAGE, simple-scan)
+AM_GNU_GETTEXT([external])
+AM_GNU_GETTEXT_VERSION([0.19.7])
+AC_SUBST([GETTEXT_PACKAGE], [simple-scan])
 
 dnl ###########################################################################
 dnl Files to generate
@@ -90,7 +93,6 @@ dnl ###########################################################################
 AC_OUTPUT([
 Makefile
 data/Makefile
-data/appdata/Makefile
 data/icons/Makefile
 help/Makefile
 po/Makefile.in
diff --git a/data/Makefile.am b/data/Makefile.am
index e367c9e..5f421a0 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,21 +1,30 @@
-SUBDIRS = icons appdata
+SUBDIRS = icons
 
 desktopdir = $(datadir)/applications
-desktop_DATA = simple-scan.desktop
-@INTLTOOL_DESKTOP_RULE@
-@INTLTOOL_XML_NOMERGE_RULE@
+desktop_in_files = simple-scan.desktop.in
+desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+
+$(desktop_DATA): $(desktop_in_files)
+	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 
 gsettings_SCHEMAS = org.gnome.SimpleScan.gschema.xml
 @GSETTINGS_RULES@
 
+appstream_in_files = simple-scan.appdata.xml.in
+appstream_XML = $(appstream_in_files:.appdata.xml.in=.appdata.xml)
+@APPSTREAM_XML_RULES@
+
+$(appstream_XML): $(appstream_in_files)
+	$(AM_V_GEN) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@
+
 dist_man1_MANS = simple-scan.1
 
-EXTRA_DIST = simple-scan.desktop.in \
-             org.gnome.SimpleScan.gschema.xml.in \
+EXTRA_DIST = $(desktop_in_files)  \
+             $(appstream_in_files) \
+             $(gsettings_SCHEMAS) \
              simple-scan.ui \
              simple-scan.gresource.xml
 
 DISTCLEANFILES = \
-	$(schema_DATA) \
 	$(desktop_DATA) \
-	$(gsettings_SCHEMAS)
+	$(appstream_XML)
diff --git a/data/Makefile.in b/data/Makefile.in
index 5d380ac..d9bc6f4 100644
--- a/data/Makefile.in
+++ b/data/Makefile.in
@@ -86,11 +86,17 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = data
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/gsettings.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/yelp.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/appstream-xml.m4 \
+	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gsettings.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/nls.m4 \
+	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/yelp.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
@@ -213,9 +219,9 @@ am__relativize = \
   done; \
   reldir="$$dir2"
 ACLOCAL = @ACLOCAL@
-ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+APPSTREAM_UTIL = @APPSTREAM_UTIL@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -235,10 +241,12 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
 GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
 GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 HELP_DIR = @HELP_DIR@
@@ -247,24 +255,23 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
-INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
-INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
-INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 ITSTOOL = @ITSTOOL@
 LDFLAGS = @LDFLAGS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LN_S = @LN_S@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
@@ -280,6 +287,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+POSUB = @POSUB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SIMPLE_SCAN_CFLAGS = @SIMPLE_SCAN_CFLAGS@
@@ -289,6 +298,8 @@ USE_NLS = @USE_NLS@
 VALAC = @VALAC@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 XMLLINT = @XMLLINT@
 YELP_LC_DIST = @YELP_LC_DIST@
 YELP_LC_MEDIA_LINKS = @YELP_LC_MEDIA_LINKS@
@@ -302,8 +313,13 @@ am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
+appstreamxmldir = @appstreamxmldir@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -311,13 +327,15 @@ docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gsettingsschemadir = @gsettingsschemadir@
+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@
-intltool__v_merge_options_ = @intltool__v_merge_options_@
-intltool__v_merge_options_0 = @intltool__v_merge_options_0@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -338,20 +356,23 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = icons appdata
+SUBDIRS = icons
 desktopdir = $(datadir)/applications
-desktop_DATA = simple-scan.desktop
+desktop_in_files = simple-scan.desktop.in
+desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 gsettings_SCHEMAS = org.gnome.SimpleScan.gschema.xml
+appstream_in_files = simple-scan.appdata.xml.in
+appstream_XML = $(appstream_in_files:.appdata.xml.in=.appdata.xml)
 dist_man1_MANS = simple-scan.1
-EXTRA_DIST = simple-scan.desktop.in \
-             org.gnome.SimpleScan.gschema.xml.in \
+EXTRA_DIST = $(desktop_in_files)  \
+             $(appstream_in_files) \
+             $(gsettings_SCHEMAS) \
              simple-scan.ui \
              simple-scan.gresource.xml
 
 DISTCLEANFILES = \
-	$(schema_DATA) \
 	$(desktop_DATA) \
-	$(gsettings_SCHEMAS)
+	$(appstream_XML)
 
 all: all-recursive
 
@@ -727,9 +748,14 @@ uninstall-man: uninstall-man1
 
 .PRECIOUS: Makefile
 
-@INTLTOOL_DESKTOP_RULE@
-@INTLTOOL_XML_NOMERGE_RULE@
+
+$(desktop_DATA): $(desktop_in_files)
+	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 @GSETTINGS_RULES@
+@APPSTREAM_XML_RULES@
+
+$(appstream_XML): $(appstream_in_files)
+	$(AM_V_GEN) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@
 
 # 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.
diff --git a/data/appdata/Makefile.am b/data/appdata/Makefile.am
deleted file mode 100644
index 37b3e67..0000000
--- a/data/appdata/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-appdatadir = $(datadir)/appdata
-appdata_DATA = simple-scan.appdata.xml
-@INTLTOOL_XML_RULE@
-
-EXTRA_DIST = simple-scan.appdata.xml.in
-
-DISTCLEANFILES = \
-	$(appdata_DATA)
diff --git a/data/appdata/Makefile.in b/data/appdata/Makefile.in
deleted file mode 100644
index 5bc8036..0000000
--- a/data/appdata/Makefile.in
+++ /dev/null
@@ -1,498 +0,0 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2014 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@
-
-VPATH = @srcdir@
-am__is_gnu_make = { \
-  if test -z '$(MAKELEVEL)'; then \
-    false; \
-  elif test -n '$(MAKE_HOST)'; then \
-    true; \
-  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
-    true; \
-  else \
-    false; \
-  fi; \
-}
-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 = :
-subdir = data/appdata
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/gsettings.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/yelp.m4 \
-	$(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
-mkinstalldirs = $(install_sh) -d
-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__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-am__installdirs = "$(DESTDIR)$(appdatadir)"
-DATA = $(appdata_DATA)
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-am__DIST_COMMON = $(srcdir)/Makefile.in
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALL_LINGUAS = @ALL_LINGUAS@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-COLORD_CFLAGS = @COLORD_CFLAGS@
-COLORD_LIBS = @COLORD_LIBS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
-GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
-GMSGFMT = @GMSGFMT@
-GREP = @GREP@
-GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
-HELP_DIR = @HELP_DIR@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
-INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
-INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
-INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
-ITSTOOL = @ITSTOOL@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGMERGE = @MSGMERGE@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGEKIT_CFLAGS = @PACKAGEKIT_CFLAGS@
-PACKAGEKIT_LIBS = @PACKAGEKIT_LIBS@
-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@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SIMPLE_SCAN_CFLAGS = @SIMPLE_SCAN_CFLAGS@
-SIMPLE_SCAN_LIBS = @SIMPLE_SCAN_LIBS@
-STRIP = @STRIP@
-USE_NLS = @USE_NLS@
-VALAC = @VALAC@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-XMLLINT = @XMLLINT@
-YELP_LC_DIST = @YELP_LC_DIST@
-YELP_LC_MEDIA_LINKS = @YELP_LC_MEDIA_LINKS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-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_alias = @build_alias@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-gsettingsschemadir = @gsettingsschemadir@
-host_alias = @host_alias@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-intltool__v_merge_options_ = @intltool__v_merge_options_@
-intltool__v_merge_options_0 = @intltool__v_merge_options_0@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-runstatedir = @runstatedir@
-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@
-appdatadir = $(datadir)/appdata
-appdata_DATA = simple-scan.appdata.xml
-EXTRA_DIST = simple-scan.appdata.xml.in
-DISTCLEANFILES = \
-	$(appdata_DATA)
-
-all: all-am
-
-.SUFFIXES:
-$(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) --foreign data/appdata/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign data/appdata/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):
-install-appdataDATA: $(appdata_DATA)
-	@$(NORMAL_INSTALL)
-	@list='$(appdata_DATA)'; test -n "$(appdatadir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(appdatadir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(appdatadir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(appdatadir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(appdatadir)" || exit $$?; \
-	done
-
-uninstall-appdataDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(appdata_DATA)'; test -n "$(appdatadir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(appdatadir)'; $(am__uninstall_files_from_dir)
-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 $(DATA)
-installdirs:
-	for dir in "$(DESTDIR)$(appdatadir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	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)
-	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
-
-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 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-appdataDATA
-
-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
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-appdataDATA
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
-	ctags-am distclean distclean-generic distdir dvi dvi-am html \
-	html-am info info-am install install-am install-appdataDATA \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am tags-am uninstall uninstall-am \
-	uninstall-appdataDATA
-
-.PRECIOUS: Makefile
-
-@INTLTOOL_XML_RULE@
-
-# 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/data/icons/Makefile.in b/data/icons/Makefile.in
index b3e2fec..09ceef4 100644
--- a/data/icons/Makefile.in
+++ b/data/icons/Makefile.in
@@ -85,11 +85,17 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = data/icons
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/gsettings.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/yelp.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/appstream-xml.m4 \
+	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gsettings.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/nls.m4 \
+	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/yelp.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
@@ -120,9 +126,9 @@ am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
-ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+APPSTREAM_UTIL = @APPSTREAM_UTIL@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -142,10 +148,12 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
 GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
 GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 HELP_DIR = @HELP_DIR@
@@ -154,24 +162,23 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
-INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
-INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
-INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 ITSTOOL = @ITSTOOL@
 LDFLAGS = @LDFLAGS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LN_S = @LN_S@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
@@ -187,6 +194,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+POSUB = @POSUB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SIMPLE_SCAN_CFLAGS = @SIMPLE_SCAN_CFLAGS@
@@ -196,6 +205,8 @@ USE_NLS = @USE_NLS@
 VALAC = @VALAC@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 XMLLINT = @XMLLINT@
 YELP_LC_DIST = @YELP_LC_DIST@
 YELP_LC_MEDIA_LINKS = @YELP_LC_MEDIA_LINKS@
@@ -209,8 +220,13 @@ am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
+appstreamxmldir = @appstreamxmldir@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -218,13 +234,15 @@ docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gsettingsschemadir = @gsettingsschemadir@
+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@
-intltool__v_merge_options_ = @intltool__v_merge_options_@
-intltool__v_merge_options_0 = @intltool__v_merge_options_0@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
diff --git a/data/org.gnome.SimpleScan.gschema.xml b/data/org.gnome.SimpleScan.gschema.xml
new file mode 100644
index 0000000..fb38954
--- /dev/null
+++ b/data/org.gnome.SimpleScan.gschema.xml
@@ -0,0 +1,70 @@
+<schemalist>
+  <enum id="org.gnome.SimpleScan.PageSide">
+    <value value="1" nick="front"/>
+    <value value="2" nick="back"/>
+    <value value="3" nick="both"/>
+  </enum>
+
+  <schema id="org.gnome.SimpleScan" path="/org/gnome/simple-scan/" gettext-domain="simple-scan">
+    <key name="selected-device" type="s">
+      <default>''</default>
+      <summary>Device to scan from</summary>
+      <description>SANE device to acquire images from.</description>
+    </key>
+    <key name="document-type" type="s">
+      <default>'photo'</default>
+      <choices>
+        <choice value="text"/>
+        <choice value="photo"/>
+      </choices>
+      <summary>Type of document being scanned</summary>
+      <description>Type of document being scanned. This setting decides on the scan resolution, colors and post-processing.</description>
+    </key>
+    <key name="paper-width" type="i">
+      <default>0</default>
+      <summary>Width of paper in tenths of a mm</summary>
+      <description>The width of the paper in tenths of a mm (or 0 for automatic paper detection).</description>
+    </key>
+    <key name="paper-height" type="i">
+      <default>0</default>
+      <summary>Height of paper in tenths of a mm</summary>
+      <description>The height of the paper in tenths of a mm (or 0 for automatic paper detection).</description>
+    </key>
+    <key name="brightness" type="i">
+      <default>0</default>
+      <summary>Brightness of scan</summary>
+      <description>The brightness adjustment from -100 to 100 (0 being none).</description>
+    </key>
+    <key name="contrast" type="i">
+        <default>0</default>
+        <summary>Contrast of scan</summary>
+        <description>The contrast adjustment from -100 to 100 (0 being none).</description>
+    </key>
+    <key name="text-dpi" type="i">
+      <default>150</default>
+      <summary>Resolution for text scans</summary>
+      <description>The resolution in dots-per-inch to use when scanning text.</description>
+    </key>
+    <key name="photo-dpi" type="i">
+      <default>300</default>
+      <summary>Resolution for photo scans</summary>
+      <description>The resolution in dots-per-inch to use when scanning photos.</description>
+    </key>
+    <key name="page-side" enum="org.gnome.SimpleScan.PageSide">
+      <default>'both'</default>
+      <summary>Page side to scan</summary>
+      <description>The page side to scan.</description>
+    </key>
+    <key name="save-directory" type="s">
+      <default>''</default>
+      <summary>Directory to save files to</summary>
+      <description>The directory to save files to.  Defaults to the documents directory if unset.</description>
+    </key>
+    <key name="jpeg-quality" type="i">
+      <range min="0" max="100"/>
+      <default>75</default>
+      <summary>Quality value to use for JPEG compression</summary>
+      <description>Quality value to use for JPEG compression.</description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/data/org.gnome.SimpleScan.gschema.xml.in b/data/org.gnome.SimpleScan.gschema.xml.in
deleted file mode 100644
index 3ce3d12..0000000
--- a/data/org.gnome.SimpleScan.gschema.xml.in
+++ /dev/null
@@ -1,70 +0,0 @@
-<schemalist>
-  <enum id="org.gnome.SimpleScan.PageSide">
-    <value value="1" nick="front"/>
-    <value value="2" nick="back"/>
-    <value value="3" nick="both"/>
-  </enum>
-
-  <schema id="org.gnome.SimpleScan" path="/org/gnome/simple-scan/" gettext-domain="simple-scan">
-    <key name="selected-device" type="s">
-      <default>''</default>
-      <_summary>Device to scan from</_summary>
-      <_description>SANE device to acquire images from.</_description>
-    </key>
-    <key name="document-type" type="s">
-      <default>'photo'</default>
-      <choices>
-        <choice value="text"/>
-        <choice value="photo"/>
-      </choices>
-      <_summary>Type of document being scanned</_summary>
-      <_description>Type of document being scanned. This setting decides on the scan resolution, colors and post-processing.</_description>
-    </key>
-    <key name="paper-width" type="i">
-      <default>0</default>
-      <_summary>Width of paper in tenths of a mm</_summary>
-      <_description>The width of the paper in tenths of a mm (or 0 for automatic paper detection).</_description>
-    </key>
-    <key name="paper-height" type="i">
-      <default>0</default>
-      <_summary>Height of paper in tenths of a mm</_summary>
-      <_description>The height of the paper in tenths of a mm (or 0 for automatic paper detection).</_description>
-    </key>
-    <key name="brightness" type="i">
-      <default>0</default>
-      <_summary>Brightness of scan</_summary>
-      <_description>The brightness adjustment from -100 to 100 (0 being none).</_description>
-    </key>
-    <key name="contrast" type="i">
-        <default>0</default>
-        <_summary>Contrast of scan</_summary>
-        <_description>The contrast adjustment from -100 to 100 (0 being none).</_description>
-    </key>
-    <key name="text-dpi" type="i">
-      <default>150</default>
-      <_summary>Resolution for text scans</_summary>
-      <_description>The resolution in dots-per-inch to use when scanning text.</_description>
-    </key>
-    <key name="photo-dpi" type="i">
-      <default>300</default>
-      <_summary>Resolution for photo scans</_summary>
-      <_description>The resolution in dots-per-inch to use when scanning photos.</_description>
-    </key>
-    <key name="page-side" enum="org.gnome.SimpleScan.PageSide">
-      <default>'both'</default>
-      <_summary>Page side to scan</_summary>
-      <_description>The page side to scan.</_description>
-    </key>
-    <key name="save-directory" type="s">
-      <default>''</default>
-      <_summary>Directory to save files to</_summary>
-      <_description>The directory to save files to.  Defaults to the documents directory if unset.</_description>
-    </key>
-    <key name="jpeg-quality" type="i">
-      <range min="0" max="100"/>
-      <default>75</default>
-      <_summary>Quality value to use for JPEG compression</_summary>
-      <_description>Quality value to use for JPEG compression.</_description>
-    </key>
-  </schema>
-</schemalist>
diff --git a/data/appdata/simple-scan.appdata.xml.in b/data/simple-scan.appdata.xml.in
index 3a3d0ef..0d306cd 100644
--- a/data/appdata/simple-scan.appdata.xml.in
+++ b/data/simple-scan.appdata.xml.in
@@ -1,21 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<application>
+<component type="desktop">
   <id type="desktop">simple-scan.desktop</id>
   <metadata_licence>CC0-1.0</metadata_licence>
   <project_license>GPL-3.0+ and CC-BY-SA-3.0</project_license>
-  <_name>Simple Scan</_name>
+  <name>Simple Scan</name>
+  <summary>Scan Documents</summary>
   <description>
-    <_p>
+    <p>
       A really easy way to scan both documents and photos.
       You can crop out the bad parts of a photo and rotate it if it is the wrong way round.
       You can print your scans, export them to pdf, or save them in a range of image formats.
-    </_p>
-    <_p>
+    </p>
+    <p>
       Simple Scan uses the SANE framework to support most existing scanners.
-    </_p>
+    </p>
   </description>
   <screenshots>
     <screenshot type="default">https://launchpadlibrarian.net/203209644/simple-scan.png</screenshot>
   </screenshots>
   <url type="homepage">https://launchpad.net/simple-scan</url>
-</application>
+  <update_contact>robert.ancell_AT_canonical.com</update_contact>
+  <translation type="gettext">simple-scan</translation>
+</component>
diff --git a/data/simple-scan.desktop.in b/data/simple-scan.desktop.in
index 08c2072..89edeb2 100644
--- a/data/simple-scan.desktop.in
+++ b/data/simple-scan.desktop.in
@@ -1,12 +1,11 @@
 [Desktop Entry]
-_Name=Simple Scan
-_GenericName=Document Scanner
-_Comment=Scan Documents
-_Keywords=scan;scanner;flatbed;adf;
+Name=Simple Scan
+GenericName=Document Scanner
+Comment=Scan Documents
+Keywords=scan;scanner;flatbed;adf;
 Exec=simple-scan
 Icon=scanner
 Terminal=false
 Type=Application
 StartupNotify=true
 Categories=GNOME;GTK;Graphics;Scanning;
-X-GNOME-Gettext-Domain=simple-scan
diff --git a/help/Makefile.in b/help/Makefile.in
index 17a6f74..b1e7d81 100644
--- a/help/Makefile.in
+++ b/help/Makefile.in
@@ -85,11 +85,17 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = help
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/gsettings.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/yelp.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/appstream-xml.m4 \
+	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gsettings.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/nls.m4 \
+	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/yelp.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
@@ -120,9 +126,9 @@ am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
-ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+APPSTREAM_UTIL = @APPSTREAM_UTIL@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -142,10 +148,12 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
 GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
 GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 HELP_DIR = @HELP_DIR@
@@ -154,24 +162,23 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
-INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
-INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
-INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 ITSTOOL = @ITSTOOL@
 LDFLAGS = @LDFLAGS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LN_S = @LN_S@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
@@ -187,6 +194,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+POSUB = @POSUB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SIMPLE_SCAN_CFLAGS = @SIMPLE_SCAN_CFLAGS@
@@ -196,6 +205,8 @@ USE_NLS = @USE_NLS@
 VALAC = @VALAC@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 XMLLINT = @XMLLINT@
 YELP_LC_DIST = @YELP_LC_DIST@
 YELP_LC_MEDIA_LINKS = @YELP_LC_MEDIA_LINKS@
@@ -209,8 +220,13 @@ am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
+appstreamxmldir = @appstreamxmldir@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -218,13 +234,15 @@ docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gsettingsschemadir = @gsettingsschemadir@
+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@
-intltool__v_merge_options_ = @intltool__v_merge_options_@
-intltool__v_merge_options_0 = @intltool__v_merge_options_0@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
diff --git a/help/ar/ar.po b/help/ar/ar.po
index b065a41..6e9dd54 100644
--- a/help/ar/ar.po
+++ b/help/ar/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-04-26 05:45+0000\n"
-"X-Generator: Launchpad (build 17995)\n"
+"X-Launchpad-Export-Date: 2016-05-07 04:36+0000\n"
+"X-Generator: Launchpad (build 18025)\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
@@ -735,206 +735,3 @@ msgid ""
 "black and white; choose <gui><em>Photo</em></gui> for a high resolution "
 "color scan. See <link xref=\"dpi\"/> for more details and more options."
 msgstr ""
-
-#~ msgid ""
-#~ "By default both sides of the paper will be scanned if your scanned supports "
-#~ "this. Single side scanning can be configured from the "
-#~ "<guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu."
-#~ msgstr ""
-#~ "بشكل افتراضي فإن كلا وجهي الورقة سوف يُمسحا إذا كانت الماسحة تدعم ذلك. مسح "
-#~ "وجه واحد فقط من الورقة يمكن ضبطه من قائمة "
-#~ "<guiseq><gui>مستند</gui><gui>التفضيلات</gui></guiseq>."
-
-#~ msgid ""
-#~ "If your scanner has an Automatic Document Feeder (ADF) you can scan all the "
-#~ "pages by selecting the <guiseq><gui>Document</gui><gui>Scan</gui><gui>All "
-#~ "Pages From Feeder</gui></guiseq> menu."
-#~ msgstr ""
-#~ "إذا كانت ماسحتك الضوئية تحتوي على خاصية تغذية مستندات آلية فيمكنك مسح جميع "
-#~ "الصفحات وذلك بالنقر على قائمة <guiseq><gui>مستند</gui><gui>امسح</gui><gui>كل "
-#~ "الصفحات من المغذّي</gui></guiseq>."
-
-#~ msgid "Simple Scan Help"
-#~ msgstr "مساعدة الماسحة الضوئية"
-
-#~ msgid ""
-#~ "Fixed crop sizes can be chosen from the "
-#~ "<guiseq><gui>Page</gui><gui>Crop</gui></guiseq> menu that match commonly "
-#~ "used paper sizes."
-#~ msgstr ""
-#~ "مقاسات الاقتصاص الثابتة يمكن اختيارها من قائمة "
-#~ "<guiseq><gui>صفحة</gui><gui>اقتصاص</gui></guiseq>."
-
-#~ msgid ""
-#~ "To use only part of the scanned page enable crop by selecting the crop "
-#~ "button in the toolbar. A mask will be shown over the current page with the "
-#~ "area not being used shown in gray."
-#~ msgstr ""
-#~ "يمكنك استخدام جزء فقط من الصفحة الممسوحة بتفعيل الاقتصاص عن طريق النقر على "
-#~ "زرّ \"اقتصاص\" من شريط الأدوات. سيظهر قناع خلال الصفحة الحالية مع ظهور الجزء "
-#~ "الغير مستخدم باللون الرمادي."
-
-#~ msgid ""
-#~ "If the document type is set to text the email will have a PDF attachment "
-#~ "otherwise the email will have a JPEG attachment for each page."
-#~ msgstr ""
-#~ "إذا كان نوع المستند معيّن كنص فإن البريد سيحتوي على مرفق PDF، وإلّا فإن "
-#~ "البريد سيحتوي على مرفق صورة JPEG لكل صفحة."
-
-#~ msgid ""
-#~ "The crop area can be adjusted by clicking on the inside of the crop area "
-#~ "border and dragging the mouse."
-#~ msgstr ""
-#~ "يمكنك تعديل منطقة الاقتصاص عن طريق النقر على حدود منطقة الاقتصاص وسحب الفأرة."
-
-#~ msgid ""
-#~ "By default text documents will be scanned at 200 dots per inch (dpi) and "
-#~ "photos at 400 dpi. To change these settings open the preferences from the "
-#~ "<guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu."
-#~ msgstr ""
-#~ "بشكل افتراضي فإن المستندات النصية ستُمسح بـ 200 نقطة\\بوصة، والصور ستُمسح بـ "
-#~ "400 نقطة\\بوصة. لتغيير هذه الإعدادات افتح التفضيلات من قائمة "
-#~ "<guiseq><gui>مستند</gui><gui>التفضيلات</gui></guiseq> menu."
-
-#~ msgid "Each new page that is scanned will use the previous crop."
-#~ msgstr "كل صفحة جديدة سيتم مسحها سوف تستخدم نفس الاقتصاص السابق."
-
-#~ msgid ""
-#~ "To print the current document use the "
-#~ "<guiseq><gui>Document</gui><gui>Print</gui></guiseq> menu "
-#~ "(<keyseq><key>Ctrl</key><key>P</key></keyseq>)."
-#~ msgstr ""
-#~ "لطباعة المستند الحالي استخدم قائمة "
-#~ "<guiseq><gui>مستند</gui><gui>اطبع</gui></guiseq> "
-#~ "(<keyseq><key>Ctrl</key><key>P</key></keyseq>)."
-
-#~ msgid ""
-#~ "To move a page, select it and move the page left or right using the "
-#~ "<key>&lt;</key> and <key>&gt;</key> keys."
-#~ msgstr ""
-#~ "لنقل صفحة، اختر الصفحة وانقلها إلى اليسار أو اليمين باستخدام مفتاحي "
-#~ "<key>&lt;</key> و <key>&gt;</key>."
-
-#~ msgid "Rotating Pages"
-#~ msgstr "تدوير الصفحات"
-
-#~ msgid "To remove the selected page use the <key>Delete</key> key."
-#~ msgstr "لإزالة الصفحة المختارة استخدم مفتاح <key>Delete</key>."
-
-#~ msgid ""
-#~ "To rotate a page use the rotation buttons in the toolbar or the <key>[</key> "
-#~ "and <key>]</key> keys. Each new page that is scanned will use the previous "
-#~ "rotation."
-#~ msgstr ""
-#~ "لتدوير صفحة استخدم أزرار التدوير في شريط الأدوات أو استخدم مفتاحي "
-#~ "<key>[</key> and <key>]</key>. كل صفحة جديدة سيتم مسحها سوف تستخدم التدوير "
-#~ "السابق."
-
-#~ msgid ""
-#~ "To save the current document to a file use the "
-#~ "<guiseq><gui>Document</gui><gui>Save</gui></guiseq> menu "
-#~ "(<keyseq><key>Ctrl</key><key>S</key></keyseq>). When you save, there is a "
-#~ "choice of three file types."
-#~ msgstr ""
-#~ "لحفظ المستند الحالي إلى ملف استخدم قائمة "
-#~ "<guiseq><gui>مستند</gui><gui>احفظ</gui></guiseq> "
-#~ "(<keyseq><key>Ctrl</key><key>S</key></keyseq>). عند الحفظ، ستجد هناك ثلاث "
-#~ "أنواع من الملفات لاختيارها."
-
-#~ msgid "Portable Document Format (PDF)"
-#~ msgstr "صيغة المستند المحمول (PDF)"
-
-#~ msgid ""
-#~ "PNG files contain the raw data from the scanner. This makes them much larger "
-#~ "than JPEG files and not suitable for distributing. If you have scanned "
-#~ "multiple pages then a PNG file will be written for each page."
-#~ msgstr ""
-#~ "ملفات PNG تحتوي بيانات خام من الماسحة الضوئية. هذا يجعل هذا النوع أكبر بكثير "
-#~ "من ملفات JPEG وبذلك لا تكون مناسبة لتوزيعها. إذا قمت بمسح عدة صفحات من هذا "
-#~ "النوع فإن كل صفحة ستُحفظ إلى ملف PNG بمفردها."
-
-#~ msgid "Use this type if you want to modify or upload the scanned images."
-#~ msgstr "استخدم هذا النوع إذا رغبت في تعديل أو رفع الصور الممسوحة."
-
-#~ msgid ""
-#~ "JPEG file is the file format used by digital cameras and is very small and "
-#~ "so easy to distribute. Most people have software to modify JPEG photos and "
-#~ "this format is suitable for uploading to social networking sites. If you "
-#~ "have scanned multiple pages then a JPEG file will be written for each page."
-#~ msgstr ""
-#~ "ملف JPEG هو صيغة ملف صورة تستخدم مع الكاميرات الرقمية وهو صغير الحجم جدا "
-#~ "بالمقارنة مع الأنواع الأخرى ومن السهل توزيعه. معظم الناس يمتلكون برمجيات "
-#~ "تمكنهم من تعديل الصور من هذا النوع كما أن هذه الصيغة مناسبة جدا لرفعها إلى "
-#~ "مواقع التواصل الاجتماعي. إذا قمت بمسح عدة صفحات من هذا النوع فإن كل صفحة "
-#~ "ستُحفظ إلى ملف JPEG بمفردها."
-
-#~ msgid "Use this type if you have scanned multiple pages of text."
-#~ msgstr "استخدم هذا النوع عند مسح صفحات عديدة تحتوي نصوصا."
-
-#~ msgid ""
-#~ "A PDF can contain multiple pages (like a book) and is easy to distribute to "
-#~ "other people. Most people do not have software to modify PDF documents so "
-#~ "this format is best used for archiving."
-#~ msgstr ""
-#~ "ملف PDF يمكن أن يحتوي على صفحات عديدة (ككتاب مثلا) ومن السهل توزيعه ومشاركته "
-#~ "مع الآخرين. معظم الناس لا يمتلكون برمجيات لتعديل المستندات من هذا النوع لذلك "
-#~ "فإن هذه الصيغة هي الأنسب لاستخدامها للأرشفة."
-
-#~ msgid "Connect the scanner to your computer."
-#~ msgstr "أوصِل الماسحة الضوئية بحاسوبك."
-
-#~ msgid ""
-#~ "Press the scan button in the toolbar (or "
-#~ "<keyseq><key>Ctrl</key><key>1</key></keyseq>)."
-#~ msgstr ""
-#~ "انقر زرّ \"امسح\" في شريط الأدوات (أو "
-#~ "<keyseq><key>Ctrl</key><key>1</key></keyseq>)."
-
-#~ msgid ""
-#~ "Your local scanners are automatically detected each time you start "
-#~ "<app>Simple Scan</app> and each time you plug in USB scanner. If you have a "
-#~ "network scanner you will need to restart <app>Simple Scan</app> for it to be "
-#~ "detected."
-#~ msgstr ""
-#~ "ماسحاتك الضوئية المحلية سيتم اكتشافها آليا في كل مرة تقوم فيها بتشغيل تطبيق "
-#~ "<app>الماسحة الضوئية</app> وفي كل مرة تقوم فيها بوصل الماسحة الضوئية "
-#~ "بحاسوبك. إذا كان لديك ماسحة ضوئية من الشبكة فستحتاج إلى إعادة تشغيل تطبيق "
-#~ "<app>الماسحة الضوئية</app> ليتم اكتشافها."
-
-#~ msgid "Use this type if you need high resolution files for editing"
-#~ msgstr "استخدم هذا النوع إذا كنت بحاجة إلى ملفات ذات ميز عالي لتعديلها."
-
-#~ msgid ""
-#~ "If you have multiple scanners you can change which scanner is selected from "
-#~ "the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu."
-#~ msgstr ""
-#~ "إذا كان لديك عدة ماسحات ضوئية متصلة بحاسوبك فيمكنك تغيير الماسحة المُستخدمة "
-#~ "من قائمة <guiseq><gui>مستند</gui><gui>التفضيلات</gui></guiseq>."
-
-#~ msgid "To stop the scan at any time press <key>Escape</key>."
-#~ msgstr "لإيقاف المسح في أي وقت اضغط مفتاح <key>Esc</key> في لوحة المفاتيح."
-
-#~ msgid "The page will be shown as it is scanned."
-#~ msgstr "ستظهر الصفحة تدريجيا أثناء مسحها."
-
-#~ msgid ""
-#~ "Each page you scan is added to the end of your document. To start a new "
-#~ "document select <guiseq><gui>Document</gui><gui>New</gui></guiseq>. "
-#~ "Individual pages can be deleted by right clicking a page or pressing the "
-#~ "<key>Delete</key> key."
-#~ msgstr ""
-#~ "كل صفحة تقوم بمسحها ستضاف إلى نهاية المستند. لبدء مستند جديد اختر "
-#~ "<guiseq><gui>مستند</gui><gui>جديد</gui></guiseq>. يمكنك حذف صفحات منفردة "
-#~ "بالنقر بالزر الأيمن على الصفحة أو بالضغط على مفتاح <key>Delete</key> في لوحة "
-#~ "المفاتيح."
-
-#~ msgid ""
-#~ "The type of scan can be changed from the "
-#~ "<guiseq><gui>Document</gui><gui>Scan</gui></guiseq> menu. Choose "
-#~ "<gui>Text</gui> if you want the document to be quickly scanned in black and "
-#~ "white or <gui>Photo</gui> for a high resolution color scan."
-#~ msgstr ""
-#~ "يمكنك تغيير نوع المسح من قائمة "
-#~ "<guiseq><gui>مستند</gui><gui>امسح</gui></guiseq>. اختر <gui>نص</gui> إذا كنت "
-#~ "ترغب بمسح المستند بسرعة بالأسود والأبيض، أو اختر <gui>صورة</gui> للمسح عالي "
-#~ "الميز مع الألوان."
diff --git a/help/bg/bg.po b/help/bg/bg.po
index e1e6892..26e0598 100644
--- a/help/bg/bg.po
+++ b/help/bg/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-04-26 05:45+0000\n"
-"X-Generator: Launchpad (build 17995)\n"
+"X-Launchpad-Export-Date: 2016-05-07 04:36+0000\n"
+"X-Generator: Launchpad (build 18025)\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
@@ -738,219 +738,3 @@ msgid ""
 "black and white; choose <gui><em>Photo</em></gui> for a high resolution "
 "color scan. See <link xref=\"dpi\"/> for more details and more options."
 msgstr ""
-
-#~ msgid ""
-#~ "If your scanner has an Automatic Document Feeder (ADF) you can scan all the "
-#~ "pages by selecting the <guiseq><gui>Document</gui><gui>Scan</gui><gui>All "
-#~ "Pages From Feeder</gui></guiseq> menu."
-#~ msgstr ""
-#~ "Ако вашият скенер има Автоматично Листоподаващо Устройство (АЛУ), можете да "
-#~ "сканирате всички страници при избиране на менюто "
-#~ "<guiseq><gui>Документ</gui><gui>Сканиране</gui><gui>Всички страници от "
-#~ "подавача</gui></guiseq>."
-
-#~ msgid "Simple Scan Help"
-#~ msgstr "Помощ за Simple Scan"
-
-#~ msgid ""
-#~ "The crop area can be adjusted by clicking on the inside of the crop area "
-#~ "border and dragging the mouse."
-#~ msgstr ""
-#~ "Пространството за изрязване може да бъде променяно с натискане на външната "
-#~ "част на обкръжаващата го рамка и влачене на мишката."
-
-#~ msgid ""
-#~ "To use only part of the scanned page enable crop by selecting the crop "
-#~ "button in the toolbar. A mask will be shown over the current page with the "
-#~ "area not being used shown in gray."
-#~ msgstr ""
-#~ "За да използвате само част от сканираната страница, разрешете изрязването "
-#~ "като изберете бутона \"изрязване\" от лентата с инструменти. Върху текущата "
-#~ "страница ще бъде показана маска. Неизползваното пространство ще бъде в сиво."
-
-#~ msgid ""
-#~ "If the document type is set to text the email will have a PDF attachment "
-#~ "otherwise the email will have a JPEG attachment for each page."
-#~ msgstr ""
-#~ "Ако е зададен текстов тип на документа, електронното съобщение ще съдържа "
-#~ "прикрепен PDF файл. В противен случай, електронното съобщение ще съдържа "
-#~ "прикрепен JPEG файл за всяка страница."
-
-#~ msgid "Each new page that is scanned will use the previous crop."
-#~ msgstr ""
-#~ "Всяка нова сканирана страница ще използва предишните размери за изрязване."
-
-#~ msgid "To remove the selected page use the <key>Delete</key> key."
-#~ msgstr ""
-#~ "За да изтриете избраната страница, използвайте клавиша  <key>Delete</key>"
-
-#~ msgid "To stop the scan at any time press <key>Escape</key>."
-#~ msgstr ""
-#~ "За да спрете сканирането по всяко време, натиснете клавиша <key>Escape</key>."
-
-#~ msgid "Portable Document Format (PDF)"
-#~ msgstr "Portable Document Format (PDF)"
-
-#~ msgid ""
-#~ "To save the current document to a file use the "
-#~ "<guiseq><gui>Document</gui><gui>Save</gui></guiseq> menu "
-#~ "(<keyseq><key>Ctrl</key><key>S</key></keyseq>). When you save, there is a "
-#~ "choice of three file types."
-#~ msgstr ""
-#~ "За да запишете текущия документ във файл, използвайте менюто  "
-#~ "<guiseq><gui>Документ</gui><gui>Запазване</gui></guiseq> "
-#~ "(<keyseq><key>Ctrl</key><key>S</key></keyseq>). Когато запазнате, можете да "
-#~ "изберете три файлови типа."
-
-#~ msgid ""
-#~ "To print the current document use the "
-#~ "<guiseq><gui>Document</gui><gui>Print</gui></guiseq> menu "
-#~ "(<keyseq><key>Ctrl</key><key>P</key></keyseq>)."
-#~ msgstr ""
-#~ "За да  отпечатате текущия документ, използвайте менюто "
-#~ "<guiseq><gui>Дукумент</gui><gui>Печат</gui></guiseq> "
-#~ "(<keyseq><key>Ctrl</key><key>P</key></keyseq>)."
-
-#~ msgid ""
-#~ "To rotate a page use the rotation buttons in the toolbar or the <key>[</key> "
-#~ "and <key>]</key> keys. Each new page that is scanned will use the previous "
-#~ "rotation."
-#~ msgstr ""
-#~ "За да завъртите страница, използвайте бутоните за завъртане в лентата с "
-#~ "инструменти или от клавишите  <key>[</key> и <key>]</key> . Всяка нова "
-#~ "сканирана страница ще използва предишната настройка за завъртане."
-
-#~ msgid "Rotating Pages"
-#~ msgstr "Завъртане на страници"
-
-#~ msgid "Use this type if you have scanned multiple pages of text."
-#~ msgstr "Използвайте този тим, ако сте сканирали няколко страници текст."
-
-#~ msgid ""
-#~ "A PDF can contain multiple pages (like a book) and is easy to distribute to "
-#~ "other people. Most people do not have software to modify PDF documents so "
-#~ "this format is best used for archiving."
-#~ msgstr ""
-#~ "PDF документите могат да съдържат няколко страници (като книга) и са удобни "
-#~ "за разпространение. Повечето хора нямат софтуер за промяна на PDF, така, че "
-#~ "този формат е най- подходящ за архивиране."
-
-#~ msgid "Use this type if you need high resolution files for editing"
-#~ msgstr ""
-#~ "Използвайте този тип, ако имате нужда от файлове с висока резолюция за "
-#~ "редактиране"
-
-#~ msgid ""
-#~ "PNG files contain the raw data from the scanner. This makes them much larger "
-#~ "than JPEG files and not suitable for distributing. If you have scanned "
-#~ "multiple pages then a PNG file will be written for each page."
-#~ msgstr ""
-#~ "PNG файловете съдържат изходни данни от скенера. Това ги прави доста по- "
-#~ "големи от JPEG файловете и неподходящи за разпространение. Ако сте сканирали "
-#~ "няколко страници,  за всяка страница ще бъде създаден  PNG файл."
-
-#~ msgid "Use this type if you want to modify or upload the scanned images."
-#~ msgstr ""
-#~ "Използвайте този тип, ако искате да промените или да качвате сканирани "
-#~ "изображения."
-
-#~ msgid ""
-#~ "If you have multiple scanners you can change which scanner is selected from "
-#~ "the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu."
-#~ msgstr ""
-#~ "Ако имате няколко скенера, можете да промените кой скенер е избран от менюто "
-#~ "<guiseq><gui>Документ</gui><gui>Предпочитания</gui></guiseq> ."
-
-#~ msgid ""
-#~ "By default text documents will be scanned at 200 dots per inch (dpi) and "
-#~ "photos at 400 dpi. To change these settings open the preferences from the "
-#~ "<guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu."
-#~ msgstr ""
-#~ "По подразбиране текстовите документи ще бъдат сканирани на 200 точки за инч "
-#~ "(dpi) и снимките - на 400 dpi. За да промените тези стойности, отворете "
-#~ "настройките от "
-#~ "менюто<guiseq><gui>Документ</gui><gui>Предпочитания</gui></guiseq> menu."
-
-#~ msgid ""
-#~ "By default both sides of the paper will be scanned if your scanned supports "
-#~ "this. Single side scanning can be configured from the "
-#~ "<guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu."
-#~ msgstr ""
-#~ "И двете страни на листа ще бъдат сканирани, ако вашият скенер поддържа това. "
-#~ "Едностранно сканиране може да бъде настроено от менюто "
-#~ "<guiseq><gui>Документ</gui><gui>Предпочитания</gui></guiseq>"
-
-#~ msgid "Connect the scanner to your computer."
-#~ msgstr "Свързване на скенера към вашия компютър"
-
-#~ msgid ""
-#~ "Press the scan button in the toolbar (or "
-#~ "<keyseq><key>Ctrl</key><key>1</key></keyseq>)."
-#~ msgstr ""
-#~ "Натиснете бутона за сканиране от лентата с инструменти (или "
-#~ "<keyseq><key>Ctrl</key><key>1</key></keyseq>)."
-
-#~ msgid "The page will be shown as it is scanned."
-#~ msgstr "Страницата ще бъде показана когато се сканира."
-
-#~ msgid ""
-#~ "Each page you scan is added to the end of your document. To start a new "
-#~ "document select <guiseq><gui>Document</gui><gui>New</gui></guiseq>. "
-#~ "Individual pages can be deleted by right clicking a page or pressing the "
-#~ "<key>Delete</key> key."
-#~ msgstr ""
-#~ "Всяка страница, която сканирате се добавя в края на документа. За да "
-#~ "започнете нов документ, изберете "
-#~ "<guiseq><gui>Документ</gui><gui>Нов</gui></guiseq>. Отделни страници могат "
-#~ "да бъдат изтрити, като щракнете с десния бутон на страница или с натискане "
-#~ "на клавиша <key>Delete</key>."
-
-#~ msgid ""
-#~ "The type of scan can be changed from the "
-#~ "<guiseq><gui>Document</gui><gui>Scan</gui></guiseq> menu. Choose "
-#~ "<gui>Text</gui> if you want the document to be quickly scanned in black and "
-#~ "white or <gui>Photo</gui> for a high resolution color scan."
-#~ msgstr ""
-#~ "Този тип сканиране може да бъде променен от менюто "
-#~ "<guiseq><gui>Документ</gui><gui>Сканиране</gui></guiseq> . Изберете "
-#~ "<gui>Текст</gui>, ако искате документа да бъде сканиран бързо в черно-бяло "
-#~ "или <gui>Снимка</gui> за цветно сканиране с висока резолюция."
-
-#~ msgid ""
-#~ "Your local scanners are automatically detected each time you start "
-#~ "<app>Simple Scan</app> and each time you plug in USB scanner. If you have a "
-#~ "network scanner you will need to restart <app>Simple Scan</app> for it to be "
-#~ "detected."
-#~ msgstr ""
-#~ "Вашите местни скенери се намират автоматично всеки път, когато стартирате "
-#~ "<app>Опростено Сканиране</app> и всеки път, когато включите USB скенер. Ако "
-#~ "имате мрежов скенер, за да бъде засечен, ще трябва да рестартирате "
-#~ "<app>Опростено Сканиране</app>."
-
-#~ msgid ""
-#~ "JPEG file is the file format used by digital cameras and is very small and "
-#~ "so easy to distribute. Most people have software to modify JPEG photos and "
-#~ "this format is suitable for uploading to social networking sites. If you "
-#~ "have scanned multiple pages then a JPEG file will be written for each page."
-#~ msgstr ""
-#~ "Файловият формат JPEG се използва от цифрови камери и е много малък и лесен "
-#~ "за разпространение. Повечето хора имат софтуер за обработка на JPEG "
-#~ "изображения. Също така, този формат е подходящ за прикачване на изображения "
-#~ "към социални мрежи. Ако сте сканирали много страници, ще трябва да се "
-#~ "създадат JPEG файлове за всяка страница."
-
-#~ msgid ""
-#~ "To move a page, select it and move the page left or right using the "
-#~ "<key>&lt;</key> and <key>&gt;</key> keys."
-#~ msgstr ""
-#~ "За да преместите страница, трябва да я е изберете и да я местите наляво или "
-#~ "надясно използвайки клавишите <key>&lt;</key> и <key>&gt;</key>."
-
-#~ msgid ""
-#~ "Fixed crop sizes can be chosen from the "
-#~ "<guiseq><gui>Page</gui><gui>Crop</gui></guiseq> menu that match commonly "
-#~ "used paper sizes."
-#~ msgstr ""
-#~ "Постоянни размери за изрязване могат да бъдат избрани от "
-#~ "менюто<guiseq><gui>Страница</gui><gui>Изрязване</gui></guiseq>,съдържащо "
-#~ "често използваните размери хартия."
diff --git a/help/cs/cs.po b/help/cs/cs.po
index 52dea3e..fe60073 100644
--- a/help/cs/cs.po
+++ b/help/cs/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-04-26 05:45+0000\n"
-"X-Generator: Launchpad (build 17995)\n"
+"X-Launchpad-Export-Date: 2016-05-07 04:36+0000\n"
+"X-Generator: Launchpad (build 18025)\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
@@ -739,213 +739,3 @@ msgid ""
 "black and white; choose <gui><em>Photo</em></gui> for a high resolution "
 "color scan. See <link xref=\"dpi\"/> for more details and more options."
 msgstr ""
-
-#~ msgid "Portable Document Format (PDF)"
-#~ msgstr "PDF"
-
-#~ msgid "The page will be shown as it is scanned."
-#~ msgstr "Stránka se zobrazí po dokončení skenování."
-
-#~ msgid ""
-#~ "By default both sides of the paper will be scanned if your scanned supports "
-#~ "this. Single side scanning can be configured from the "
-#~ "<guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu."
-#~ msgstr ""
-#~ "Ve výchozím stavu budou naskenovány obě strany papíru, pokud to skener "
-#~ "podporuje. Skenování jedné strany může být nastaveno vybráním  "
-#~ "<guiseq><gui>Dokument</gui><gui>Nastavení</gui></guiseq> ."
-
-#~ msgid "Simple Scan Help"
-#~ msgstr "Nápověda jednoduchého skenování"
-
-#~ msgid ""
-#~ "If your scanner has an Automatic Document Feeder (ADF) you can scan all the "
-#~ "pages by selecting the <guiseq><gui>Document</gui><gui>Scan</gui><gui>All "
-#~ "Pages From Feeder</gui></guiseq> menu."
-#~ msgstr ""
-#~ "Pokud má skener automatický podavač dokumentů (ADF), můžete skenovat všechny "
-#~ "stránky vybráním <guiseq><gui>Dokument</gui><gui>Skenovat</gui><gui>Všechny "
-#~ "stránky z podavače</gui></guiseq> ."
-
-#~ msgid "Connect the scanner to your computer."
-#~ msgstr "Připojte scanner k počítači."
-
-#~ msgid "Rotating Pages"
-#~ msgstr "Otočení stránky"
-
-#~ msgid "To remove the selected page use the <key>Delete</key> key."
-#~ msgstr "Stranu smažete pomocí klávesy <key>Delete</key>."
-
-#~ msgid "Use this type if you need high resolution files for editing"
-#~ msgstr ""
-#~ "Tento typ použijte, jestliže potřebujete vysoké rozlišení pro editaci."
-
-#~ msgid ""
-#~ "To save the current document to a file use the "
-#~ "<guiseq><gui>Document</gui><gui>Save</gui></guiseq> menu "
-#~ "(<keyseq><key>Ctrl</key><key>S</key></keyseq>). When you save, there is a "
-#~ "choice of three file types."
-#~ msgstr ""
-#~ "Pro uložení dokumentu použijte nabídku "
-#~ "<guiseq><gui>Dokument</gui><gui>Uložit</gui></guiseq> "
-#~ "(<keyseq><key>Ctrl</key><key>S</key></keyseq>).  Při uložení si můžete "
-#~ "vybrat ze tří formátů."
-
-#~ msgid ""
-#~ "To print the current document use the "
-#~ "<guiseq><gui>Document</gui><gui>Print</gui></guiseq> menu "
-#~ "(<keyseq><key>Ctrl</key><key>P</key></keyseq>)."
-#~ msgstr ""
-#~ "Pro tisk aktuálního dokumentu použijte nabídku "
-#~ "<guiseq><gui>Dokument</gui><gui>Tisk</gui></guiseq> "
-#~ "(<keyseq><key>Ctrl</key><key>P</key></keyseq>)."
-
-#~ msgid ""
-#~ "PNG files contain the raw data from the scanner. This makes them much larger "
-#~ "than JPEG files and not suitable for distributing. If you have scanned "
-#~ "multiple pages then a PNG file will be written for each page."
-#~ msgstr ""
-#~ "PNG soubory obsahují nezpracovaná data ze skeneru. Soubor jsou tak mnohem "
-#~ "větší než soubory ve formátu JPEG a nejsou vhodné k další distribuci. "
-#~ "Jestliže jste naskenovali více stránek, tak soubor PNG bude vytvořen pro "
-#~ "každou z nich."
-
-#~ msgid "Use this type if you want to modify or upload the scanned images."
-#~ msgstr ""
-#~ "Tento typ použijte, jestliže chcete naskenované obrázky upravit nebo někam "
-#~ "nahrát."
-
-#~ msgid ""
-#~ "JPEG file is the file format used by digital cameras and is very small and "
-#~ "so easy to distribute. Most people have software to modify JPEG photos and "
-#~ "this format is suitable for uploading to social networking sites. If you "
-#~ "have scanned multiple pages then a JPEG file will be written for each page."
-#~ msgstr ""
-#~ "Soubor JPEG je souborový formát používaný digitálními fotoaparáty, je velmi "
-#~ "malý a vhodný k další distribuci. Mnoho lidí má software pro úpravu fotek ve "
-#~ "formátu JPEG a tento formát je vhodný pro nahrání na sociální sítě. Jestliže "
-#~ "jste naskenovali několik stránek, JPEG soubor bude vytvořen pro každou z "
-#~ "nich."
-
-#~ msgid "Use this type if you have scanned multiple pages of text."
-#~ msgstr "Tento typ použijte, jestlliže jste naskenovali mnoho stránek textu."
-
-#~ msgid ""
-#~ "A PDF can contain multiple pages (like a book) and is easy to distribute to "
-#~ "other people. Most people do not have software to modify PDF documents so "
-#~ "this format is best used for archiving."
-#~ msgstr ""
-#~ "PDF soubor může obsahovat více stránek (jako kniha) a je vhodný pro další "
-#~ "distribuci. Většina lidí nemá vhodný software pro úpravu PDF, tudíž je tento "
-#~ "soubor vhodný pro archivaci."
-
-#~ msgid ""
-#~ "If you have multiple scanners you can change which scanner is selected from "
-#~ "the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu."
-#~ msgstr ""
-#~ "Jestliže máte více skenerů, výběr skeneru můžete změnit v nabídce "
-#~ "<guiseq><gui>Dokument</gui><gui>Nastavení</gui></guiseq>."
-
-#~ msgid ""
-#~ "Press the scan button in the toolbar (or "
-#~ "<keyseq><key>Ctrl</key><key>1</key></keyseq>)."
-#~ msgstr ""
-#~ "Zmáčkněte tlačítko skenování v panelu nástrojů (nebo "
-#~ "<keyseq><key>Ctrl</key><key>1</key></keyseq>)."
-
-#~ msgid ""
-#~ "Each page you scan is added to the end of your document. To start a new "
-#~ "document select <guiseq><gui>Document</gui><gui>New</gui></guiseq>. "
-#~ "Individual pages can be deleted by right clicking a page or pressing the "
-#~ "<key>Delete</key> key."
-#~ msgstr ""
-#~ "Každá stránka, kterou naskenujete, je přidána na konec dokumentu. Pro "
-#~ "vytvoření nového dokumentu vyberte "
-#~ "<guiseq><gui>Dokument</gui><gui>Nový</gui></guiseq>.  Jednotlivé stránky "
-#~ "mohou být smazány pravým kliknutím na stránku nebo pomocí klávesy "
-#~ "<key>Delete</key>."
-
-#~ msgid "To stop the scan at any time press <key>Escape</key>."
-#~ msgstr "Zastavení skenování provedete pomocí klávesy <key>Escape</key>."
-
-#~ msgid ""
-#~ "Your local scanners are automatically detected each time you start "
-#~ "<app>Simple Scan</app> and each time you plug in USB scanner. If you have a "
-#~ "network scanner you will need to restart <app>Simple Scan</app> for it to be "
-#~ "detected."
-#~ msgstr ""
-#~ "Lokální skenery jsou automaticky detekovány při každém spuštění aplikace "
-#~ "<app>Jednoduché skenování</app> a při každém připojení USB skeneru. Jestliže "
-#~ "máte síťový skener, budete muset aplikaci <app>Jednoduché skenování</app> "
-#~ "restartovat."
-
-#~ msgid ""
-#~ "The type of scan can be changed from the "
-#~ "<guiseq><gui>Document</gui><gui>Scan</gui></guiseq> menu. Choose "
-#~ "<gui>Text</gui> if you want the document to be quickly scanned in black and "
-#~ "white or <gui>Photo</gui> for a high resolution color scan."
-#~ msgstr ""
-#~ "Typ skenovaného dokumentu může být změněn z nabídky "
-#~ "<guiseq><gui>Dokument</gui><gui>Skenovat</gui></guiseq>. Vyberte "
-#~ "<gui>Text<gui>, chcete-li naskenovat dokument rychle v bílých a černých "
-#~ "barvách nebo <gui>Fotografie</gui> pro skenování ve vysokém a barevném "
-#~ "rozlišení."
-
-#~ msgid ""
-#~ "Fixed crop sizes can be chosen from the "
-#~ "<guiseq><gui>Page</gui><gui>Crop</gui></guiseq> menu that match commonly "
-#~ "used paper sizes."
-#~ msgstr ""
-#~ "Předpřipravené formáty oříznutí mohou být vybrány v nabídce "
-#~ "<guiseq><gui>Stránka</gui><gui>Oříznout</gui></guiseq>, tyto formáty "
-#~ "odpovídají všeobecným velikostem papíru."
-
-#~ msgid ""
-#~ "The crop area can be adjusted by clicking on the inside of the crop area "
-#~ "border and dragging the mouse."
-#~ msgstr ""
-#~ "Oblast oříznutí lze nastavit kliknutím na vnitřní hranici oblasti oříznutí a "
-#~ "tažením myši."
-
-#~ msgid "Each new page that is scanned will use the previous crop."
-#~ msgstr "Každá nová skenovaná stránka použije předchozí ořez."
-
-#~ msgid ""
-#~ "To use only part of the scanned page enable crop by selecting the crop "
-#~ "button in the toolbar. A mask will be shown over the current page with the "
-#~ "area not being used shown in gray."
-#~ msgstr ""
-#~ "Chcete-li použít pouze část skenované stránky, použijte tlačítko oříznout v "
-#~ "panelu nástrojů. Část, která nebude použita, je označena šedivou barvou."
-
-#~ msgid ""
-#~ "By default text documents will be scanned at 200 dots per inch (dpi) and "
-#~ "photos at 400 dpi. To change these settings open the preferences from the "
-#~ "<guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu."
-#~ msgstr ""
-#~ "Ve výchozím nastavení budou dokumenty skenovány v 200 dpi a fotografie ve "
-#~ "400 dpi. Ke změně tohoto nastavení otevřete nastavení z nabídky "
-#~ "<guiseq><gui>Dokument</gui><gui>Nastavení</gui></guiseq>."
-
-#~ msgid ""
-#~ "If the document type is set to text the email will have a PDF attachment "
-#~ "otherwise the email will have a JPEG attachment for each page."
-#~ msgstr ""
-#~ "Jestliže je typ dokumentu nastaven na text, email bude obsahovat PDF "
-#~ "přílohu, jinak bude obsahovat JPEG přílohu pro každou stranu."
-
-#~ msgid ""
-#~ "To rotate a page use the rotation buttons in the toolbar or the <key>[</key> "
-#~ "and <key>]</key> keys. Each new page that is scanned will use the previous "
-#~ "rotation."
-#~ msgstr ""
-#~ "Pro otočení stránky použijte tlačítka otočení v panelu nástrojů nebo "
-#~ "použijte klávesy <key>[</key> and <key>]</key>. Každá nově naskenovaná "
-#~ "strana bude mít předchozí otočení."
-
-#~ msgid ""
-#~ "To move a page, select it and move the page left or right using the "
-#~ "<key>&lt;</key> and <key>&gt;</key> keys."
-#~ msgstr ""
-#~ "Pro přesun stránky je potřeba danou stránku vybrat a posunout ji doleva nebo "
-#~ "doprava pomocí kláves <key>&lt;</key> and <key>&gt;</key>."
diff --git a/help/de/adf.page b/help/de/adf.page
index 8f0ac93..9460a85 100644
--- a/help/de/adf.page
+++ b/help/de/adf.page
@@ -29,7 +29,7 @@
       </steps>
       
       <steps>
-	<title>Use the Toolbar Buttons</title>
+	<title>Die Werkzeugleistenknöpfe benutzen</title>
 	<item>
 	  <p>Click on the arrow to the right of the "Scan" button.</p>
 	</item>
diff --git a/help/de/de.po b/help/de/de.po
index 9b583c8..0019e59 100644
--- a/help/de/de.po
+++ b/help/de/de.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2016-04-25 14:55+0200\n"
-"PO-Revision-Date: 2013-07-02 08:47+0000\n"
-"Last-Translator: Thomas <Unknown>\n"
+"PO-Revision-Date: 2016-07-09 20:46+0000\n"
+"Last-Translator: Tobias Bannert <tobannert@gmail.com>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-04-26 05:45+0000\n"
-"X-Generator: Launchpad (build 17995)\n"
+"X-Launchpad-Export-Date: 2016-07-10 05:20+0000\n"
+"X-Generator: Launchpad (build 18115)\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
@@ -25,7 +25,8 @@ msgstr ""
 "  Etienne Ruedin https://launchpad.net/~ruedin\n"
 "  Phillip Sz https://launchpad.net/~phillip-sz\n"
 "  Silke Hamann https://launchpad.net/~silkehamann\n"
-"  Thomas https://launchpad.net/~tz2"
+"  Thomas https://launchpad.net/~tz2\n"
+"  Tobias Bannert https://launchpad.net/~toba"
 
 #. (itstool) path: credit/name
 #: C/index.page:7
@@ -35,7 +36,7 @@ msgstr "Robert Ancell"
 #. (itstool) path: credit/name
 #: C/index.page:11
 msgid "Ali Shtarbanov"
-msgstr ""
+msgstr "Ali Shtarbanov"
 
 #. (itstool) path: title/media
 #. This is a reference to an external file such as an image or video. When
@@ -112,7 +113,7 @@ msgstr ""
 #. (itstool) path: steps/title
 #: C/adf.page:33
 msgid "Use the Toolbar Buttons"
-msgstr ""
+msgstr "Die Werkzeugleistenknöpfe benutzen"
 
 #. (itstool) path: item/p
 #: C/adf.page:35
@@ -255,7 +256,7 @@ msgstr ""
 #. (itstool) path: page/title
 #: C/dpi.page:9
 msgid "Setting the Scan Resolution"
-msgstr ""
+msgstr "Scan-Auflösung einstellen"
 
 #. (itstool) path: page/p
 #: C/dpi.page:11
@@ -348,6 +349,11 @@ msgid ""
 "(<keyseq><key>Ctrl</key><key>E</key></keyseq>). Your email program will be "
 "opened with a new message containing the scanned document as an attachment."
 msgstr ""
+"Um das Dokument per E-Mail zu versenden, bitte im Menü "
+"<guiseq><gui>Dokument</gui><gui>E-Mail</gui></guiseq> öffnen "
+"(<keyseq><key>Strg</key><key>E</key></keyseq>). Dadurch wird Ihr E-Mail-"
+"Programm mit einer neuen Nachricht geöffnet, die das eingelesene Dokument "
+"als Anhang enthält."
 
 #. (itstool) path: page/p
 #: C/email.page:16
@@ -732,12 +738,3 @@ msgid ""
 "black and white; choose <gui><em>Photo</em></gui> for a high resolution "
 "color scan. See <link xref=\"dpi\"/> for more details and more options."
 msgstr ""
-
-#~ msgid "Rotating Pages"
-#~ msgstr "Seiten drehen"
-
-#~ msgid "Portable Document Format (PDF)"
-#~ msgstr "Portable Document Format (PDF)"
-
-#~ msgid "Connect the scanner to your computer."
-#~ msgstr "Verbinden Sie den Scanner mit Ihrem Computer."
diff --git a/help/de/dpi.page b/help/de/dpi.page
index 04f8a2c..957d793 100644
--- a/help/de/dpi.page
+++ b/help/de/dpi.page
@@ -5,7 +5,7 @@
         <link type="guide" xref="index#acquire"/>
     </info>
   
-	<title>Setting the Scan Resolution</title>
+	<title>Scan-Auflösung einstellen</title>
 
     <p>
     The default resolution for document type <gui><em>Text</em></gui> is 150 dpi (dots per inch)
diff --git a/help/de/email.page b/help/de/email.page
index 81a5ca7..c2d06f8 100644
--- a/help/de/email.page
+++ b/help/de/email.page
@@ -7,11 +7,7 @@
   
 	<title>Per E-Mail versenden</title>
 
-    <p>
-    To email the current document use the <guiseq><gui>Document</gui><gui>Email</gui></guiseq>
-    menu (<keyseq><key>Ctrl</key><key>E</key></keyseq>). Your email program will be opened with
-    a new message containing the scanned document as an attachment.
-    </p>
+    <p>Um das Dokument per E-Mail zu versenden, bitte im Menü <guiseq><gui>Dokument</gui><gui>E-Mail</gui></guiseq> öffnen (<keyseq><key>Strg</key><key>E</key></keyseq>). Dadurch wird Ihr E-Mail-Programm mit einer neuen Nachricht geöffnet, die das eingelesene Dokument als Anhang enthält.</p>
     <p>
     If the document type was set to "Text" the email will have a PDF attachment for each page. 
     Conversely, if the document type was set to "Photo", the email will have a JPEG
diff --git a/help/en_GB/en_GB.po b/help/en_GB/en_GB.po
index ab544b6..fb3afc8 100644
--- a/help/en_GB/en_GB.po
+++ b/help/en_GB/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-04-26 05:45+0000\n"
-"X-Generator: Launchpad (build 17995)\n"
+"X-Launchpad-Export-Date: 2016-05-07 04:36+0000\n"
+"X-Generator: Launchpad (build 18025)\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
@@ -736,212 +736,3 @@ msgid ""
 "black and white; choose <gui><em>Photo</em></gui> for a high resolution "
 "color scan. See <link xref=\"dpi\"/> for more details and more options."
 msgstr ""
-
-#~ msgid ""
-#~ "By default both sides of the paper will be scanned if your scanned supports "
-#~ "this. Single side scanning can be configured from the "
-#~ "<guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu."
-#~ msgstr ""
-#~ "By default, both sides of the paper will be scanned if your scanner supports "
-#~ "this. Single side scanning can be configured from the "
-#~ "<guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu."
-
-#~ msgid ""
-#~ "If your scanner has an Automatic Document Feeder (ADF) you can scan all the "
-#~ "pages by selecting the <guiseq><gui>Document</gui><gui>Scan</gui><gui>All "
-#~ "Pages From Feeder</gui></guiseq> menu."
-#~ msgstr ""
-#~ "If your scanner has an Automatic Document Feeder (ADF), you can scan all the "
-#~ "pages by selecting the <guiseq><gui>Document</gui><gui>Scan</gui><gui>All "
-#~ "Pages From Feeder</gui></guiseq> menu."
-
-#~ msgid "Simple Scan Help"
-#~ msgstr "Simple Scan Help"
-
-#~ msgid ""
-#~ "Fixed crop sizes can be chosen from the "
-#~ "<guiseq><gui>Page</gui><gui>Crop</gui></guiseq> menu that match commonly "
-#~ "used paper sizes."
-#~ msgstr ""
-#~ "Fixed crop sizes can be chosen from the "
-#~ "<guiseq><gui>Page</gui><gui>Crop</gui></guiseq> menu that match commonly "
-#~ "used paper sizes."
-
-#~ msgid ""
-#~ "To print the current document use the "
-#~ "<guiseq><gui>Document</gui><gui>Print</gui></guiseq> menu "
-#~ "(<keyseq><key>Ctrl</key><key>P</key></keyseq>)."
-#~ msgstr ""
-#~ "To print the current document, use the "
-#~ "<guiseq><gui>Document</gui><gui>Print</gui></guiseq> menu "
-#~ "(<keyseq><key>Ctrl</key><key>P</key></keyseq>)."
-
-#~ msgid ""
-#~ "To move a page, select it and move the page left or right using the "
-#~ "<key>&lt;</key> and <key>&gt;</key> keys."
-#~ msgstr ""
-#~ "To move a page, select it and move the page left or right using the "
-#~ "<key>&lt;</key> and <key>&gt;</key> keys or right-click on the page and "
-#~ "choose \"move left/right\"."
-
-#~ msgid "Rotating Pages"
-#~ msgstr "Rotating Pages"
-
-#~ msgid ""
-#~ "To rotate a page use the rotation buttons in the toolbar or the <key>[</key> "
-#~ "and <key>]</key> keys. Each new page that is scanned will use the previous "
-#~ "rotation."
-#~ msgstr ""
-#~ "To rotate a page, use the rotation buttons in the toolbar or the "
-#~ "<key>[</key> and <key>]</key> keys. Each new page that is scanned will use "
-#~ "the previous rotation."
-
-#~ msgid ""
-#~ "To save the current document to a file use the "
-#~ "<guiseq><gui>Document</gui><gui>Save</gui></guiseq> menu "
-#~ "(<keyseq><key>Ctrl</key><key>S</key></keyseq>). When you save, there is a "
-#~ "choice of three file types."
-#~ msgstr ""
-#~ "To save the current document to a file, use the "
-#~ "<guiseq><gui>Document</gui><gui>Save</gui></guiseq> menu "
-#~ "(<keyseq><key>Ctrl</key><key>S</key></keyseq>). When you save, there is a "
-#~ "choice of three file types."
-
-#~ msgid "Portable Document Format (PDF)"
-#~ msgstr "Portable Document Format (PDF)"
-
-#~ msgid ""
-#~ "PNG files contain the raw data from the scanner. This makes them much larger "
-#~ "than JPEG files and not suitable for distributing. If you have scanned "
-#~ "multiple pages then a PNG file will be written for each page."
-#~ msgstr ""
-#~ "PNG files contain the raw data from the scanner. This makes them much larger "
-#~ "than JPEG files and not suitable for distributing. If you have scanned "
-#~ "multiple pages then a PNG file will be written for each page."
-
-#~ msgid "Use this type if you want to modify or upload the scanned images."
-#~ msgstr "Use this type if you want to modify or upload the scanned images."
-
-#~ msgid ""
-#~ "JPEG file is the file format used by digital cameras and is very small and "
-#~ "so easy to distribute. Most people have software to modify JPEG photos and "
-#~ "this format is suitable for uploading to social networking sites. If you "
-#~ "have scanned multiple pages then a JPEG file will be written for each page."
-#~ msgstr ""
-#~ "JPEG file is the file format used by digital cameras and is very small and "
-#~ "so easy to distribute. Most people have software to modify JPEG photos and "
-#~ "this format is suitable for uploading to social networking sites. If you "
-#~ "have scanned multiple pages then a JPEG file will be written for each page."
-
-#~ msgid "Use this type if you have scanned multiple pages of text."
-#~ msgstr "Use this type if you have scanned multiple pages of text."
-
-#~ msgid ""
-#~ "A PDF can contain multiple pages (like a book) and is easy to distribute to "
-#~ "other people. Most people do not have software to modify PDF documents so "
-#~ "this format is best used for archiving."
-#~ msgstr ""
-#~ "A PDF can contain multiple pages (like a book) and is easy to distribute to "
-#~ "other people. Most people do not have software to modify PDF documents so "
-#~ "this format is best used for archiving."
-
-#~ msgid "Connect the scanner to your computer."
-#~ msgstr "Connect the scanner to your computer."
-
-#~ msgid ""
-#~ "Press the scan button in the toolbar (or "
-#~ "<keyseq><key>Ctrl</key><key>1</key></keyseq>)."
-#~ msgstr ""
-#~ "Press the scan button in the toolbar (or "
-#~ "<keyseq><key>Ctrl</key><key>1</key></keyseq>)."
-
-#~ msgid ""
-#~ "Your local scanners are automatically detected each time you start "
-#~ "<app>Simple Scan</app> and each time you plug in USB scanner. If you have a "
-#~ "network scanner you will need to restart <app>Simple Scan</app> for it to be "
-#~ "detected."
-#~ msgstr ""
-#~ "Your local scanners are automatically detected each time you start "
-#~ "<app>Simple Scan</app> and each time you plug in a USB scanner. If you have "
-#~ "a scanner on a network, you will need to restart <app>Simple Scan</app> for "
-#~ "it to be detected."
-
-#~ msgid "Use this type if you need high resolution files for editing"
-#~ msgstr "Use this type if you need high resolution files for editing"
-
-#~ msgid ""
-#~ "If you have multiple scanners you can change which scanner is selected from "
-#~ "the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu."
-#~ msgstr ""
-#~ "If you have multiple scanners, you can change which scanner is selected from "
-#~ "the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu."
-
-#~ msgid "The page will be shown as it is scanned."
-#~ msgstr "The page will be shown as it is scanned."
-
-#~ msgid ""
-#~ "The type of scan can be changed from the "
-#~ "<guiseq><gui>Document</gui><gui>Scan</gui></guiseq> menu. Choose "
-#~ "<gui>Text</gui> if you want the document to be quickly scanned in black and "
-#~ "white or <gui>Photo</gui> for a high resolution color scan."
-#~ msgstr ""
-#~ "The type of scan can be changed from the "
-#~ "<guiseq><gui>Document</gui><gui>Scan</gui></guiseq> menu. Choose "
-#~ "<gui>Text</gui> if you want the document to be quickly scanned in black and "
-#~ "white or <gui>Photo</gui> for a high resolution colour scan."
-
-#~ msgid "To stop the scan at any time press <key>Escape</key>."
-#~ msgstr "To stop the scan at any time, press <key>Escape</key>."
-
-#~ msgid ""
-#~ "By default text documents will be scanned at 200 dots per inch (dpi) and "
-#~ "photos at 400 dpi. To change these settings open the preferences from the "
-#~ "<guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu."
-#~ msgstr ""
-#~ "By default, text documents will be scanned at 200 dots per inch (dpi) and "
-#~ "photos at 400 dpi. To change these settings, open the preferences from the "
-#~ "<guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu."
-
-#~ msgid ""
-#~ "The crop area can be adjusted by clicking on the inside of the crop area "
-#~ "border and dragging the mouse."
-#~ msgstr ""
-#~ "Within the page, the cropped area can be moved by dragging from the centre, "
-#~ "or resized by resizing from the borders. Increase the area of the box on the "
-#~ "page to include what you wish to keep in the finished file(s)."
-
-#~ msgid ""
-#~ "To use only part of the scanned page enable crop by selecting the crop "
-#~ "button in the toolbar. A mask will be shown over the current page with the "
-#~ "area not being used shown in gray."
-#~ msgstr ""
-#~ "To use only part of the scanned page, select the crop button in the toolbar. "
-#~ "A mask will be shown over the current page, with the unwanted area in grey."
-
-#~ msgid ""
-#~ "If the document type is set to text the email will have a PDF attachment "
-#~ "otherwise the email will have a JPEG attachment for each page."
-#~ msgstr ""
-#~ "If the document type is set to text, the e-mail will have a PDF attachment; "
-#~ "otherwise, the e-mail will have a JPEG attachment for each page."
-
-#~ msgid "Each new page that is scanned will use the previous crop."
-#~ msgstr ""
-#~ "Each new page that is scanned will use the previous crop area. Click the "
-#~ "crop button on the toolbar to remove it."
-
-#~ msgid "To remove the selected page use the <key>Delete</key> key."
-#~ msgstr ""
-#~ "To remove the selected page, use the <key>Delete</key> key or right-click "
-#~ "and choose \"Delete\"."
-
-#~ msgid ""
-#~ "Each page you scan is added to the end of your document. To start a new "
-#~ "document select <guiseq><gui>Document</gui><gui>New</gui></guiseq>. "
-#~ "Individual pages can be deleted by right clicking a page or pressing the "
-#~ "<key>Delete</key> key."
-#~ msgstr ""
-#~ "Each page you scan is added to the end of your document. To start a new "
-#~ "document, select <guiseq><gui>Document</gui><gui>New</gui></guiseq>. "
-#~ "Individual pages can be deleted by right-clicking a page or pressing the "
-#~ "<key>Delete</key> key."
diff --git a/help/es/es.po b/help/es/es.po
index 9f9b589..e983eeb 100644
--- a/help/es/es.po
+++ b/help/es/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-04-26 05:45+0000\n"
-"X-Generator: Launchpad (build 17995)\n"
+"X-Launchpad-Export-Date: 2016-05-07 04:36+0000\n"
+"X-Generator: Launchpad (build 18025)\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
@@ -740,158 +740,3 @@ msgid ""
 "black and white; choose <gui><em>Photo</em></gui> for a high resolution "
 "color scan. See <link xref=\"dpi\"/> for more details and more options."
 msgstr ""
-
-#~ msgid "Simple Scan Help"
-#~ msgstr "Ayuda de Simple Scan"
-
-#~ msgid "To remove the selected page use the <key>Delete</key> key."
-#~ msgstr "Para quitar la página seleccionada use la tecla <key>Suprimir</key>."
-
-#~ msgid ""
-#~ "To save the current document to a file use the "
-#~ "<guiseq><gui>Document</gui><gui>Save</gui></guiseq> menu "
-#~ "(<keyseq><key>Ctrl</key><key>S</key></keyseq>). When you save, there is a "
-#~ "choice of three file types."
-#~ msgstr ""
-#~ "Para guardar el documento actual a un archivo use el menú "
-#~ "<guiseq><gui>Documento</gui><gui>Guardar</gui></guiseq>(<keyseq><key>Ctrl</ke"
-#~ "y><key>S</key></keyseq>). Cuando guarde, puede elegir entre tres tipos de "
-#~ "archivo."
-
-#~ msgid "Portable Document Format (PDF)"
-#~ msgstr "Formato de documento portable (PDF)"
-
-#~ msgid "Connect the scanner to your computer."
-#~ msgstr "Conecte el escáner a su equipo."
-
-#~ msgid "Rotating Pages"
-#~ msgstr "Girar páginas"
-
-#~ msgid "Each new page that is scanned will use the previous crop."
-#~ msgstr "Cada página nueva que se escanee utilizará el recorte anterior."
-
-#~ msgid ""
-#~ "Press the scan button in the toolbar (or "
-#~ "<keyseq><key>Ctrl</key><key>1</key></keyseq>)."
-#~ msgstr ""
-#~ "Pulse el botón para escanear en la barra de herramientas (o "
-#~ "<keyseq><key>Ctrl</key><key>1</key></keyseq>)."
-
-#~ msgid "Use this type if you need high resolution files for editing"
-#~ msgstr ""
-#~ "Use este tipo si necesita archivos de alta resolución para su edición"
-
-#~ msgid "Use this type if you want to modify or upload the scanned images."
-#~ msgstr ""
-#~ "Use este formato si quiere modificar o subir las imágenes escaneadas."
-
-#~ msgid "Use this type if you have scanned multiple pages of text."
-#~ msgstr "Use este tipo si ha escaneado varias páginas de texto."
-
-#~ msgid ""
-#~ "The crop area can be adjusted by clicking on the inside of the crop area "
-#~ "border and dragging the mouse."
-#~ msgstr ""
-#~ "Puede ajustar el área de recorte pulsando en el interior del borde del área "
-#~ "de recorte y arrastrando el ratón."
-
-#~ msgid "To stop the scan at any time press <key>Escape</key>."
-#~ msgstr ""
-#~ "Para detener el escaneo en cualquier momento, oprima <key>Escape</key>."
-
-#~ msgid "The page will be shown as it is scanned."
-#~ msgstr "La página se mostrará a medida que se escanea."
-
-#~ msgid ""
-#~ "Your local scanners are automatically detected each time you start "
-#~ "<app>Simple Scan</app> and each time you plug in USB scanner. If you have a "
-#~ "network scanner you will need to restart <app>Simple Scan</app> for it to be "
-#~ "detected."
-#~ msgstr ""
-#~ "Cada vez que inicia <app>Simple Scan</app> y cada vez que conecta un escáner "
-#~ "USB, sus escáneres locales se detectan automáticamente. Si tiene un escáner "
-#~ "de red, necesitará reiniciar <app>Simple Scan</app> para que lo detecte."
-
-#~ msgid ""
-#~ "Each page you scan is added to the end of your document. To start a new "
-#~ "document select <guiseq><gui>Document</gui><gui>New</gui></guiseq>. "
-#~ "Individual pages can be deleted by right clicking a page or pressing the "
-#~ "<key>Delete</key> key."
-#~ msgstr ""
-#~ "Cada página que escanea se añade al final de su documento. Para comenzar un "
-#~ "documento nuevo, seleccione "
-#~ "<guiseq><gui>Documento</gui><gui>Nuevo</gui></guiseq>. Puede eliminar "
-#~ "páginas individuales pulsando con el botón derecho del ratón sobre ellas u "
-#~ "oprimiendo la tecla <key>Supr</key>."
-
-#~ msgid ""
-#~ "The type of scan can be changed from the "
-#~ "<guiseq><gui>Document</gui><gui>Scan</gui></guiseq> menu. Choose "
-#~ "<gui>Text</gui> if you want the document to be quickly scanned in black and "
-#~ "white or <gui>Photo</gui> for a high resolution color scan."
-#~ msgstr ""
-#~ "Puede modificar el tipo de escaneo desde el menú "
-#~ "<guiseq><gui>Documento</gui><gui>Escanear</gui></guiseq>. Elija "
-#~ "<gui>Texto</gui> si quiere que el documento se escanee rápidamente en blanco "
-#~ "y negro, o <gui>Foto</gui> para un escaneo a color en alta resolución."
-
-#~ msgid ""
-#~ "By default text documents will be scanned at 200 dots per inch (dpi) and "
-#~ "photos at 400 dpi. To change these settings open the preferences from the "
-#~ "<guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu."
-#~ msgstr ""
-#~ "De manera predeterminada, se escanearán los documentos a 200 puntos por "
-#~ "pulgada (ppp) y las fotos a 400 ppp. Para modificar esta configuración, abra "
-#~ "las preferencias yendo al menú "
-#~ "<guiseq><gui>Documento</gui><gui>Preferencias</gui></guiseq>."
-
-#~ msgid ""
-#~ "Fixed crop sizes can be chosen from the "
-#~ "<guiseq><gui>Page</gui><gui>Crop</gui></guiseq> menu that match commonly "
-#~ "used paper sizes."
-#~ msgstr ""
-#~ "En el menú <guiseq><gui>Página</gui><gui>Recortar</gui></guiseq> se pueden "
-#~ "elegir tamaños predefinidos de recorte que se ajustan a las medidas de papel "
-#~ "más comunes."
-
-#~ msgid ""
-#~ "If your scanner has an Automatic Document Feeder (ADF) you can scan all the "
-#~ "pages by selecting the <guiseq><gui>Document</gui><gui>Scan</gui><gui>All "
-#~ "Pages From Feeder</gui></guiseq> menu."
-#~ msgstr ""
-#~ "Si su escáner cuenta con un alimentador automático de documentos (ADF, por "
-#~ "sus siglas en inglés) podrá digitalizar todas las páginas mediante el menú "
-#~ "<guiseq><gui>Documento</gui><gui>Escanear</gui><gui>Todas las páginas del "
-#~ "alimentador</gui></guiseq>."
-
-#~ msgid ""
-#~ "PNG files contain the raw data from the scanner. This makes them much larger "
-#~ "than JPEG files and not suitable for distributing. If you have scanned "
-#~ "multiple pages then a PNG file will be written for each page."
-#~ msgstr ""
-#~ "Los archivos PNG contienen los datos en bruto del escáner. Esto los vuelve "
-#~ "mucho más grandes que los archivos JPEG y, por tanto, no adecuados para su "
-#~ "distribución. Si ha digitalizado varias páginas se creará un archivo PNG por "
-#~ "cada una de ellas."
-
-#~ msgid ""
-#~ "JPEG file is the file format used by digital cameras and is very small and "
-#~ "so easy to distribute. Most people have software to modify JPEG photos and "
-#~ "this format is suitable for uploading to social networking sites. If you "
-#~ "have scanned multiple pages then a JPEG file will be written for each page."
-#~ msgstr ""
-#~ "El formato de archivo JPEG se utiliza en las cámaras digitales y es pequeño, "
-#~ "lo cual lo vuelve fácil de distribuir. Este formato es adecuado para cargar "
-#~ "en sitios de interacción social; y la mayoría de las personas cuentan con "
-#~ "software de modificación de fotos JPEG. Si ha digitalizado varias páginas se "
-#~ "creará un archivo JPEG por cada una de ellas."
-
-#~ msgid ""
-#~ "By default both sides of the paper will be scanned if your scanned supports "
-#~ "this. Single side scanning can be configured from the "
-#~ "<guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu."
-#~ msgstr ""
-#~ "De manera predeterminada se digitalizarán ambas caras del papel, si su "
-#~ "escáner admite esta funcionalidad. Puede configurar la digitalización de una "
-#~ "sola cara yendo a "
-#~ "<guiseq><gui>Documento</gui><gui>Preferencias</gui></guiseq>."
diff --git a/help/eu/eu.po b/help/eu/eu.po
index f74bb98..121034f 100644
--- a/help/eu/eu.po
+++ b/help/eu/eu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-04-26 05:45+0000\n"
-"X-Generator: Launchpad (build 17995)\n"
+"X-Launchpad-Export-Date: 2016-05-07 04:36+0000\n"
+"X-Generator: Launchpad (build 18025)\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
@@ -739,215 +739,3 @@ msgid ""
 "black and white; choose <gui><em>Photo</em></gui> for a high resolution "
 "color scan. See <link xref=\"dpi\"/> for more details and more options."
 msgstr ""
-
-#~ msgid "Simple Scan Help"
-#~ msgstr "Simple Scan-en laguntza"
-
-#~ msgid "Rotating Pages"
-#~ msgstr "Orrialdeak biratzea"
-
-#~ msgid "Each new page that is scanned will use the previous crop."
-#~ msgstr ""
-#~ "Eskaneatzen diren hurrengo orrialdeetarako, aurreko moztea erabiliko da."
-
-#~ msgid ""
-#~ "If the document type is set to text the email will have a PDF attachment "
-#~ "otherwise the email will have a JPEG attachment for each page."
-#~ msgstr ""
-#~ "Dokumentu-mota testukoa dela ezarri bada, postak PDF eranskin bat izango du; "
-#~ "bestela, postak orrialde bakoitzaren JPG eranskinak izango ditu."
-
-#~ msgid "Portable Document Format (PDF)"
-#~ msgstr "Portable Document Format (PDF)"
-
-#~ msgid "Use this type if you need high resolution files for editing"
-#~ msgstr ""
-#~ "Erabili mota hau ediziorako bereizmen handiko fitxategiak behar badituzu."
-
-#~ msgid "Use this type if you want to modify or upload the scanned images."
-#~ msgstr ""
-#~ "Erabili mota hau eskaneatutako irudiak moldatu edo sarera igo nahi badituzu."
-
-#~ msgid "Use this type if you have scanned multiple pages of text."
-#~ msgstr "Erabili mota hau testu-orrialde anitz eskaneatu badituzu."
-
-#~ msgid "Connect the scanner to your computer."
-#~ msgstr "Konektatu eskanerra ordenagailuarekin."
-
-#~ msgid ""
-#~ "Fixed crop sizes can be chosen from the "
-#~ "<guiseq><gui>Page</gui><gui>Crop</gui></guiseq> menu that match commonly "
-#~ "used paper sizes."
-#~ msgstr ""
-#~ "<guiseq><gui>Orrialdea</gui><gui>Moztu</gui></guiseq> menuan, arruntak diren "
-#~ "paper-tamainekin bat datozen mozte-tamaina finkoak hauta daitezke."
-
-#~ msgid ""
-#~ "The crop area can be adjusted by clicking on the inside of the crop area "
-#~ "border and dragging the mouse."
-#~ msgstr ""
-#~ "Mozte-area doitzeko, egin klik bere barruko ertzean eta arrastatu saguarekin."
-
-#~ msgid ""
-#~ "By default both sides of the paper will be scanned if your scanned supports "
-#~ "this. Single side scanning can be configured from the "
-#~ "<guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu."
-#~ msgstr ""
-#~ "Modu lehenetsian orriaren bi aldeak eskaneatuko dira, zure eskanerrak hori "
-#~ "onartzen badu. Alde bakarraren eskaneatzea "
-#~ "<guiseq><gui>Dokumentua</gui><gui>Hobespenak</gui></guiseq> menuan konfigura "
-#~ "daiteke."
-
-#~ msgid ""
-#~ "If your scanner has an Automatic Document Feeder (ADF) you can scan all the "
-#~ "pages by selecting the <guiseq><gui>Document</gui><gui>Scan</gui><gui>All "
-#~ "Pages From Feeder</gui></guiseq> menu."
-#~ msgstr ""
-#~ "ZUre eskanerrak dokumentuen elikatze automatikoa (ADF) badauka, orrialde "
-#~ "guztiak aldi berean eskanea ditzakezu "
-#~ "<guiseq><gui>Dokumentua</gui><gui>Eskaneatu</gui><gui>Elikagailuko orri "
-#~ "guztiak</gui></guiseq> menua hautatuz."
-
-#~ msgid "To remove the selected page use the <key>Delete</key> key."
-#~ msgstr "Hautatutako orrialdea kentzeko, erabili <key>Delete</key> tekla."
-
-#~ msgid ""
-#~ "To print the current document use the "
-#~ "<guiseq><gui>Document</gui><gui>Print</gui></guiseq> menu "
-#~ "(<keyseq><key>Ctrl</key><key>P</key></keyseq>)."
-#~ msgstr ""
-#~ "Uneko dokumentua inprimatzeko, erabili "
-#~ "<guiseq><gui>Dokumentua</gui><gui>Inprimatu</gui></guiseq> menua "
-#~ "(<keyseq><key>Ctrl</key><key>P</key></keyseq>)."
-
-#~ msgid ""
-#~ "Press the scan button in the toolbar (or "
-#~ "<keyseq><key>Ctrl</key><key>1</key></keyseq>)."
-#~ msgstr ""
-#~ "Sakatu tresna-barraren eskaneatze-botoia (edo "
-#~ "<keyseq><key>Ctrl</key><key>1</key></keyseq>)."
-
-#~ msgid "The page will be shown as it is scanned."
-#~ msgstr "Orrialdea hura eskaneatu den bezala erakutsiko da."
-
-#~ msgid ""
-#~ "If you have multiple scanners you can change which scanner is selected from "
-#~ "the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu."
-#~ msgstr ""
-#~ "Hainbat eskaner badituzu, zein eskaner hautatuko den alda dezakezu "
-#~ "<guiseq><gui>Dokumentua</gui><gui>Hobespenak</gui></guiseq> menuan."
-
-#~ msgid ""
-#~ "To use only part of the scanned page enable crop by selecting the crop "
-#~ "button in the toolbar. A mask will be shown over the current page with the "
-#~ "area not being used shown in gray."
-#~ msgstr ""
-#~ "Eskaneatutako orrialdearen zati bat soilik erabiltzeko, moztu tresna-"
-#~ "barraren mozte-botoia hautatuz. Maskara bat erakutsiko da uneko orrialdearen "
-#~ "gainean, eta erabiliko ez den area gris kolorez erakutsiko da."
-
-#~ msgid ""
-#~ "By default text documents will be scanned at 200 dots per inch (dpi) and "
-#~ "photos at 400 dpi. To change these settings open the preferences from the "
-#~ "<guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu."
-#~ msgstr ""
-#~ "Modu lehenetsian testu-dokumentuak 200 puntu hazbeteko (dpi) bereizmenarekin "
-#~ "eskaneatuko dira, eta argazkiak 400 dpi-ko bereizmenarekin. Ezarpen hauek "
-#~ "aldatzeko, ireki hobespenak  "
-#~ "<guiseq><gui>Dokumentua</gui><gui>Hobespenak</gui></guiseq> menua erabiliz."
-
-#~ msgid "To stop the scan at any time press <key>Escape</key>."
-#~ msgstr "Eskaneatzea edozein unetan gelditzeko, sakatu <key>Escape</key>."
-
-#~ msgid ""
-#~ "PNG files contain the raw data from the scanner. This makes them much larger "
-#~ "than JPEG files and not suitable for distributing. If you have scanned "
-#~ "multiple pages then a PNG file will be written for each page."
-#~ msgstr ""
-#~ "PNG fitxategiek eskanerraren datu gordinak gordetzen dituzte. Hori dela eta, "
-#~ "JPEG fitxategiak baino handiagoak dira eta ez dira egokiak partekatuak "
-#~ "izateko. Hainbat orrialde eskaneatu badituzu, PNG fitxategi bat idatziko da "
-#~ "orrialde bakoitzerako."
-
-#~ msgid ""
-#~ "JPEG file is the file format used by digital cameras and is very small and "
-#~ "so easy to distribute. Most people have software to modify JPEG photos and "
-#~ "this format is suitable for uploading to social networking sites. If you "
-#~ "have scanned multiple pages then a JPEG file will be written for each page."
-#~ msgstr ""
-#~ "JPEG fitxategia kamera digitalek erabilitako formatua da eta oso txikia eta "
-#~ "partekatzeko erraza da. Jende gehienak JPEG argazkiak moldatzeko softwarea "
-#~ "dauka eta formatu hau egokia da sare sozialetara irudiak igotzeko. Hainbat "
-#~ "orrialde eskaneatu badituzu, JPEG fitxategi bat idatziko da orrialde "
-#~ "bakoitzerako."
-
-#~ msgid ""
-#~ "A PDF can contain multiple pages (like a book) and is easy to distribute to "
-#~ "other people. Most people do not have software to modify PDF documents so "
-#~ "this format is best used for archiving."
-#~ msgstr ""
-#~ "PDF batek hainbat orri eduki ditzake (liburu batek bezala) eta erraza da "
-#~ "hura beste batzuekin partekatzea. Jende gehienak ez dauka PDF dokumentuak "
-#~ "moldatzeko softwarea, beraz hobe da formatu hau behin-betiko informazioa "
-#~ "gordetzeko erabiltzea."
-
-#~ msgid ""
-#~ "Each page you scan is added to the end of your document. To start a new "
-#~ "document select <guiseq><gui>Document</gui><gui>New</gui></guiseq>. "
-#~ "Individual pages can be deleted by right clicking a page or pressing the "
-#~ "<key>Delete</key> key."
-#~ msgstr ""
-#~ "Eskaneatzen duzun orrialde bakoitza zure dokumentuaren amaiera aldeari "
-#~ "eransten zaio. Dokumentu berria hasteko, hautatu "
-#~ "<guiseq><gui>Dokumentua</gui><gui>Berria</gui></guiseq>. Banakako orrialdeak "
-#~ "ezabatzeko, egin klik eskuineko botoiarekin orrialdean, edo sakatu "
-#~ "<key>Ezabatu</key> tekla."
-
-#~ msgid ""
-#~ "To move a page, select it and move the page left or right using the "
-#~ "<key>&lt;</key> and <key>&gt;</key> keys."
-#~ msgstr ""
-#~ "Orrialde bat mugitzeko, hautatu eta mugitu ezkerrera edo eskuinera  "
-#~ "<key>&lt;</key> eta <key>&gt;</key> teklak erabiliz."
-
-#~ msgid ""
-#~ "To rotate a page use the rotation buttons in the toolbar or the <key>[</key> "
-#~ "and <key>]</key> keys. Each new page that is scanned will use the previous "
-#~ "rotation."
-#~ msgstr ""
-#~ "Orrialde bat biratzeko, erabili tresna-barrako biratze-botoiak edo "
-#~ "<key>[</key> eta <key>]</key> teklak. Eskaneatzen den orrialde berri "
-#~ "bakoitzak aurretik ezarri den biratzea erabiliko da."
-
-#~ msgid ""
-#~ "Your local scanners are automatically detected each time you start "
-#~ "<app>Simple Scan</app> and each time you plug in USB scanner. If you have a "
-#~ "network scanner you will need to restart <app>Simple Scan</app> for it to be "
-#~ "detected."
-#~ msgstr ""
-#~ "Zure eskaner lokalak automatikoki detektatzen dira <app>Simple Scan</app> "
-#~ "abiarazten duzun bakoitzean eta USB eskaner bat konektatzen duzunean. Sareko "
-#~ "eskaner bat badaukazu, <app>Simple Scan</app> berrabiarazi beharko duzu hura "
-#~ "detektatua izan dadin."
-
-#~ msgid ""
-#~ "To save the current document to a file use the "
-#~ "<guiseq><gui>Document</gui><gui>Save</gui></guiseq> menu "
-#~ "(<keyseq><key>Ctrl</key><key>S</key></keyseq>). When you save, there is a "
-#~ "choice of three file types."
-#~ msgstr ""
-#~ "Uneko dokumentua fitxategi batean gordetzeko, erabili "
-#~ "<guiseq><gui>Dokumentua</gui><gui>Gorde</gui></guiseq> menua "
-#~ "(<keyseq><key>Ctrl</key><key>S</key></keyseq>). Gordetzen duzunean, hiru "
-#~ "fitxategi-motaren artean hautatu ahal izango duzu."
-
-#~ msgid ""
-#~ "The type of scan can be changed from the "
-#~ "<guiseq><gui>Document</gui><gui>Scan</gui></guiseq> menu. Choose "
-#~ "<gui>Text</gui> if you want the document to be quickly scanned in black and "
-#~ "white or <gui>Photo</gui> for a high resolution color scan."
-#~ msgstr ""
-#~ "Eskaner-mota <guiseq><gui>Dokumentua</gui><gui>Eskaneatu</gui></guiseq> "
-#~ "menutik alda daiteke. Hautatu <gui>Testua</gui> dokumentua zuri-beltzean "
-#~ "azkar eskaneatu nahi baduzu, edo <gui>Argazkia</gui> bereizmen handian eta "
-#~ "koloretan eskaneatu nahi baduzu."
diff --git a/help/fi/fi.po b/help/fi/fi.po
index 4aaf869..7af185f 100644
--- a/help/fi/fi.po
+++ b/help/fi/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-04-26 05:45+0000\n"
-"X-Generator: Launchpad (build 17995)\n"
+"X-Launchpad-Export-Date: 2016-05-07 04:36+0000\n"
+"X-Generator: Launchpad (build 18025)\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
@@ -729,16 +729,3 @@ msgid ""
 "black and white; choose <gui><em>Photo</em></gui> for a high resolution "
 "color scan. See <link xref=\"dpi\"/> for more details and more options."
 msgstr ""
-
-#~ msgid "Simple Scan Help"
-#~ msgstr "Kuvanluvun ohje"
-
-#~ msgid "Rotating Pages"
-#~ msgstr "Sivujen kiertäminen"
-
-#~ msgid "Connect the scanner to your computer."
-#~ msgstr "Yhdistä kuvanlukija tietokoneeseen."
-
-#~ msgid "To stop the scan at any time press <key>Escape</key>."
-#~ msgstr ""
-#~ "Lopeta kuvanluku millä tahansa hetkellä painamalla <key>Escape</key>."
diff --git a/help/fr/adf.page b/help/fr/adf.page
index 96052aa..138dd1e 100644
--- a/help/fr/adf.page
+++ b/help/fr/adf.page
@@ -12,36 +12,31 @@
 	<title/>
 	<title>Utiliser un raccourci clavier</title>
 	<item>
-	  <p>Press <keyseq><key>Ctrl</key><key>F</key></keyseq></p>
+	  <p>Appuyez sur <keyseq><key>Ctrl</key><key>F</key></keyseq></p>
 	</item>      
       </steps>
       
       <steps>
-	<title>Use a Menu</title>
+	<title>Utiliser un menu</title>
 	<item>
-	  <p>Navigate to <guiseq><gui>Document</gui>
-	  <gui>Scan</gui><gui>All Pages From Feeder</gui></guiseq>.
-	  </p>
+	  <p>Naviguez vers <guiseq><gui>Document</gui> <gui>Numériser</gui><gui>Toutes les pages du chargeur</gui></guiseq>.</p>
 	</item>
       </steps>
       
       <steps>
-	<title>Use the Toolbar Buttons</title>
+	<title>Utiliser les boutons de la barre d'outils</title>
 	<item>
-	  <p>Click on the arrow to the right of the "Scan" button.</p>
+	  <p>Cliquez sur la flèche à droite du bouton « Numériser ».</p>
 	</item>
 	<item>
-	  <p>Choose "All Pages From Feeder".</p>
+	  <p>Sélectionnez « Toutes les pages du chargeur »</p>
 	  <media type="image" src="figures/scan_toolbar.png"/>
 	</item>
       </steps>
     
     
     <note style="tip">
-    <p>
-    By default, both sides of a sheet will scan if your scanner has this capability.
-    You can choose single side scanning from the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu.
-    </p>
+    <p>Par défaut, les deux faces de la feuille seront numérisées si votre périphérique le permet. Vous pouvez choisir de ne numériser qu'une seule face depuis le menu <guiseq><gui>Document</gui><gui>Préférences</gui></guiseq>.</p>
     <media type="image" src="figures/preferences.png"/>
     </note>
     
diff --git a/help/fr/brightness-contrast.page b/help/fr/brightness-contrast.page
index e4b6242..4dfc0e4 100644
--- a/help/fr/brightness-contrast.page
+++ b/help/fr/brightness-contrast.page
@@ -5,10 +5,7 @@
         <link type="guide" xref="index#acquire"/>
     </info>
 
-	<title>Setting brightness and Contrast</title>
+	<title>Réglage de la luminosité et du contraste</title>
 
-    <p>
-    Some scanners allow the user to adjust the brightness and contrast when scanning.
-    If your scans come out too dark or too light you can adjust these settings from the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu.
-    </p>
+    <p>Certains périphériques de numérisation permettent à l'utilisateur d'ajuster la luminosité et le contraste durant la numérisation. Si vos numérisations sont trop sombres ou trop claires, vous pouvez régler ces paramètres à partir du menu <guiseq><gui>Document</gui><gui>Préférences</gui></guiseq>.</p>
 </page>
diff --git a/help/fr/crop.page b/help/fr/crop.page
index 4f5f3ce..9450bb3 100644
--- a/help/fr/crop.page
+++ b/help/fr/crop.page
@@ -7,38 +7,29 @@
   
 	<title>Recadrage</title>
 
-    <p>
-    The cropping feature in <app>Simple Scan</app> allows you to use only a part of a scanned image. You can
-    enable crop either before or after scanning a page, and you can always change the dimensions of the crop
-    frame. When crop is enabled, a mask will apper over the current page with the area not being used shown
-    in gray. You can enable crop and choose the desired dimensions via one of the following methods:
-    </p>
+    <p>La fonction recadrage dans <app>Simple Scan</app> vous permet de n'utiliser qu'une partie d'une image numérisée. Vous pouvez activer le recadrage avant ou après la numérisation d'une page et vous pouvez toujours changer les dimensions du recadrage. Lorsque le recadrage est activé, un masque apparaîtra sur la page en cours, la zone non utilisée sera grisée. Vous pouvez activer le recadrage et choisir les dimensions souhaitées via l'une des méthodes suivantes :</p>
     
     <steps>
-      <title>Use a Right Click</title>
-      <item><p>Right click anywhere on the image area and select "Crop".</p></item>
-      <item><p>Choose one of the fixed crop frames, or select "Custom" to manually
-	set the crop frame's dimensions by dragging its borders.</p></item>
-      <item><p>Click and hold the frame, then move it to the desired position.</p></item>
+      <title>Utilisez un clic droit</title>
+      <item><p>Faites un clic droit à n'importe quel endroit de la page et sélectionnez « Recadrer ».</p></item>
+      <item><p>Sélectionnez un des cadres fixes ou sélectionnez « Personnalisé » pour définir manuellement les dimensions du cadre en faisant glisser ses bords.</p></item>
+      <item><p>Cliquez et maintenez le cadre, puis déplacez-le sur la position désirée.</p></item>
     </steps>
     
     <steps>
-      <title>Use a Menu</title>
-      <item><p>Navigate to the <guiseq><gui>Page</gui><gui>Crop</gui></guiseq> menu.</p></item>
-      <item><p>Choose one of the fixed crop frames, or select "Custom" to manually adjust the frame's dimensions by dragging its borders.</p></item>
-      <item><p>Click and hold the frame, then move it to the desired position.</p></item>
+      <title>Utiliser un menu</title>
+      <item><p>Naviguez vers le menu <guiseq><gui>Page</gui><gui>Recadrer</gui></guiseq>.</p></item>
+      <item><p>Sélectionnez un des cadres fixes ou sélectionnez « Personnalisé » pour définir manuellement les dimensions du cadre en faisant glisser ses bords.</p></item>
+      <item><p>Cliquez et maintenez le cadre, puis déplacez-le sur la position désirée.</p></item>
     </steps>
     
     <steps>
-      <title>Use the Toolbar</title>
-      <item><p>Click the "<gui>Crop</gui>" button in the toolbar.</p>
-	    <note style="tip"><p>This is the same as choosing "Custom" in step 2 of the
-	      aforementioned methods.</p></note></item>      
-      <item><p>Drag the borders of the frame to set the desired dimensions and position.</p></item>
+      <title>Utiliser la barre d'outils</title>
+      <item><p>Cliquez sur le bouton « <gui>Recadrer</gui> » dans la barre d'outils.</p>
+	    <note style="tip"><p>Ceci revient au même que de choisir « Personnalisé » à l'étape 2 des méthodes mentionnées ci-dessus.</p></note></item>      
+      <item><p>Faites glisser les bords du cadre pour définir les dimensions désirées et la position.</p></item>
 
     </steps>
     
-    <note><p>
-    Each new scanned page will use the previous crop.
-    </p></note>
+    <note><p>Chaque nouvelle page numérisée utilisera le recadrage précédent.</p></note>
 </page>
diff --git a/help/fr/dpi.page b/help/fr/dpi.page
index 01fff56..7d42540 100644
--- a/help/fr/dpi.page
+++ b/help/fr/dpi.page
@@ -7,50 +7,43 @@
   
 	<title>Configuration de la résolution du périphérique de numérisation</title>
 
-    <p>
-    The default resolution for document type <gui><em>Text</em></gui> is 150 dpi (dots per inch)
-    and for document type <gui><em>Photo</em></gui> is 300 dpi. You can change these settings
-    from the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu.
-    </p>
+    <p>La résolution par défaut pour un document <gui><em>Texte</em></gui> est de 150 ppp (points par pouce), pour un document <gui><em>Photo</em></gui>, elle est de 300 ppp. Vous pouvez modifier ces réglages dans le menu <guiseq><gui>Document</gui><gui>Préférences</gui></guiseq>.</p>
     <media type="image" src="figures/preferences.png"/>
     
-    <p>The available scanning resolutions for both document types (Text and Photo) are the same
-    and are listed in the following table:</p>
+    <p>Les résolutions de numérisation disponibles pour les deux types de documents (textes et photos) sont les mêmes et sont listées dans le tableau suivant :</p>
     
     <table frame="bottom left right" rules="rows cols" shade="rows">
 	<tr>
-		<td><p><em>Text Resolution</em></p></td>
-		<td><p><em>Photo Resolution</em></p></td>
+		<td><p><em>Résolution texte</em></p></td>
+		<td><p><em>Résolution photo</em></p></td>
 	</tr>
 	<tr>
-		<td><p>75 dpi (draft)</p></td>
-		<td><p>75 dpi (draft)</p></td>
+		<td><p>75 ppp (brouillon)</p></td>
+		<td><p>75 ppp (brouillon)</p></td>
 	</tr>
 	<tr>
-		<td><p>150 dpi (default)</p></td>
-		<td><p>150 dpi</p></td>
+		<td><p>150 ppp (par défaut)</p></td>
+		<td><p>150 ppp</p></td>
 	</tr>
 	<tr>
-		<td><p>300 dpi</p></td>
-		<td><p>300 dpi (default)</p></td>
+		<td><p>300 ppp</p></td>
+		<td><p>300 ppp (par défaut)</p></td>
 	</tr>
 	<tr>
-		<td><p>600 dpi</p></td>
-		<td><p>600 dpi</p></td>
+		<td><p>600 ppp</p></td>
+		<td><p>600 ppp</p></td>
 	</tr>
 	<tr>
-		<td><p>1200 dpi (high resolution)</p></td>
-		<td><p>1200 dpi (high resolution)</p></td>
+		<td><p>1200 ppp (haute résolution)</p></td>
+		<td><p>1200 ppp (haute résolution)</p></td>
 	</tr>
 	<tr>
-		<td><p>2400 dpi</p></td>
-		<td><p>2400 dpi</p></td>
+		<td><p>2400 ppp</p></td>
+		<td><p>2400 ppp</p></td>
 	</tr>
     </table>
     
-    <note style="important"><p><gui><em>Text</em></gui> documents are always scanned in black
-      and white, while <gui><em>Photo</em></gui> documents are always scanned in color, at any
-      resolution!</p>
+    <note style="important"><p>Les documents <gui><em>Texte</em></gui> sont toujours numérisés en noir et blanc alors que les documents <gui><em>Photo</em></gui> sont toujours numérisés en couleur, quelle que soit la résolution !</p>
     </note>
 
 </page>
diff --git a/help/fr/email.page b/help/fr/email.page
index 1c413c6..c8652af 100644
--- a/help/fr/email.page
+++ b/help/fr/email.page
@@ -8,10 +8,6 @@
 	<title>Envoi par courriel</title>
 
     <p>Pour envoyer le document actuel par courriel, choisissez le menu <guiseq><gui>Document</gui><gui>Courriel</gui></guiseq>(<keyseq><key>Ctrl</key><key>E</key></keyseq>). Votre logiciel de messagerie électronique s'ouvrira avec un nouveau message qui contiendra le document numérisé en pièce jointe.</p>
-    <p>
-    If the document type was set to "Text" the email will have a PDF attachment for each page. 
-    Conversely, if the document type was set to "Photo", the email will have a JPEG
-    attachment for each page.    
-    </p>
-    <p>Voir <link xref="save"/> pour plus d'information à propos des formats de fichiers.</p>
+    <p>Si le type de document a été réglé sur « Texte » le courriel aura une pièce jointe PDF pour chaque page. À l'inverse, si le type de document a été réglé sur « Photo », le courriel aura une pièce jointe JPEG pour chaque page.</p>
+    <p>Consultez <link xref="save"/> pour plus d'information à propos des formats de fichiers.</p>
 </page>
diff --git a/help/fr/fr.po b/help/fr/fr.po
index b87d560..07661ff 100644
--- a/help/fr/fr.po
+++ b/help/fr/fr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2016-04-25 14:55+0200\n"
-"PO-Revision-Date: 2016-04-25 17:09+0000\n"
+"PO-Revision-Date: 2016-05-23 16:26+0000\n"
 "Last-Translator: Jean-Marc <Unknown>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-04-26 05:45+0000\n"
-"X-Generator: Launchpad (build 17995)\n"
+"X-Launchpad-Export-Date: 2016-05-24 05:40+0000\n"
+"X-Generator: Launchpad (build 18053)\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
@@ -51,6 +51,7 @@ msgstr ""
 #: C/index.page:17
 msgid "<media type=\"image\" src=\"figures/icon.png\"/> Simple Scan Manual"
 msgstr ""
+"<media type=\"image\" src=\"figures/icon.png\"/> Manuel de Simple Scan"
 
 #. (itstool) path: section/title
 #: C/index.page:20
@@ -70,7 +71,7 @@ msgstr "Utilisation du document"
 #. (itstool) path: section/title
 #: C/index.page:32
 msgid "Simple Scan Shortcuts"
-msgstr ""
+msgstr "Raccourcis de Simple Scan"
 
 #. (itstool) path: page/title
 #: C/adf.page:9
@@ -95,14 +96,14 @@ msgstr "Utiliser un raccourci clavier"
 #. (itstool) path: item/p
 #: C/adf.page:19
 msgid "Press <keyseq><key>Ctrl</key><key>F</key></keyseq>"
-msgstr ""
+msgstr "Appuyez sur <keyseq><key>Ctrl</key><key>F</key></keyseq>"
 
 #. (itstool) path: steps/title
 #: C/adf.page:24
 #: C/crop.page:27
 #: C/rotate.page:28
 msgid "Use a Menu"
-msgstr ""
+msgstr "Utiliser un menu"
 
 #. (itstool) path: item/p
 #: C/adf.page:26
@@ -110,21 +111,23 @@ msgid ""
 "Navigate to <guiseq><gui>Document</gui> <gui>Scan</gui><gui>All Pages From "
 "Feeder</gui></guiseq>."
 msgstr ""
+"Naviguez vers <guiseq><gui>Document</gui> <gui>Numériser</gui><gui>Toutes "
+"les pages du chargeur</gui></guiseq>."
 
 #. (itstool) path: steps/title
 #: C/adf.page:33
 msgid "Use the Toolbar Buttons"
-msgstr ""
+msgstr "Utiliser les boutons de la barre d'outils"
 
 #. (itstool) path: item/p
 #: C/adf.page:35
 msgid "Click on the arrow to the right of the \"Scan\" button."
-msgstr ""
+msgstr "Cliquez sur la flèche à droite du bouton « Numériser »."
 
 #. (itstool) path: item/p
 #: C/adf.page:38
 msgid "Choose \"All Pages From Feeder\"."
-msgstr ""
+msgstr "Sélectionnez « Toutes les pages du chargeur »"
 
 #. (itstool) path: item/media
 #. This is a reference to an external file such as an image or video. When
@@ -148,6 +151,10 @@ msgid ""
 "capability. You can choose single side scanning from the "
 "<guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu."
 msgstr ""
+"Par défaut, les deux faces de la feuille seront numérisées si votre "
+"périphérique le permet. Vous pouvez choisir de ne numériser qu'une seule "
+"face depuis le menu "
+"<guiseq><gui>Document</gui><gui>Préférences</gui></guiseq>."
 
 #. (itstool) path: note/media
 #. (itstool) path: page/media
@@ -167,7 +174,7 @@ msgstr ""
 #. (itstool) path: page/title
 #: C/brightness-contrast.page:9
 msgid "Setting brightness and Contrast"
-msgstr ""
+msgstr "Réglage de la luminosité et du contraste"
 
 #. (itstool) path: page/p
 #: C/brightness-contrast.page:11
@@ -177,6 +184,10 @@ msgid ""
 "settings from the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> "
 "menu."
 msgstr ""
+"Certains périphériques de numérisation permettent à l'utilisateur d'ajuster "
+"la luminosité et le contraste durant la numérisation. Si vos numérisations "
+"sont trop sombres ou trop claires, vous pouvez régler ces paramètres à "
+"partir du menu <guiseq><gui>Document</gui><gui>Préférences</gui></guiseq>."
 
 #. (itstool) path: page/title
 #: C/crop.page:9
@@ -193,16 +204,25 @@ msgid ""
 "used shown in gray. You can enable crop and choose the desired dimensions "
 "via one of the following methods:"
 msgstr ""
+"La fonction recadrage dans <app>Simple Scan</app> vous permet de n'utiliser "
+"qu'une partie d'une image numérisée. Vous pouvez activer le recadrage avant "
+"ou après la numérisation d'une page et vous pouvez toujours changer les "
+"dimensions du recadrage. Lorsque le recadrage est activé, un masque "
+"apparaîtra sur la page en cours, la zone non utilisée sera grisée. Vous "
+"pouvez activer le recadrage et choisir les dimensions souhaitées via l'une "
+"des méthodes suivantes :"
 
 #. (itstool) path: steps/title
 #: C/crop.page:19
 msgid "Use a Right Click"
-msgstr ""
+msgstr "Utilisez un clic droit"
 
 #. (itstool) path: item/p
 #: C/crop.page:20
 msgid "Right click anywhere on the image area and select \"Crop\"."
 msgstr ""
+"Faites un clic droit à n'importe quel endroit de la page et sélectionnez "
+"« Recadrer »."
 
 #. (itstool) path: item/p
 #: C/crop.page:21
@@ -210,17 +230,21 @@ msgid ""
 "Choose one of the fixed crop frames, or select \"Custom\" to manually set "
 "the crop frame's dimensions by dragging its borders."
 msgstr ""
+"Sélectionnez un des cadres fixes ou sélectionnez « Personnalisé » pour "
+"définir manuellement les dimensions du cadre en faisant glisser ses bords."
 
 #. (itstool) path: item/p
 #: C/crop.page:23
 #: C/crop.page:30
 msgid "Click and hold the frame, then move it to the desired position."
 msgstr ""
+"Cliquez et maintenez le cadre, puis déplacez-le sur la position désirée."
 
 #. (itstool) path: item/p
 #: C/crop.page:28
 msgid "Navigate to the <guiseq><gui>Page</gui><gui>Crop</gui></guiseq> menu."
 msgstr ""
+"Naviguez vers le menu <guiseq><gui>Page</gui><gui>Recadrer</gui></guiseq>."
 
 #. (itstool) path: item/p
 #: C/crop.page:29
@@ -228,16 +252,19 @@ msgid ""
 "Choose one of the fixed crop frames, or select \"Custom\" to manually adjust "
 "the frame's dimensions by dragging its borders."
 msgstr ""
+"Sélectionnez un des cadres fixes ou sélectionnez « Personnalisé » pour "
+"définir manuellement les dimensions du cadre en faisant glisser ses bords."
 
 #. (itstool) path: steps/title
 #: C/crop.page:34
 msgid "Use the Toolbar"
-msgstr ""
+msgstr "Utiliser la barre d'outils"
 
 #. (itstool) path: item/p
 #: C/crop.page:35
 msgid "Click the \"<gui>Crop</gui>\" button in the toolbar."
 msgstr ""
+"Cliquez sur le bouton « <gui>Recadrer</gui> » dans la barre d'outils."
 
 #. (itstool) path: note/p
 #: C/crop.page:36
@@ -245,17 +272,21 @@ msgid ""
 "This is the same as choosing \"Custom\" in step 2 of the aforementioned "
 "methods."
 msgstr ""
+"Ceci revient au même que de choisir « Personnalisé » à l'étape 2 des "
+"méthodes mentionnées ci-dessus."
 
 #. (itstool) path: item/p
 #: C/crop.page:38
 msgid ""
 "Drag the borders of the frame to set the desired dimensions and position."
 msgstr ""
+"Faites glisser les bords du cadre pour définir les dimensions désirées et la "
+"position."
 
 #. (itstool) path: note/p
 #: C/crop.page:42
 msgid "Each new scanned page will use the previous crop."
-msgstr ""
+msgstr "Chaque nouvelle page numérisée utilisera le recadrage précédent."
 
 #. (itstool) path: page/title
 #: C/dpi.page:9
@@ -270,6 +301,10 @@ msgid ""
 "You can change these settings from the "
 "<guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu."
 msgstr ""
+"La résolution par défaut pour un document <gui><em>Texte</em></gui> est de "
+"150 ppp (points par pouce), pour un document <gui><em>Photo</em></gui>, elle "
+"est de 300 ppp. Vous pouvez modifier ces réglages dans le menu "
+"<guiseq><gui>Document</gui><gui>Préférences</gui></guiseq>."
 
 #. (itstool) path: page/p
 #: C/dpi.page:18
@@ -277,60 +312,62 @@ msgid ""
 "The available scanning resolutions for both document types (Text and Photo) "
 "are the same and are listed in the following table:"
 msgstr ""
+"Les résolutions de numérisation disponibles pour les deux types de documents "
+"(textes et photos) sont les mêmes et sont listées dans le tableau suivant :"
 
 #. (itstool) path: td/p
 #: C/dpi.page:23
 msgid "<em>Text Resolution</em>"
-msgstr ""
+msgstr "<em>Résolution texte</em>"
 
 #. (itstool) path: td/p
 #: C/dpi.page:24
 msgid "<em>Photo Resolution</em>"
-msgstr ""
+msgstr "<em>Résolution photo</em>"
 
 #. (itstool) path: td/p
 #: C/dpi.page:27
 #: C/dpi.page:28
 msgid "75 dpi (draft)"
-msgstr ""
+msgstr "75 ppp (brouillon)"
 
 #. (itstool) path: td/p
 #: C/dpi.page:31
 msgid "150 dpi (default)"
-msgstr ""
+msgstr "150 ppp (par défaut)"
 
 #. (itstool) path: td/p
 #: C/dpi.page:32
 msgid "150 dpi"
-msgstr ""
+msgstr "150 ppp"
 
 #. (itstool) path: td/p
 #: C/dpi.page:35
 msgid "300 dpi"
-msgstr ""
+msgstr "300 ppp"
 
 #. (itstool) path: td/p
 #: C/dpi.page:36
 msgid "300 dpi (default)"
-msgstr ""
+msgstr "300 ppp (par défaut)"
 
 #. (itstool) path: td/p
 #: C/dpi.page:39
 #: C/dpi.page:40
 msgid "600 dpi"
-msgstr ""
+msgstr "600 ppp"
 
 #. (itstool) path: td/p
 #: C/dpi.page:43
 #: C/dpi.page:44
 msgid "1200 dpi (high resolution)"
-msgstr ""
+msgstr "1200 ppp (haute résolution)"
 
 #. (itstool) path: td/p
 #: C/dpi.page:47
 #: C/dpi.page:48
 msgid "2400 dpi"
-msgstr ""
+msgstr "2400 ppp"
 
 #. (itstool) path: note/p
 #: C/dpi.page:52
@@ -339,6 +376,9 @@ msgid ""
 "while <gui><em>Photo</em></gui> documents are always scanned in color, at "
 "any resolution!"
 msgstr ""
+"Les documents <gui><em>Texte</em></gui> sont toujours numérisés en noir et "
+"blanc alors que les documents <gui><em>Photo</em></gui> sont toujours "
+"numérisés en couleur, quelle que soit la résolution !"
 
 #. (itstool) path: page/title
 #: C/email.page:9
@@ -366,13 +406,16 @@ msgid ""
 "attachment for each page. Conversely, if the document type was set to "
 "\"Photo\", the email will have a JPEG attachment for each page."
 msgstr ""
+"Si le type de document a été réglé sur « Texte » le courriel aura une pièce "
+"jointe PDF pour chaque page. À l'inverse, si le type de document a été réglé "
+"sur « Photo », le courriel aura une pièce jointe JPEG pour chaque page."
 
 #. (itstool) path: page/p
 #: C/email.page:21
 msgid "See <link xref=\"save\"/> for more information about file formats."
 msgstr ""
-"Voir <link xref=\"save\"/> pour plus d'information à propos des formats de "
-"fichiers."
+"Consultez <link xref=\"save\"/> pour plus d'information à propos des formats "
+"de fichiers."
 
 #. (itstool) path: p/link
 #: C/legal.xml:4
@@ -410,11 +453,15 @@ msgid ""
 "<app>Simple Scan</app> a very convenient tool for making copies of documents "
 "or photos."
 msgstr ""
+"<app>Simple Scan</app> vous permet d'imprimer un document numérisé "
+"directement à partir de son interface, sans avoir à enregistrer le premier "
+"document. Cette caractéristique fait de <app>Simple Scan</app> un outil très "
+"pratique pour faire des copies de documents ou de photos."
 
 #. (itstool) path: steps/title
 #: C/print.page:17
 msgid "To Print a Document"
-msgstr ""
+msgstr "Pour imprimer un document"
 
 #. (itstool) path: item/p
 #: C/print.page:19
@@ -423,6 +470,10 @@ msgid ""
 "the keyboard shortcut <keyseq><key>Ctrl</key><key>P</key></keyseq>. This "
 "will open the \"Print\" dialog box."
 msgstr ""
+"Allez dans le menu <guiseq><gui>Document</gui><gui>Imprimer</gui> </guiseq> "
+"ou utilisez le raccourci clavier "
+"<keyseq><key>Ctrl</key><key>P</key></keyseq>. Ceci ouvrira la boîte de "
+"dialogue « Imprimer »."
 
 #. (itstool) path: item/p
 #: C/print.page:25
@@ -430,6 +481,9 @@ msgid ""
 "From the \"Print\" dialog box choose your desired printing settings and/or "
 "Print Preview the document, then press the \"Print\" button."
 msgstr ""
+"Depuis la boîte de dialogue « Imprimer » sélectionnez vos paramètres "
+"d'impression désirés et/ou prévisualisez le document puis cliquez sur le "
+"bouton « Imprimer »."
 
 #. (itstool) path: page/title
 #: C/quality.page:9
@@ -448,6 +502,16 @@ msgid ""
 "href=\"https://en.wikipedia.org/wiki/Lossy_compression\">Lossy compression "
 "Wikipedia page</link> for more information."
 msgstr ""
+"Vous pouvez ajuster la qualité d'image utilisée lorsque la numérisation est "
+"convertie en fichier en changeant ce paramètre dans le menu "
+"<guiseq><gui>Document</gui><gui>Préférences</gui></guiseq>. L'utilisation "
+"d'une qualité moindre se traduira par une petite taille de fichier, mais "
+"pourra présenter un certain flou ou une pixellisation de l'image. Une "
+"qualité élevée permet de conserver toutes les informations numérisées, mais "
+"nécessite une taille de fichier plus volumineux. Consultez la <link "
+"href=\"https://fr.wikipedia.org/wiki/Compression_de_donn%C3%A9es#Compression_"
+"avec_pertes\">page Wikipédia sur la compression de données</link> pour plus "
+"d'informations."
 
 #. (itstool) path: page/title
 #: C/reorder.page:9
@@ -460,6 +524,9 @@ msgid ""
 "To move a page, right click on it and choose <gui><em>Move Left</em></gui> "
 "or <gui><em>Move Right</em></gui>."
 msgstr ""
+"Pour déplacer une page, faites un clic droit dessus et sélectionnez "
+"<gui><em>Déplacer vers la gauche</em></gui> ou <gui><em>Déplacer vers la "
+"droite</em></gui>."
 
 #. (itstool) path: page/p
 #: C/reorder.page:16
@@ -468,11 +535,14 @@ msgid ""
 "<gui><em>Move Left</em></gui> or <gui><em>Move Right</em></gui> from the "
 "\"Page\" menu."
 msgstr ""
+"Alternativement, vous pouvez déplacer une page en la sélectionnant en "
+"premier, puis en choisissant <gui><em>Déplacer vers la gauche</em></gui> ou "
+"<gui><em>Déplacer vers la droite</em></gui> depuis le menu « Page »."
 
 #. (itstool) path: page/title
 #: C/rotate.page:9
 msgid "Rotating a Page"
-msgstr ""
+msgstr "Faire pivoter une page"
 
 #. (itstool) path: page/p
 #: C/rotate.page:11
@@ -481,11 +551,14 @@ msgid ""
 "before or after scanning the page. Currently, there are four ways to rotate "
 "a page:"
 msgstr ""
+"Dans <app>Simple Scan</app>, vous pouvez changer l'orientation d'une page "
+"avant ou après la numérisation. Actuellement, il y a quatre façons de faire "
+"pivoter une page :"
 
 #. (itstool) path: steps/title
 #: C/rotate.page:17
 msgid "Use Toolbar Buttons"
-msgstr ""
+msgstr "Utiliser les boutons de la barre d'outils"
 
 #. (itstool) path: item/p
 #: C/rotate.page:18
@@ -493,6 +566,8 @@ msgstr ""
 #: C/rotate.page:35
 msgid "Select the page you want to rotate by clicking on it once."
 msgstr ""
+"Sélectionnez la page que vous souhaitez faire pivoter en cliquant dessus une "
+"fois."
 
 #. (itstool) path: item/p
 #: C/rotate.page:19
@@ -500,72 +575,78 @@ msgid ""
 "Press one of the arrows on the toolbar to rotate the page in the desired "
 "direction."
 msgstr ""
+"Cliquez sur une des flèches de la barre d'outils pour faire pivoter la page "
+"dans la direction souhaitée."
 
 #. (itstool) path: steps/title
 #: C/rotate.page:22
 msgid "Use Right Click"
-msgstr ""
+msgstr "Utiliser le clic droit"
 
 #. (itstool) path: item/p
 #: C/rotate.page:23
 msgid "Right click on the page you want to rotate."
-msgstr ""
+msgstr "Faites un clic droit sur la page que vous souhaitez faire pivoter."
 
 #. (itstool) path: item/p
 #: C/rotate.page:24
 msgid "From the context menu choose \"Rotate Left\" or \"Rotate Right\"."
 msgstr ""
+"Depuis le menu contextuel, sélectionnez « Faire pivoter vers la gauche » ou "
+"« Faire pivoter vers la droite »."
 
 #. (itstool) path: item/p
 #: C/rotate.page:30
 msgid ""
 "Click the \"Page\" menu and select \"Rotate Left\" or \"Rotate Right\"."
 msgstr ""
+"Cliquez sur le menu « Page » et sélectionnez « Faire pivoter vers la "
+"gauche » ou « Faire pivoter vers la droite »."
 
 #. (itstool) path: steps/title
 #: C/rotate.page:34
 msgid "Use Shortcuts"
-msgstr ""
+msgstr "Utiliser les raccourcis"
 
 #. (itstool) path: item/p
 #: C/rotate.page:36
 msgid "Press one of the following shortcut keys:"
-msgstr ""
+msgstr "Appuyez sur une des touches de raccourci suivantes :"
 
 #. (itstool) path: td/p
 #: C/rotate.page:39
 msgid "<em>Command</em>"
-msgstr ""
+msgstr "<em>Commande</em>"
 
 #. (itstool) path: td/p
 #: C/rotate.page:40
 msgid "<em>Shortcut Key</em>"
-msgstr ""
+msgstr "<em>Touches de raccourci</em>"
 
 #. (itstool) path: td/p
 #: C/rotate.page:43
 msgid "Rotate Left"
-msgstr ""
+msgstr "Faire pivoter vers la gauche"
 
 #. (itstool) path: td/p
 #: C/rotate.page:44
 msgid "<key>[</key> (left bracket)"
-msgstr ""
+msgstr "<key>[</key> (crochet gauche)"
 
 #. (itstool) path: td/p
 #: C/rotate.page:47
 msgid "Rotate Right"
-msgstr ""
+msgstr "Faire pivoter vers la droite"
 
 #. (itstool) path: td/p
 #: C/rotate.page:48
 msgid "<key>]</key> (right bracket)"
-msgstr ""
+msgstr "<key>]</key> (crochet droit)"
 
 #. (itstool) path: note/p
 #: C/rotate.page:54
 msgid "Each new scanned page will use the previous rotation."
-msgstr ""
+msgstr "Chaque nouvelle page numérisée utilisera la rotation précédente."
 
 #. (itstool) path: page/title
 #: C/save.page:9
@@ -578,6 +659,9 @@ msgid ""
 "Navigate to the <guiseq><gui>Document</gui><gui>Save As</gui></guiseq> menu "
 "(or press <keyseq><key>Shift</key><key>Ctrl</key><key>S</key></keyseq>)."
 msgstr ""
+"Naviguez vers le menu <guiseq><gui>Document</gui><gui>Enregistrer "
+"sous</gui></guiseq> (ou appuyez sur "
+"<keyseq><key>Maj</key><key>Ctrl</key><key>S</key></keyseq>)."
 
 #. (itstool) path: item/p
 #: C/save.page:18
@@ -585,31 +669,34 @@ msgid ""
 "From the \"Save As\" dialog box, choose one of the supported file types, or "
 "simply change the extension in the \"Name\" field."
 msgstr ""
+"Depuis la boîte de dialogue « Enregistrer sous », sélectionnez un des types "
+"de fichier pris en charge ou changez simplement l'extension dans le champ "
+"« Nom »."
 
 #. (itstool) path: item/p
 #: C/save.page:23
 msgid "Press the \"Save\" button."
-msgstr ""
+msgstr "Cliquez sur le bouton « Enregistrer »."
 
 #. (itstool) path: table/title
 #: C/save.page:29
 msgid "Supported File Types"
-msgstr ""
+msgstr "Types de fichiers pris en charge"
 
 #. (itstool) path: td/p
 #: C/save.page:31
 msgid "<em>Type</em>"
-msgstr ""
+msgstr "<em>Type</em>"
 
 #. (itstool) path: td/p
 #: C/save.page:32
 msgid "<em>Brief Description</em>"
-msgstr ""
+msgstr "<em>Brève description</em>"
 
 #. (itstool) path: td/p
 #: C/save.page:35
 msgid "PDF"
-msgstr ""
+msgstr "PDF"
 
 #. (itstool) path: td/p
 #: C/save.page:36
@@ -621,6 +708,13 @@ msgid ""
 "<link href=\"http://en.wikipedia.org/wiki/pdf\">PDF Wikipedia page</link> "
 "for more information."
 msgstr ""
+"Un fichier PDF peut contenir plusieurs pages, comme un livre, et est facile "
+"à distribuer. Seul un petit nombre de programmes Linux peuvent modifier des "
+"documents PDF, ainsi ce format est principalement recommandé pour "
+"l'archivage. La taille du document PDF est affectée par la <link "
+"xref=\"quality\">qualité de l'image</link>. Consultez la <link "
+"href=\"https://fr.wikipedia.org/wiki/Portable_Document_Format\">page "
+"Wikipédia sur le format PDF</link> pour plus d'informations."
 
 #. (itstool) path: td/p
 #: C/save.page:43
@@ -640,6 +734,17 @@ msgid ""
 "href=\"http://en.wikipedia.org/wiki/jpeg\">JPEG Wikipedia page</link> for "
 "more information."
 msgstr ""
+"JPEG est le format de fichier utilisé par les appareils photo numériques "
+"pour enregistrer des images. Un fichier JPEG est relativement léger, très "
+"facile à distribuer et adapté pour le téléchargement sur les sites de "
+"réseaux sociaux. La plupart des systèmes d'exploitation sont livrés avec un "
+"éditeur JPEG par défaut. Si vous avez numérisé plusieurs pages, un fichier "
+"JPEG sera créé pour chaque page. Utilisez ce type de fichier si vous "
+"souhaitez modifier ou télécharger les images numérisées. La taille du "
+"fichier JPEG est affectée par la <link xref=\"quality\">qualité de "
+"l'image</link>. Consultez la <link "
+"href=\"https://fr.wikipedia.org/wiki/JPEG\">page Wikipédia sur le format "
+"JPEG</link> pour plus d'informations."
 
 #. (itstool) path: td/p
 #: C/save.page:53
@@ -655,11 +760,17 @@ msgid ""
 "href=\"http://en.wikipedia.org/wiki/Portable_Network_Graphics\">PNG "
 "Wikipedia page</link> for more information."
 msgstr ""
+"Les fichiers PNG contiennent les données brutes du périphérique de "
+"numérisation. Cela les rend très volumineux et peu adaptés à la "
+"distribution. Si vous avez numérisé plusieurs pages, un fichier PNG sera "
+"créé pour chaque page. Consultez la <link "
+"href=\"https://fr.wikipedia.org/wiki/Portable_Network_Graphics\">page "
+"Wikipédia sur le format PNG</link> pour plus d'informations."
 
 #. (itstool) path: td/p
 #: C/save.page:61
 msgid "TIFF"
-msgstr ""
+msgstr "TIFF"
 
 #. (itstool) path: td/p
 #: C/save.page:62
@@ -670,6 +781,12 @@ msgid ""
 "href=\"http://en.wikipedia.org/wiki/Tagged_Image_File_Format\">TIFF "
 "Wikipedia page</link> for more information."
 msgstr ""
+"Les fichiers TIFF contiennent les données brutes du périphérique de "
+"numérisation. Cela les rend très volumineux et peu adaptés à la "
+"distribution. Si vous avez numérisé plusieurs pages, un fichier TIFF sera "
+"créé pour chaque page. Consultez la <link "
+"href=\"https://fr.wikipedia.org/wiki/Tagged_Image_File_Format\">page "
+"Wikipédia sur le format TIFF</link> pour plus d'informations."
 
 #. (itstool) path: page/title
 #: C/scanner.page:9
@@ -682,6 +799,9 @@ msgid ""
 "If you have multiple scanning devices you can change the selected device "
 "from the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu."
 msgstr ""
+"Si vous avez plusieurs périphériques de numérisation, vous pouvez changer le "
+"périphérique sélectionné depuis le menu "
+"<guiseq><gui>Document</gui><gui>Préférences</gui></guiseq>."
 
 #. (itstool) path: page/p
 #: C/scanner.page:15
@@ -691,6 +811,12 @@ msgid ""
 "connect a network scanner while <app>Simple Scan</app> is running, you will "
 "need to restart <app>Simple Scan</app> for the scanner to be detected."
 msgstr ""
+"Vos périphériques de numérisation locaux sont automatiquement détectés "
+"chaque fois que vous démarrez <app>Simple Scan</app> et à chaque fois que "
+"vous connectez un périphérique de numérisation USB. Si vous connectez un "
+"périphérique de numérisation en réseau lorsque <app>Simple Scan</app> "
+"fonctionne, vous devrez relancer <app>Simple Scan</app> pour que le "
+"périphérique soit détecté."
 
 #. (itstool) path: info/title
 #: C/scanning.page:6
@@ -712,6 +838,7 @@ msgstr "Pour numériser un document avec votre périphérique de numérisation 
 #: C/scanning.page:16
 msgid "Connect the scanner to your computer and power it on."
 msgstr ""
+"Connectez le périphérique de numérisation à votre ordinateur et allumez-le."
 
 #. (itstool) path: item/p
 #: C/scanning.page:17
@@ -724,6 +851,9 @@ msgid ""
 "Click the arrow to the right of the \"Scan\" button and choose the type of "
 "document you are scanning: <em>Photo</em> or <em>Text</em>."
 msgstr ""
+"Cliquez sur la flèche à droite du bouton « Numériser »  et sélectionnez le "
+"type de document que vous voulez numériser : <em>Photo</em> ou "
+"<em>Texte</em>."
 
 #. (itstool) path: item/p
 #: C/scanning.page:21
@@ -731,6 +861,8 @@ msgid ""
 "Click the \"Scan\" button on the toolbar (or press "
 "<keyseq><key>Ctrl</key><key>1</key></keyseq>)."
 msgstr ""
+"Cliquez sur le bouton « Numériser » de la barre d'outils (ou appuyez sur "
+"<keyseq><key>Ctrl</key><key>1</key></keyseq>)."
 
 #. (itstool) path: note/p
 #: C/scanning.page:24
@@ -739,6 +871,9 @@ msgid ""
 "the <key>Esc</key> key on the keyboard. Each page you scan is placed at the "
 "end of the document."
 msgstr ""
+"La page sera affichée telle qu'elle a été numérisée. Pour arrêter la "
+"numérisation à n'importe quel moment, appuyez sur la touche <key>Échap</key> "
+"du clavier. Chaque page numérisée est placée à la fin du document."
 
 #. (itstool) path: page/p
 #: C/scanning.page:29
@@ -749,225 +884,9 @@ msgid ""
 "black and white; choose <gui><em>Photo</em></gui> for a high resolution "
 "color scan. See <link xref=\"dpi\"/> for more details and more options."
 msgstr ""
-
-#~ msgid "Use this type if you need high resolution files for editing"
-#~ msgstr ""
-#~ "Utilisez ce format de fichier si vous avez besoin d'une résolution "
-#~ "supérieure pour modifications."
-
-#~ msgid ""
-#~ "To use only part of the scanned page enable crop by selecting the crop "
-#~ "button in the toolbar. A mask will be shown over the current page with the "
-#~ "area not being used shown in gray."
-#~ msgstr ""
-#~ "Pour utiliser seulement une partie de la page numérisée, cliquez sur le "
-#~ "bouton « Recadrer » dans la barre d'outils. Un masque apparaîtra au-dessus "
-#~ "de la page numérisée, la zone de couleur grise représente la partie du "
-#~ "document qui sera rognée."
-
-#~ msgid "Simple Scan Help"
-#~ msgstr "Aide de Simple Scan"
-
-#~ msgid "Rotating Pages"
-#~ msgstr "Faire pivoter les pages"
-
-#~ msgid "Portable Document Format (PDF)"
-#~ msgstr "Portable Document Format (PDF)"
-
-#~ msgid "Connect the scanner to your computer."
-#~ msgstr "Connecter le périphérique de numérisation à votre ordinateur."
-
-#~ msgid ""
-#~ "Press the scan button in the toolbar (or "
-#~ "<keyseq><key>Ctrl</key><key>1</key></keyseq>)."
-#~ msgstr ""
-#~ "Appuyer sur le bouton « Numériser » dans la barre d'outils (ou "
-#~ "<keyseq><key>Ctrl</key><key>1</key></keyseq>)."
-
-#~ msgid "The page will be shown as it is scanned."
-#~ msgstr "La page sera affichée telle que numérisée."
-
-#~ msgid "To stop the scan at any time press <key>Escape</key>."
-#~ msgstr ""
-#~ "Pour arrêter la numérisation à tout moment appuyez sur la touche "
-#~ "<key>Échap</key>."
-
-#~ msgid ""
-#~ "To move a page, select it and move the page left or right using the "
-#~ "<key>&lt;</key> and <key>&gt;</key> keys."
-#~ msgstr ""
-#~ "Pour déplacer une page, sélectionnez-la et déplacer-la vers la gauche ou "
-#~ "vers la droite en utilisant les touches <key>&lt;</key> et <key>&gt;</key>."
-
-#~ msgid "To remove the selected page use the <key>Delete</key> key."
-#~ msgstr ""
-#~ "Pour supprimer la page sélectionnée, appuyez sur la touche <key>Suppr</key>."
-
-#~ msgid ""
-#~ "To rotate a page use the rotation buttons in the toolbar or the <key>[</key> "
-#~ "and <key>]</key> keys. Each new page that is scanned will use the previous "
-#~ "rotation."
-#~ msgstr ""
-#~ "Pour faire pivoter une page, utilisez les boutons de rotation dans la barre "
-#~ "d'outils ou les touches <key>[</key> et <key>]</key>. Chaque nouvelle page "
-#~ "numérisée utilisera la rotation précédente."
-
-#~ msgid "Use this type if you have scanned multiple pages of text."
-#~ msgstr "Utilisez ce format si vous devez numériser plusieurs pages de texte."
-
-#~ msgid ""
-#~ "Each page you scan is added to the end of your document. To start a new "
-#~ "document select <guiseq><gui>Document</gui><gui>New</gui></guiseq>. "
-#~ "Individual pages can be deleted by right clicking a page or pressing the "
-#~ "<key>Delete</key> key."
-#~ msgstr ""
-#~ "Chaque page numérisée sera ajoutée à la fin de votre document. Pour créer un "
-#~ "nouveau document sélectionnez "
-#~ "<guiseq><gui>Document</gui><gui>Nouveau</gui></guiseq>. Les pages "
-#~ "individuelles peuvent être supprimées en faisant un clic droit sur la page "
-#~ "ou en pressant sur la touche <key>Suppr</key> ."
-
-#~ msgid ""
-#~ "If your scanner has an Automatic Document Feeder (ADF) you can scan all the "
-#~ "pages by selecting the <guiseq><gui>Document</gui><gui>Scan</gui><gui>All "
-#~ "Pages From Feeder</gui></guiseq> menu."
-#~ msgstr ""
-#~ "Si votre périphérique de numérisation dispose d'un chargeur automatique de "
-#~ "documents, vous pouvez numériser toutes les pages en sélectionnant le menu "
-#~ "<guiseq><gui>Document</gui><gui>Numériser</gui><gui>Toutes les pages du "
-#~ "bac</gui></guiseq>."
-
-#~ msgid ""
-#~ "To save the current document to a file use the "
-#~ "<guiseq><gui>Document</gui><gui>Save</gui></guiseq> menu "
-#~ "(<keyseq><key>Ctrl</key><key>S</key></keyseq>). When you save, there is a "
-#~ "choice of three file types."
-#~ msgstr ""
-#~ "Pour enregistrer le document actuel comme fichier utilisez le menu "
-#~ "<guiseq><gui>Document</gui><gui>Enregistrer</gui></guiseq> "
-#~ "(<keyseq><key>Ctrl</key><key>S</key></keyseq>). Lors de l'enregistrement, "
-#~ "vous aurez le choix entre trois formats de fichiers."
-
-#~ msgid ""
-#~ "A PDF can contain multiple pages (like a book) and is easy to distribute to "
-#~ "other people. Most people do not have software to modify PDF documents so "
-#~ "this format is best used for archiving."
-#~ msgstr ""
-#~ "Le format PDF peut contenir plusieurs pages (comme un livre), il est facile "
-#~ "à distribuer à d'autres personnes.  Il est préférable d'utiliser ce format "
-#~ "pour l'archivage car la plupart des gens n'ont pas de logiciel permettant de "
-#~ "le modifier."
-
-#~ msgid ""
-#~ "If the document type is set to text the email will have a PDF attachment "
-#~ "otherwise the email will have a JPEG attachment for each page."
-#~ msgstr ""
-#~ "Si le type de document est réglé sur « Texte » le courriel aura une pièce "
-#~ "jointe au format PDF sinon le courriel aura une pièce jointe au format JPEG "
-#~ "pour chaque page."
-
-#~ msgid ""
-#~ "The crop area can be adjusted by clicking on the inside of the crop area "
-#~ "border and dragging the mouse."
-#~ msgstr ""
-#~ "Le recadrage peut être ajusté en cliquant à l'intérieur de la zone de "
-#~ "recadrage, puis en glissant la souris."
-
-#~ msgid ""
-#~ "JPEG file is the file format used by digital cameras and is very small and "
-#~ "so easy to distribute. Most people have software to modify JPEG photos and "
-#~ "this format is suitable for uploading to social networking sites. If you "
-#~ "have scanned multiple pages then a JPEG file will be written for each page."
-#~ msgstr ""
-#~ "Le format JPEG est le format utilisé par les appareils photo numériques, il "
-#~ "est très léger et adapté à la distribution. La plupart des gens disposent "
-#~ "d'un logiciel pour modifier les photos JPEG et ce format est adapté pour le "
-#~ "téléversement vers les sites de réseaux sociaux. Si vous avez numérisé "
-#~ "plusieurs pages alors un fichier JPEG sera rédigé pour chaque page."
-
-#~ msgid ""
-#~ "By default both sides of the paper will be scanned if your scanned supports "
-#~ "this. Single side scanning can be configured from the "
-#~ "<guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu."
-#~ msgstr ""
-#~ "Par défaut, les deux faces de la feuille seront numérisées si votre "
-#~ "périphérique de numérisation le prend en charge. Il est possible de "
-#~ "configurer le périphérique de numérisation depuis le menu "
-#~ "<guiseq><gui>Document</gui><gui>Préférences</gui></guiseq>"
-
-#~ msgid ""
-#~ "Fixed crop sizes can be chosen from the "
-#~ "<guiseq><gui>Page</gui><gui>Crop</gui></guiseq> menu that match commonly "
-#~ "used paper sizes."
-#~ msgstr ""
-#~ "Des tailles de recadrage prédéfinies peuvent être choisies dans le menu "
-#~ "<guiseq><gui>Page</gui><gui>Recadrer</gui></guiseq>."
-
-#~ msgid ""
-#~ "By default text documents will be scanned at 200 dots per inch (dpi) and "
-#~ "photos at 400 dpi. To change these settings open the preferences from the "
-#~ "<guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu."
-#~ msgstr ""
-#~ "Par défaut, les documents texte seront numérisés à 200 ppp (points par "
-#~ "pixels) et les photos à 400 ppp. Pour modifer ces réglages, ouvrez "
-#~ "« Préférences » dans le menu "
-#~ "<guiseq><gui>Document</gui><gui>Préférences</gui></guiseq>."
-
-#~ msgid "Each new page that is scanned will use the previous crop."
-#~ msgstr "Chaque nouvelle page numérisée utilisera alors le même recadrage."
-
-#~ msgid ""
-#~ "To print the current document use the "
-#~ "<guiseq><gui>Document</gui><gui>Print</gui></guiseq> menu "
-#~ "(<keyseq><key>Ctrl</key><key>P</key></keyseq>)."
-#~ msgstr ""
-#~ "Pour imprimer le document en cours, utiliser le menu "
-#~ "<guiseq><gui>Document</gui><gui>Imprimer</gui></guiseq> "
-#~ "(<keyseq><key>Ctrl</key><key>P</key></keyseq>)."
-
-#~ msgid ""
-#~ "PNG files contain the raw data from the scanner. This makes them much larger "
-#~ "than JPEG files and not suitable for distributing. If you have scanned "
-#~ "multiple pages then a PNG file will be written for each page."
-#~ msgstr ""
-#~ "Les fichiers PNG contiennent les données brutes du périphérique de "
-#~ "numérisation. Cela les rend beaucoup plus lourds que les fichiers JPEG et "
-#~ "les rend inadaptés à la distribution. Si vous avez numérisé plusieurs pages "
-#~ "alors un fichier PNG sera rédigé pour chaque page."
-
-#~ msgid ""
-#~ "Your local scanners are automatically detected each time you start "
-#~ "<app>Simple Scan</app> and each time you plug in USB scanner. If you have a "
-#~ "network scanner you will need to restart <app>Simple Scan</app> for it to be "
-#~ "detected."
-#~ msgstr ""
-#~ "Le périphérique de numérisation local est automatiquement détecté à chaque "
-#~ "lancement de <app>Simple Scan</app> et à chaque fois que vous branchez un "
-#~ "périphérique de numérisation USB. Si vous branchez un périphérique de "
-#~ "numérisation en réseau, il sera nécessaire de redémarrer <app>Simple "
-#~ "Scan</app> pour qu'il puisse être détecter."
-
-#~ msgid ""
-#~ "If you have multiple scanners you can change which scanner is selected from "
-#~ "the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu."
-#~ msgstr ""
-#~ "Si vous disposez de plusieurs périphériques de numérisation, vous pouvez en "
-#~ "changer depuis le menu "
-#~ "<guiseq><gui>Document</gui><gui>Préférences</gui></guiseq>."
-
-#~ msgid ""
-#~ "The type of scan can be changed from the "
-#~ "<guiseq><gui>Document</gui><gui>Scan</gui></guiseq> menu. Choose "
-#~ "<gui>Text</gui> if you want the document to be quickly scanned in black and "
-#~ "white or <gui>Photo</gui> for a high resolution color scan."
-#~ msgstr ""
-#~ "La méthode de numérisation peut être changée à partir du menu "
-#~ "<guiseq><gui>Document</gui><gui>Numériser</gui></guiseq>. Choisir "
-#~ "<gui>Texte</gui> si vous souhaitez numériser rapidement le document en noir "
-#~ "et blanc ou <gui>Photo</gui> pour une numérisation haute résolution en "
-#~ "couleurs."
-
-#~ msgid "Use this type if you want to modify or upload the scanned images."
-#~ msgstr ""
-#~ "Utilisez ce format si vous souhaitez modifier ou téléverser les images "
-#~ "numérisées."
+"Le type de document peut aussi être modifié depuis le menu "
+"<guiseq><gui>Document</gui> <gui>Numériser</gui></guiseq>. Sélectionnez "
+"<gui><em>Texte</em></gui> si vous souhaitez que le document soit numérisé "
+"rapidement en noir et blanc ; sélectionnez <gui><em>Photo</em></gui> pour un "
+"document de résolution élevée en couleur. Consultez <link xref=\"dpi\"/> "
+"pour plus de détails et plus d'options."
diff --git a/help/fr/index.page b/help/fr/index.page
index 3e79ec6..b28f7a3 100644
--- a/help/fr/index.page
+++ b/help/fr/index.page
@@ -13,7 +13,7 @@
 		<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
 	</info>
 
-	<title><media type="image" src="figures/icon.png"/> Simple Scan Manual</title>
+	<title><media type="image" src="figures/icon.png"/> Manuel de Simple Scan</title>
     
     <section id="acquire" style="2column">
         <title>Numérisation de pages</title>
@@ -28,6 +28,6 @@
     </section>
 
     <section id="shortcuts" style="2column">
-	<title>Simple Scan Shortcuts</title>
+	<title>Raccourcis de Simple Scan</title>
     </section>
 </page>
diff --git a/help/fr/print.page b/help/fr/print.page
index efd2031..ddce904 100644
--- a/help/fr/print.page
+++ b/help/fr/print.page
@@ -7,23 +7,14 @@
   
 	<title>Impression</title>
 
-    <p>
-    <app>Simple Scan</app> allows you print a scanned document directly from the its
-    interface, without having to save the document first. This feature makes <app>Simple
-    Scan</app> a very convenient tool for making copies of documents or photos. 
-    </p>
+    <p><app>Simple Scan</app> vous permet d'imprimer un document numérisé directement à partir de son interface, sans avoir à enregistrer le premier document. Cette caractéristique fait de <app>Simple Scan</app> un outil très pratique pour faire des copies de documents ou de photos.</p>
     <steps>
-      <title>To Print a Document</title>
+      <title>Pour imprimer un document</title>
       <item>
-	<p>Go to the <guiseq><gui>Document</gui><gui>Print</gui>
-	</guiseq> menu or use the keyboard shortcut <keyseq><key>Ctrl</key><key>P</key></keyseq>.
-	This will open the "Print" dialog box.
-	</p>
+	<p>Allez dans le menu <guiseq><gui>Document</gui><gui>Imprimer</gui> </guiseq> ou utilisez le raccourci clavier <keyseq><key>Ctrl</key><key>P</key></keyseq>. Ceci ouvrira la boîte de dialogue « Imprimer ».</p>
       </item>
       <item>
-	<p>From the "Print" dialog box choose your desired printing settings and/or Print Preview
-	the document, then press the "Print" button.
-	</p>
+	<p>Depuis la boîte de dialogue « Imprimer » sélectionnez vos paramètres d'impression désirés et/ou prévisualisez le document puis cliquez sur le bouton « Imprimer ».</p>
       </item>
      </steps>
 </page>
diff --git a/help/fr/quality.page b/help/fr/quality.page
index f8f85d5..6ea1172 100644
--- a/help/fr/quality.page
+++ b/help/fr/quality.page
@@ -7,10 +7,5 @@
 
 	<title>Réglage de la qualité de l'image</title>
 
-    <p>
-    You can adjust the image quality that is used when the scan is converted to a file by changing this setting in the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu.
-    Using a low quality will result in a small file size but may show some blurring or blockiness in the image.
-    A high quality will keep all the scanned information but require a larger file size.
-    See the <link href="https://en.wikipedia.org/wiki/Lossy_compression">Lossy compression Wikipedia page</link> for more information.
-    </p>    
+    <p>Vous pouvez ajuster la qualité d'image utilisée lorsque la numérisation est convertie en fichier en changeant ce paramètre dans le menu <guiseq><gui>Document</gui><gui>Préférences</gui></guiseq>. L'utilisation d'une qualité moindre se traduira par une petite taille de fichier, mais pourra présenter un certain flou ou une pixellisation de l'image. Une qualité élevée permet de conserver toutes les informations numérisées, mais nécessite une taille de fichier plus volumineux. Consultez la <link href="https://fr.wikipedia.org/wiki/Compression_de_donn%C3%A9es#Compression_avec_pertes">page Wikipédia sur la compression de données</link> pour plus d'informations.</p>    
 </page>
diff --git a/help/fr/reorder.page b/help/fr/reorder.page
index 13ff34d..31ace2d 100644
--- a/help/fr/reorder.page
+++ b/help/fr/reorder.page
@@ -7,14 +7,8 @@
   
 	<title>Réorganisation des pages</title>
 
-    <p>
-    To move a page, right click on it and choose <gui><em>Move Left</em></gui> or 
-    <gui><em>Move Right</em></gui>.
-    </p> 
+    <p>Pour déplacer une page, faites un clic droit dessus et sélectionnez <gui><em>Déplacer vers la gauche</em></gui> ou <gui><em>Déplacer vers la droite</em></gui>.</p> 
     
-    <p>
-    Alternatively, you can move a page by first selecting it and then choosing 
-    <gui><em>Move Left</em></gui> or <gui><em>Move Right</em></gui> from the "Page" menu.
-    </p> 
+    <p>Alternativement, vous pouvez déplacer une page en la sélectionnant en premier, puis en choisissant <gui><em>Déplacer vers la gauche</em></gui> ou <gui><em>Déplacer vers la droite</em></gui> depuis le menu « Page ».</p> 
 
 </page>
diff --git a/help/fr/rotate.page b/help/fr/rotate.page
index 43550f3..b4c60a3 100644
--- a/help/fr/rotate.page
+++ b/help/fr/rotate.page
@@ -5,52 +5,47 @@
         <link type="guide" xref="index#modify"/>
     </info>
   
-	<title>Rotating a Page</title>
+	<title>Faire pivoter une page</title>
 
-    <p>
-    In <app>Simple Scan</app>, you can change the rotation of a page either before or after scanning the page.
-    Currently, there are four ways to rotate a page: 
-    </p>
+    <p>Dans <app>Simple Scan</app>, vous pouvez changer l'orientation d'une page avant ou après la numérisation. Actuellement, il y a quatre façons de faire pivoter une page :</p>
     
     <steps>
-      <title>Use Toolbar Buttons</title>
-      <item><p>Select the page you want to rotate by clicking on it once.</p></item>
-      <item><p>Press one of the arrows on the toolbar to rotate the page in the desired direction.</p></item>
+      <title>Utiliser les boutons de la barre d'outils</title>
+      <item><p>Sélectionnez la page que vous souhaitez faire pivoter en cliquant dessus une fois.</p></item>
+      <item><p>Cliquez sur une des flèches de la barre d'outils pour faire pivoter la page dans la direction souhaitée.</p></item>
     </steps>
     <steps>
-      <title>Use Right Click</title>
-      <item><p>Right click on the page you want to rotate.</p></item>
-      <item><p>From the context menu choose "Rotate Left" or "Rotate Right".</p></item>
+      <title>Utiliser le clic droit</title>
+      <item><p>Faites un clic droit sur la page que vous souhaitez faire pivoter.</p></item>
+      <item><p>Depuis le menu contextuel, sélectionnez « Faire pivoter vers la gauche » ou « Faire pivoter vers la droite ».</p></item>
     </steps>
     
     <steps>
-      <title>Use a Menu</title>
-      <item><p>Select the page you want to rotate by clicking on it once.</p></item>
-      <item><p>Click the "Page" menu and select "Rotate Left" or "Rotate Right".</p></item>
+      <title>Utiliser un menu</title>
+      <item><p>Sélectionnez la page que vous souhaitez faire pivoter en cliquant dessus une fois.</p></item>
+      <item><p>Cliquez sur le menu « Page » et sélectionnez « Faire pivoter vers la gauche » ou « Faire pivoter vers la droite ».</p></item>
     </steps>
     
     <steps>
-      <title>Use Shortcuts</title>
-      <item><p>Select the page you want to rotate by clicking on it once.</p></item>
-      <item><p>Press one of the following shortcut keys:</p>
+      <title>Utiliser les raccourcis</title>
+      <item><p>Sélectionnez la page que vous souhaitez faire pivoter en cliquant dessus une fois.</p></item>
+      <item><p>Appuyez sur une des touches de raccourci suivantes :</p>
 	<table frame="bottom left right" rules="rows cols" shade="rows">
 	<tr>
-		<td><p><em>Command</em></p></td>
-		<td><p><em>Shortcut Key</em></p></td>
+		<td><p><em>Commande</em></p></td>
+		<td><p><em>Touches de raccourci</em></p></td>
 	</tr>
 	<tr>
-		<td><p>Rotate Left</p></td>
-		<td><p><key>[</key> (left bracket)</p></td>
+		<td><p>Faire pivoter vers la gauche</p></td>
+		<td><p><key>[</key> (crochet gauche)</p></td>
 	</tr>
 	<tr>
-		<td><p>Rotate Right</p></td>
-		<td><p><key>]</key> (right bracket)</p></td>
+		<td><p>Faire pivoter vers la droite</p></td>
+		<td><p><key>]</key> (crochet droit)</p></td>
 	</tr>
 	</table>
       </item>
     </steps>
     
-    <note><p>
-    Each new scanned page will use the previous rotation.
-    </p></note>
+    <note><p>Chaque nouvelle page numérisée utilisera la rotation précédente.</p></note>
 </page>
diff --git a/help/fr/save.page b/help/fr/save.page
index f9775b3..ca66518 100644
--- a/help/fr/save.page
+++ b/help/fr/save.page
@@ -9,60 +9,38 @@
 
     <steps>
       <item>
-	<p>Navigate to the <guiseq><gui>Document</gui><gui>Save As</gui></guiseq> menu 
-	(or press <keyseq><key>Shift</key><key>Ctrl</key><key>S</key></keyseq>).
-	</p>
+	<p>Naviguez vers le menu <guiseq><gui>Document</gui><gui>Enregistrer sous</gui></guiseq> (ou appuyez sur <keyseq><key>Maj</key><key>Ctrl</key><key>S</key></keyseq>).</p>
       </item>
       <item>
-	<p>From the "Save As" dialog box, choose one of the supported file
-	types, or simply change the extension in the "Name" field. 
-	</p>
+	<p>Depuis la boîte de dialogue « Enregistrer sous », sélectionnez un des types de fichier pris en charge ou changez simplement l'extension dans le champ « Nom ».</p>
       </item>
       <item>
-	<p>Press the "Save" button.</p>
+	<p>Cliquez sur le bouton « Enregistrer ».</p>
       </item>
     </steps>
     
     
 <table frame="bottom left right top" rules="rows cols" shade="rows">
-	<title>Supported File Types</title>
+	<title>Types de fichiers pris en charge</title>
 	<tr>
 		<td><p><em>Type</em></p></td>
-		<td><p><em>Brief Description</em></p></td>
+		<td><p><em>Brève description</em></p></td>
 	</tr>
 	<tr>
 		<td><p>PDF</p></td>
-		<td><p>A PDF can contain multiple pages, like a book, and is easy to distribute. Only a small number
-		of linux programs can modify PDF documents, so this format is recommended primarily for archiving.
-        The size of the PDF document is affected by the <link xref="quality">image quality</link>.
-		See the <link href="http://en.wikipedia.org/wiki/pdf">PDF Wikipedia page</link> for more information.
-		    </p></td>
+		<td><p>Un fichier PDF peut contenir plusieurs pages, comme un livre, et est facile à distribuer. Seul un petit nombre de programmes Linux peuvent modifier des documents PDF, ainsi ce format est principalement recommandé pour l'archivage. La taille du document PDF est affectée par la <link xref="quality">qualité de l'image</link>. Consultez la <link href="https://fr.wikipedia.org/wiki/Portable_Document_Format">page Wikipédia sur le format PDF</link> pour plus d'informations.</p></td>
 	</tr>
 	<tr>
 		<td><p>JPEG</p></td>
-		<td><p>JPEG is the file format used by digital cameras to save pictures. A JPEG file is relatively
-		small, very easy to distribute, and suitable for uploading to social networking sites. Most operating
-		systems come with a JPEG editor by default. If you have scanned multiple pages, a JPEG file will be
-		created for each page. Use this file type if you want to modify or upload the scanned images.
-        The size of the JPEG file is affected by the <link xref="quality">image quality</link>.
-		See the <link href="http://en.wikipedia.org/wiki/jpeg">JPEG Wikipedia page</link> for more information.
-		    </p></td>
+		<td><p>JPEG est le format de fichier utilisé par les appareils photo numériques pour enregistrer des images. Un fichier JPEG est relativement léger, très facile à distribuer et adapté pour le téléchargement sur les sites de réseaux sociaux. La plupart des systèmes d'exploitation sont livrés avec un éditeur JPEG par défaut. Si vous avez numérisé plusieurs pages, un fichier JPEG sera créé pour chaque page. Utilisez ce type de fichier si vous souhaitez modifier ou télécharger les images numérisées. La taille du fichier JPEG est affectée par la <link xref="quality">qualité de l'image</link>. Consultez la <link href="https://fr.wikipedia.org/wiki/JPEG">page Wikipédia sur le format JPEG</link> pour plus d'informations.</p></td>
 	</tr>
 	<tr>
 		<td><p>PNG</p></td>
-		<td><p>PNG files contain the raw data from the scanner. This makes them very large and not suitable
-		for distributing. If you have scanned multiple pages, a PNG file will be created for each page.
-		See the <link href="http://en.wikipedia.org/wiki/Portable_Network_Graphics">PNG Wikipedia page</link>
-		for more information.
-		    </p></td>
+		<td><p>Les fichiers PNG contiennent les données brutes du périphérique de numérisation. Cela les rend très volumineux et peu adaptés à la distribution. Si vous avez numérisé plusieurs pages, un fichier PNG sera créé pour chaque page. Consultez la <link href="https://fr.wikipedia.org/wiki/Portable_Network_Graphics">page Wikipédia sur le format PNG</link> pour plus d'informations.</p></td>
 	</tr>
 	<tr>
 		<td><p>TIFF</p></td>
-		<td><p>TIFF files contain the raw data from the scanner. This makes them very large and not suitable
-		for distributing. If you have scanned multipe pages, a TIFF file will be created for each page.
-		See the <link href="http://en.wikipedia.org/wiki/Tagged_Image_File_Format">TIFF Wikipedia page</link>
-		for more information.
-		    </p></td>
+		<td><p>Les fichiers TIFF contiennent les données brutes du périphérique de numérisation. Cela les rend très volumineux et peu adaptés à la distribution. Si vous avez numérisé plusieurs pages, un fichier TIFF sera créé pour chaque page. Consultez la <link href="https://fr.wikipedia.org/wiki/Tagged_Image_File_Format">page Wikipédia sur le format TIFF</link> pour plus d'informations.</p></td>
 	</tr>
 
 </table>    
diff --git a/help/fr/scanner.page b/help/fr/scanner.page
index bcd8ec3..2c6e3a8 100644
--- a/help/fr/scanner.page
+++ b/help/fr/scanner.page
@@ -7,13 +7,7 @@
   
 	<title>Sélection d'un périphérique de numérisation</title>
 
-    <p>
-    If you have multiple scanning devices you can change the selected device from the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu.
-    </p>
+    <p>Si vous avez plusieurs périphériques de numérisation, vous pouvez changer le périphérique sélectionné depuis le menu <guiseq><gui>Document</gui><gui>Préférences</gui></guiseq>.</p>
     <media type="image" src="figures/preferences.png"/>
-    <p>
-    Your local scanners are automatically detected each time you start <app>Simple Scan</app>
-    and each time you plug in a USB scanner. If you connect a network scanner while <app>Simple Scan</app>
-    is running, you will need to restart <app>Simple Scan</app> for the scanner to be detected.
-    </p>
+    <p>Vos périphériques de numérisation locaux sont automatiquement détectés chaque fois que vous démarrez <app>Simple Scan</app> et à chaque fois que vous connectez un périphérique de numérisation USB. Si vous connectez un périphérique de numérisation en réseau lorsque <app>Simple Scan</app> fonctionne, vous devrez relancer <app>Simple Scan</app> pour que le périphérique soit détecté.</p>
 </page>
diff --git a/help/fr/scanning.page b/help/fr/scanning.page
index 2eff688..39b7a3e 100644
--- a/help/fr/scanning.page
+++ b/help/fr/scanning.page
@@ -10,23 +10,14 @@
 
     <p>Pour numériser un document avec votre périphérique de numérisation :</p>
     <steps>
-      <item><p>Connect the scanner to your computer and power it on.</p></item>
+      <item><p>Connectez le périphérique de numérisation à votre ordinateur et allumez-le.</p></item>
       <item><p>Ouvrir l'application <app>Simple Scan</app>.</p></item>
-      <item><p>Click the arrow to the right of the "Scan" button and choose the type
-	     of document you are scanning: <em>Photo</em> or <em>Text</em>.</p>
+      <item><p>Cliquez sur la flèche à droite du bouton « Numériser »  et sélectionnez le type de document que vous voulez numériser : <em>Photo</em> ou <em>Texte</em>.</p>
 	     <media type="image" src="figures/scan_toolbar.png"/></item>
-      <item><p>Click the "Scan" button on the toolbar (or press <keyseq><key>Ctrl</key><key>1</key></keyseq>).</p></item>
+      <item><p>Cliquez sur le bouton « Numériser » de la barre d'outils (ou appuyez sur <keyseq><key>Ctrl</key><key>1</key></keyseq>).</p></item>
     </steps>
 
-    <note><p>
-    The page will be shown as it is scanned. To stop the scan at any time press the <key>Esc</key>
-    key on the keyboard. Each page you scan is placed at the end of the document.
-    </p></note>
+    <note><p>La page sera affichée telle qu'elle a été numérisée. Pour arrêter la numérisation à n'importe quel moment, appuyez sur la touche <key>Échap</key> du clavier. Chaque page numérisée est placée à la fin du document.</p></note>
 
-    <p>
-      The document type can be also be changed from the <guiseq><gui>Document</gui>
-      <gui>Scan</gui></guiseq> menu. Choose <gui><em>Text</em></gui> if you want the document
-      to be quickly scanned in black and white; choose <gui><em>Photo</em></gui> for a high 
-      resolution color scan. See <link xref="dpi"/> for more details and more options.
-    </p>
+    <p>Le type de document peut aussi être modifié depuis le menu <guiseq><gui>Document</gui> <gui>Numériser</gui></guiseq>. Sélectionnez <gui><em>Texte</em></gui> si vous souhaitez que le document soit numérisé rapidement en noir et blanc ; sélectionnez <gui><em>Photo</em></gui> pour un document de résolution élevée en couleur. Consultez <link xref="dpi"/> pour plus de détails et plus d'options.</p>
 </page>
diff --git a/help/hu/hu.po b/help/hu/hu.po
index 416ed09..8ebffdc 100644
--- a/help/hu/hu.po
+++ b/help/hu/hu.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-04-26 05:45+0000\n"
-"X-Generator: Launchpad (build 17995)\n"
+"X-Launchpad-Export-Date: 2016-05-07 04:36+0000\n"
+"X-Generator: Launchpad (build 18025)\n"
 "Language: hu\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
@@ -741,223 +741,3 @@ msgid ""
 "black and white; choose <gui><em>Photo</em></gui> for a high resolution "
 "color scan. See <link xref=\"dpi\"/> for more details and more options."
 msgstr ""
-
-#~ msgid "Simple Scan Help"
-#~ msgstr "Simple Scan súgó"
-
-#~ msgid ""
-#~ "If your scanner has an Automatic Document Feeder (ADF) you can scan all the "
-#~ "pages by selecting the <guiseq><gui>Document</gui><gui>Scan</gui><gui>All "
-#~ "Pages From Feeder</gui></guiseq> menu."
-#~ msgstr ""
-#~ "Ha szkennere rendelkezik automatikus dokumentumadagolóval, akkor az összes "
-#~ "oldalt beolvastathatja a "
-#~ "<guiseq><gui>Dokumentum</gui><gui>Szkennelés</gui><gui>Minden oldal az "
-#~ "adagolóból</gui></guiseq> menüpont kiválasztásával."
-
-#~ msgid ""
-#~ "By default both sides of the paper will be scanned if your scanned supports "
-#~ "this. Single side scanning can be configured from the "
-#~ "<guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu."
-#~ msgstr ""
-#~ "Alapesetben a papír mindkét oldala beolvasásra kerül, ha a szkenner ezt "
-#~ "támogatja. Az egyoldalas beolvasás a "
-#~ "<guiseq><gui>Dokumentum</gui><gui>Beállítások</gui></guiseq> menüpont alatt "
-#~ "állítható be."
-
-#~ msgid ""
-#~ "To use only part of the scanned page enable crop by selecting the crop "
-#~ "button in the toolbar. A mask will be shown over the current page with the "
-#~ "area not being used shown in gray."
-#~ msgstr ""
-#~ "A beolvasott oldal egy részének használatához használja az eszköztár Vágás "
-#~ "gombját. Ekkor megjelenik egy maszk az aktuális oldal felett, a"
-
-#~ msgid ""
-#~ "The crop area can be adjusted by clicking on the inside of the crop area "
-#~ "border and dragging the mouse."
-#~ msgstr ""
-#~ "A vágási terület mérete módosítható a vágási terület szegélyén belülre "
-#~ "kattintással, és az egér húzásával."
-
-#~ msgid ""
-#~ "Fixed crop sizes can be chosen from the "
-#~ "<guiseq><gui>Page</gui><gui>Crop</gui></guiseq> menu that match commonly "
-#~ "used paper sizes."
-#~ msgstr ""
-#~ "Az <guiseq><gui>Oldal</gui><gui>Vágás</gui></guiseq> menüből rögzített "
-#~ "méretű vágási területek választhatók, amelyek megfelelnek a gyakran használt "
-#~ "papírméreteknek."
-
-#~ msgid "Each new page that is scanned will use the previous crop."
-#~ msgstr "Minden újonnan beolvasott oldal a korábbi vágást használja."
-
-#~ msgid ""
-#~ "By default text documents will be scanned at 200 dots per inch (dpi) and "
-#~ "photos at 400 dpi. To change these settings open the preferences from the "
-#~ "<guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu."
-#~ msgstr ""
-#~ "Alapesetben a szöveges dokumentumok 200 DPI felbontásban, míg a fényképek "
-#~ "400 DPI-ben kerülnek beolvasásra. Ezen beállítások módosításához nyissa meg "
-#~ "a Beállítások ablakot a "
-#~ "<guiseq><gui>Dokumentum</gui><gui>Beállítások</gui></guiseq> menüpont "
-#~ "kiválasztásával."
-
-#~ msgid ""
-#~ "If the document type is set to text the email will have a PDF attachment "
-#~ "otherwise the email will have a JPEG attachment for each page."
-#~ msgstr ""
-#~ "Ha a dokumentum típusa szövegre van állítva, akkor az e-mailhez egy PDF "
-#~ "melléklet lesz csatolva, egyébként minden oldal egy JPG mellékletként lesz "
-#~ "az e-mailhez csatolva."
-
-#~ msgid ""
-#~ "To print the current document use the "
-#~ "<guiseq><gui>Document</gui><gui>Print</gui></guiseq> menu "
-#~ "(<keyseq><key>Ctrl</key><key>P</key></keyseq>)."
-#~ msgstr ""
-#~ "Az aktuális dokumentum nyomtatásához használja a "
-#~ "<guiseq><gui>Dokumentum</gui><gui>Nyomtatás</gui></guiseq> menüpontot, vagy "
-#~ "a <keyseq><key>Ctrl</key><key>P</key></keyseq> billentyűkombinációt."
-
-#~ msgid ""
-#~ "To move a page, select it and move the page left or right using the "
-#~ "<key>&lt;</key> and <key>&gt;</key> keys."
-#~ msgstr ""
-#~ "Egy oldal áthelyezéséhez válassza ki azt, és a <key>&lt;</key> vagy "
-#~ "<key>&gt;</key> billentyűvel mozgassa balra vagy jobbra."
-
-#~ msgid "To remove the selected page use the <key>Delete</key> key."
-#~ msgstr ""
-#~ "A kijelölt oldal eltávolításához nyomja meg a <key>Delete</key> billentyűt."
-
-#~ msgid "Rotating Pages"
-#~ msgstr "Oldalak forgatása"
-
-#~ msgid ""
-#~ "To rotate a page use the rotation buttons in the toolbar or the <key>[</key> "
-#~ "and <key>]</key> keys. Each new page that is scanned will use the previous "
-#~ "rotation."
-#~ msgstr ""
-#~ "Oldal forgatásához használja az eszköztár forgatás gombjait, vagy a "
-#~ "<key>[</key> és <key>]</key> billentyűket. Minden újonnan beolvasott oldal a "
-#~ "korábbi forgatást használja."
-
-#~ msgid ""
-#~ "To save the current document to a file use the "
-#~ "<guiseq><gui>Document</gui><gui>Save</gui></guiseq> menu "
-#~ "(<keyseq><key>Ctrl</key><key>S</key></keyseq>). When you save, there is a "
-#~ "choice of three file types."
-#~ msgstr ""
-#~ "Az aktuális dokumentum fájlba mentéséhez használja a "
-#~ "<guiseq><gui>Dokumentum</gui><gui>Mentés</gui></guiseq> menüpontot, vagy a "
-#~ "<keyseq><key>Ctrl</key><key>S</key></keyseq> billentyűkombinációt. Mentéskor "
-#~ "három fájltípusból választhat."
-
-#~ msgid "Portable Document Format (PDF)"
-#~ msgstr "Portable Document Format (.pdf)"
-
-#~ msgid ""
-#~ "A PDF can contain multiple pages (like a book) and is easy to distribute to "
-#~ "other people. Most people do not have software to modify PDF documents so "
-#~ "this format is best used for archiving."
-#~ msgstr ""
-#~ "Egy PDF több oldalt is tartalmazhat (mint egy könyv) és egyszerűen "
-#~ "terjeszthető mások számára. A legtöbben nem rendelkeznek PDF-dokumentumok "
-#~ "módosítására használható szoftverrel, így ez a formátum leginkább "
-#~ "archiválásra használható."
-
-#~ msgid "Use this type if you have scanned multiple pages of text."
-#~ msgstr ""
-#~ "Ezt a típust akkor érdemes használni, ha több oldalnyi szöveget olvasott be."
-
-#~ msgid ""
-#~ "JPEG file is the file format used by digital cameras and is very small and "
-#~ "so easy to distribute. Most people have software to modify JPEG photos and "
-#~ "this format is suitable for uploading to social networking sites. If you "
-#~ "have scanned multiple pages then a JPEG file will be written for each page."
-#~ msgstr ""
-#~ "A JPEG a digitális fényképezőgépek által használt fájlformátum, kis méretű "
-#~ "és így egyszerűen terjeszthető fájlokat eredményez. A legtöbben rendelkeznek "
-#~ "a JPEG képek módosítására használható szoftverekkel, így ez a formátum "
-#~ "megfelelő a közösségi oldalakon való megosztásra. Ha több oldalt olvasott "
-#~ "be, akkor minden oldalból egy külön JPEG fájl készül."
-
-#~ msgid "Use this type if you want to modify or upload the scanned images."
-#~ msgstr ""
-#~ "Ezt a típust akkor használja, ha a beolvasott képeket módosítani vagy az "
-#~ "interneten megosztani szeretné."
-
-#~ msgid ""
-#~ "PNG files contain the raw data from the scanner. This makes them much larger "
-#~ "than JPEG files and not suitable for distributing. If you have scanned "
-#~ "multiple pages then a PNG file will be written for each page."
-#~ msgstr ""
-#~ "A PNG fájlok a nyers adatokat tartalmazzák a szkennerből. Ez sokkal nagyobbá "
-#~ "teszi azokat a JPEG fájloknál, így nem megfelelők terjesztésre. Ha több "
-#~ "oldalt olvasott be, akkor minden oldalból egy külön PNG fájl készül."
-
-#~ msgid "Use this type if you need high resolution files for editing"
-#~ msgstr ""
-#~ "Ezt a típust akkor használja, ha nagy felbontású fájlokra van szüksége "
-#~ "további szerkesztéshez."
-
-#~ msgid ""
-#~ "If you have multiple scanners you can change which scanner is selected from "
-#~ "the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu."
-#~ msgstr ""
-#~ "Ha több szkennere van, akkor a "
-#~ "<guiseq><gui>Dokumentum</gui><gui>Beállítások</gui></guiseq> menüpont "
-#~ "segítségével kiválaszthatja az éppen használandót."
-
-#~ msgid ""
-#~ "Your local scanners are automatically detected each time you start "
-#~ "<app>Simple Scan</app> and each time you plug in USB scanner. If you have a "
-#~ "network scanner you will need to restart <app>Simple Scan</app> for it to be "
-#~ "detected."
-#~ msgstr ""
-#~ "A helyi szkennerek automatikusan felismerésre kerülnek a <app>Simple "
-#~ "Scan</app> elindításakor, és egy USB szkenner csatlakoztatásakor. Ha "
-#~ "hálózati szkennere van, akkor annak felismeréséhez újra kell indítani a "
-#~ "<app>Simple Scant</app>."
-
-#~ msgid "Connect the scanner to your computer."
-#~ msgstr "Csatlakoztassa a szkennert a számítógéphez."
-
-#~ msgid ""
-#~ "Press the scan button in the toolbar (or "
-#~ "<keyseq><key>Ctrl</key><key>1</key></keyseq>)."
-#~ msgstr ""
-#~ "Nyomja meg az eszköztár Szkennelés gombját, vagy a "
-#~ "<keyseq><key>Ctrl</key><key>1</key></keyseq> billentyűkombinációt."
-
-#~ msgid "The page will be shown as it is scanned."
-#~ msgstr "Az oldal a szkennelés közben megjelenik."
-
-#~ msgid ""
-#~ "Each page you scan is added to the end of your document. To start a new "
-#~ "document select <guiseq><gui>Document</gui><gui>New</gui></guiseq>. "
-#~ "Individual pages can be deleted by right clicking a page or pressing the "
-#~ "<key>Delete</key> key."
-#~ msgstr ""
-#~ "Minden beolvasott oldal hozzáadásra kerül a dokumentumhoz. Új dokumentum "
-#~ "kezdéséhez válassza a <guiseq><gui>Dokumentum</gui><gui>Új</gui></guiseq> "
-#~ "menüpontot. Az egyes oldalak az oldalon való jobb kattintással, vagy a "
-#~ "<key>Delete</key> billentyű megnyomásával törölhetők."
-
-#~ msgid ""
-#~ "The type of scan can be changed from the "
-#~ "<guiseq><gui>Document</gui><gui>Scan</gui></guiseq> menu. Choose "
-#~ "<gui>Text</gui> if you want the document to be quickly scanned in black and "
-#~ "white or <gui>Photo</gui> for a high resolution color scan."
-#~ msgstr ""
-#~ "A beolvasás típusa a "
-#~ "<guiseq><gui>Dokumentum</gui><gui>Szkennelés</gui></guiseq> menüpont alatt "
-#~ "módosítható. Válassza a <gui>Szöveg</gui> lehetőséget a dokumentum gyors, "
-#~ "fekete-fehér beolvasásához, vagy a <gui>Fénykép</gui> lehetőséget a nagy "
-#~ "felbontású, színes beolvasáshoz."
-
-#~ msgid "To stop the scan at any time press <key>Escape</key>."
-#~ msgstr ""
-#~ "A szkennelés leállításához bármikor megnyomhatja az <key>Esc</key> "
-#~ "billentyűt."
diff --git a/help/it/crop.page b/help/it/crop.page
index 34f3d92..4cdc615 100644
--- a/help/it/crop.page
+++ b/help/it/crop.page
@@ -5,7 +5,7 @@
         <link type="guide" xref="index#modify"/>
     </info>
   
-	<title>Cropping</title>
+	<title>Ritagliare</title>
 
     <p>
     The cropping feature in <app>Simple Scan</app> allows you to use only a part of a scanned image. You can
diff --git a/help/it/dpi.page b/help/it/dpi.page
index ab529cb..d653e22 100644
--- a/help/it/dpi.page
+++ b/help/it/dpi.page
@@ -5,7 +5,7 @@
         <link type="guide" xref="index#acquire"/>
     </info>
   
-	<title>Setting the Scan Resolution</title>
+	<title>Impostare la risoluzione dello scanner</title>
 
     <p>
     The default resolution for document type <gui><em>Text</em></gui> is 150 dpi (dots per inch)
diff --git a/help/it/email.page b/help/it/email.page
index fa4861b..1b87263 100644
--- a/help/it/email.page
+++ b/help/it/email.page
@@ -5,7 +5,7 @@
         <link type="guide" xref="index#use"/>
     </info>
   
-	<title>Sending via Email</title>
+	<title>Inviare via email</title>
 
     <p>
     To email the current document use the <guiseq><gui>Document</gui><gui>Email</gui></guiseq>
diff --git a/help/it/it.po b/help/it/it.po
index 3982c6d..49938ab 100644
--- a/help/it/it.po
+++ b/help/it/it.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2016-04-25 14:55+0200\n"
-"PO-Revision-Date: 2016-04-25 15:23+0000\n"
+"PO-Revision-Date: 2016-04-26 10:46+0000\n"
 "Last-Translator: Milo Casagrande <milo.casagrande@gmail.com>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-04-26 05:45+0000\n"
-"X-Generator: Launchpad (build 17995)\n"
+"X-Launchpad-Export-Date: 2016-05-07 04:36+0000\n"
+"X-Generator: Launchpad (build 18025)\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
@@ -138,6 +138,8 @@ msgid ""
 "external ref='figures/scan_toolbar.png' "
 "md5='5d23aff1cb84b5ffe6bf66c39226cb1f'"
 msgstr ""
+"external ref='figures/scan_toolbar.png' "
+"md5='5d23aff1cb84b5ffe6bf66c39226cb1f'"
 
 #. (itstool) path: note/p
 #: C/adf.page:45
@@ -160,6 +162,7 @@ msgctxt "_"
 msgid ""
 "external ref='figures/preferences.png' md5='b9f6350ad552c954e8538596c7b42ac5'"
 msgstr ""
+"external ref='figures/preferences.png' md5='b9f6350ad552c954e8538596c7b42ac5'"
 
 #. (itstool) path: page/title
 #: C/brightness-contrast.page:9
@@ -178,7 +181,7 @@ msgstr ""
 #. (itstool) path: page/title
 #: C/crop.page:9
 msgid "Cropping"
-msgstr ""
+msgstr "Ritagliare"
 
 #. (itstool) path: page/p
 #: C/crop.page:11
@@ -257,7 +260,7 @@ msgstr ""
 #. (itstool) path: page/title
 #: C/dpi.page:9
 msgid "Setting the Scan Resolution"
-msgstr ""
+msgstr "Impostare la risoluzione dello scanner"
 
 #. (itstool) path: page/p
 #: C/dpi.page:11
@@ -299,12 +302,12 @@ msgstr ""
 #. (itstool) path: td/p
 #: C/dpi.page:32
 msgid "150 dpi"
-msgstr ""
+msgstr "150 dpi"
 
 #. (itstool) path: td/p
 #: C/dpi.page:35
 msgid "300 dpi"
-msgstr ""
+msgstr "300 dpi"
 
 #. (itstool) path: td/p
 #: C/dpi.page:36
@@ -315,7 +318,7 @@ msgstr ""
 #: C/dpi.page:39
 #: C/dpi.page:40
 msgid "600 dpi"
-msgstr ""
+msgstr "600 dpi"
 
 #. (itstool) path: td/p
 #: C/dpi.page:43
@@ -327,7 +330,7 @@ msgstr ""
 #: C/dpi.page:47
 #: C/dpi.page:48
 msgid "2400 dpi"
-msgstr ""
+msgstr "2400 dpi"
 
 #. (itstool) path: note/p
 #: C/dpi.page:52
@@ -340,7 +343,7 @@ msgstr ""
 #. (itstool) path: page/title
 #: C/email.page:9
 msgid "Sending via Email"
-msgstr ""
+msgstr "Inviare via email"
 
 #. (itstool) path: page/p
 #: C/email.page:11
@@ -385,7 +388,7 @@ msgstr ""
 #. (itstool) path: page/title
 #: C/print.page:9
 msgid "Printing"
-msgstr ""
+msgstr "Stampare"
 
 #. (itstool) path: page/p
 #: C/print.page:11
@@ -399,7 +402,7 @@ msgstr ""
 #. (itstool) path: steps/title
 #: C/print.page:17
 msgid "To Print a Document"
-msgstr ""
+msgstr "Per stampare un documento"
 
 #. (itstool) path: item/p
 #: C/print.page:19
@@ -419,7 +422,7 @@ msgstr ""
 #. (itstool) path: page/title
 #: C/quality.page:9
 msgid "Setting the Image Quality"
-msgstr ""
+msgstr "Impostare la qualità dell'immagine"
 
 #. (itstool) path: page/p
 #: C/quality.page:11
@@ -437,7 +440,7 @@ msgstr ""
 #. (itstool) path: page/title
 #: C/reorder.page:9
 msgid "Reordering Pages"
-msgstr ""
+msgstr "Riordinare le pagine"
 
 #. (itstool) path: page/p
 #: C/reorder.page:11
@@ -457,7 +460,7 @@ msgstr ""
 #. (itstool) path: page/title
 #: C/rotate.page:9
 msgid "Rotating a Page"
-msgstr ""
+msgstr "Ruotare una pagina"
 
 #. (itstool) path: page/p
 #: C/rotate.page:11
@@ -555,7 +558,7 @@ msgstr ""
 #. (itstool) path: page/title
 #: C/save.page:9
 msgid "Saving to a File"
-msgstr ""
+msgstr "Salvare su un file"
 
 #. (itstool) path: item/p
 #: C/save.page:13
@@ -734,60 +737,3 @@ msgid ""
 "black and white; choose <gui><em>Photo</em></gui> for a high resolution "
 "color scan. See <link xref=\"dpi\"/> for more details and more options."
 msgstr ""
-
-#~ msgid "Use this type if you want to modify or upload the scanned images."
-#~ msgstr ""
-#~ "Usare questo tipo di file se si intende modificare o caricare le immagini "
-#~ "acquisite."
-
-#~ msgid ""
-#~ "By default both sides of the paper will be scanned if your scanned supports "
-#~ "this. Single side scanning can be configured from the "
-#~ "<guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu."
-#~ msgstr ""
-#~ "Per impostazione predefinita verranno acquisiti entrambi i lati del foglio "
-#~ "se lo scanner supporta tale funzione. L'acquisizione a pagina singola può "
-#~ "essere configurata dal menù "
-#~ "<guiseq><gui>Documento</gui><gui>Preferenze</gui></guiseq>"
-
-#~ msgid ""
-#~ "If your scanner has an Automatic Document Feeder (ADF) you can scan all the "
-#~ "pages by selecting the <guiseq><gui>Document</gui><gui>Scan</gui><gui>All "
-#~ "Pages From Feeder</gui></guiseq> menu."
-#~ msgstr ""
-#~ "Se il proprio scanner è dotato di un alimentatore automatico di documenti è "
-#~ "possibile acquisire tutte le pagine selezionando il menù "
-#~ "<guiseq><gui>Documento</gui><gui>Acquisisci</gui><gui>Tutte le pagine dal "
-#~ "caricatore</gui></guiseq>."
-
-#~ msgid "Simple Scan Help"
-#~ msgstr "Guida di Simple Scan"
-
-#~ msgid ""
-#~ "A PDF can contain multiple pages (like a book) and is easy to distribute to "
-#~ "other people. Most people do not have software to modify PDF documents so "
-#~ "this format is best used for archiving."
-#~ msgstr ""
-#~ "Un PDF può contenere più pagine (come un libro) ed è facile condividerlo con "
-#~ "altre persone. La maggior parte delle persone non ha un programma per "
-#~ "modificare i documenti in formato PDF e quindi questo formato è il più "
-#~ "adatto per l'archiviazione."
-
-#~ msgid "Portable Document Format (PDF)"
-#~ msgstr "PDF (Portable Document Format)"
-
-#~ msgid ""
-#~ "JPEG file is the file format used by digital cameras and is very small and "
-#~ "so easy to distribute. Most people have software to modify JPEG photos and "
-#~ "this format is suitable for uploading to social networking sites. If you "
-#~ "have scanned multiple pages then a JPEG file will be written for each page."
-#~ msgstr ""
-#~ "Il formato JPEG è utilizzato dalle fotocamere digitali: è leggero e semplice "
-#~ "da condividere. La maggior parte delle persone ha dei programmi che "
-#~ "permettono di modificare le immagini JPEG e inoltre questo formato è adatto "
-#~ "a essere caricato e condiviso sui social network. Se sono state acquisite "
-#~ "diverse pagine, verrà creato un file JPEG per ognuna di esse."
-
-#~ msgid "Use this type if you have scanned multiple pages of text."
-#~ msgstr ""
-#~ "Usare questo formato se sono state acquisite diverse pagine di testo."
diff --git a/help/it/print.page b/help/it/print.page
index ad2a428..3a95b89 100644
--- a/help/it/print.page
+++ b/help/it/print.page
@@ -5,7 +5,7 @@
         <link type="guide" xref="index#use"/>
     </info>
   
-	<title>Printing</title>
+	<title>Stampare</title>
 
     <p>
     <app>Simple Scan</app> allows you print a scanned document directly from the its
@@ -13,7 +13,7 @@
     Scan</app> a very convenient tool for making copies of documents or photos. 
     </p>
     <steps>
-      <title>To Print a Document</title>
+      <title>Per stampare un documento</title>
       <item>
 	<p>Go to the <guiseq><gui>Document</gui><gui>Print</gui>
 	</guiseq> menu or use the keyboard shortcut <keyseq><key>Ctrl</key><key>P</key></keyseq>.
diff --git a/help/it/quality.page b/help/it/quality.page
index 975431d..dbbf94a 100644
--- a/help/it/quality.page
+++ b/help/it/quality.page
@@ -5,7 +5,7 @@
         <link type="guide" xref="index#use"/>
     </info>
 
-	<title>Setting the Image Quality</title>
+	<title>Impostare la qualità dell'immagine</title>
 
     <p>
     You can adjust the image quality that is used when the scan is converted to a file by changing this setting in the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu.
diff --git a/help/it/reorder.page b/help/it/reorder.page
index 5d6a9cb..13a696a 100644
--- a/help/it/reorder.page
+++ b/help/it/reorder.page
@@ -5,7 +5,7 @@
         <link type="guide" xref="index#modify"/>
     </info>
   
-	<title>Reordering Pages</title>
+	<title>Riordinare le pagine</title>
 
     <p>
     To move a page, right click on it and choose <gui><em>Move Left</em></gui> or 
diff --git a/help/it/rotate.page b/help/it/rotate.page
index af6e7f1..7d66236 100644
--- a/help/it/rotate.page
+++ b/help/it/rotate.page
@@ -5,7 +5,7 @@
         <link type="guide" xref="index#modify"/>
     </info>
   
-	<title>Rotating a Page</title>
+	<title>Ruotare una pagina</title>
 
     <p>
     In <app>Simple Scan</app>, you can change the rotation of a page either before or after scanning the page.
diff --git a/help/it/save.page b/help/it/save.page
index 68b38b5..a669e09 100644
--- a/help/it/save.page
+++ b/help/it/save.page
@@ -5,7 +5,7 @@
         <link type="guide" xref="index#use"/>
     </info>
   
-	<title>Saving to a File</title>
+	<title>Salvare su un file</title>
 
     <steps>
       <item>
diff --git a/help/ja/ja.po b/help/ja/ja.po
index 99c4d18..b290838 100644
--- a/help/ja/ja.po
+++ b/help/ja/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-04-26 05:45+0000\n"
-"X-Generator: Launchpad (build 17995)\n"
+"X-Launchpad-Export-Date: 2016-05-07 04:36+0000\n"
+"X-Generator: Launchpad (build 18025)\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
diff --git a/help/nb/nb.po b/help/nb/nb.po
index dc9931d..885c700 100644
--- a/help/nb/nb.po
+++ b/help/nb/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-04-26 05:45+0000\n"
-"X-Generator: Launchpad (build 17995)\n"
+"X-Launchpad-Export-Date: 2016-05-07 04:36+0000\n"
+"X-Generator: Launchpad (build 18025)\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
diff --git a/help/nl/nl.po b/help/nl/nl.po
index a0a1daf..bf6eda3 100644
--- a/help/nl/nl.po
+++ b/help/nl/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-04-26 05:45+0000\n"
-"X-Generator: Launchpad (build 17995)\n"
+"X-Launchpad-Export-Date: 2016-05-07 04:36+0000\n"
+"X-Generator: Launchpad (build 18025)\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
diff --git a/help/pl/pl.po b/help/pl/pl.po
index 4ba49df..f998306 100644
--- a/help/pl/pl.po
+++ b/help/pl/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-04-26 05:45+0000\n"
-"X-Generator: Launchpad (build 17995)\n"
+"X-Launchpad-Export-Date: 2016-05-07 04:36+0000\n"
+"X-Generator: Launchpad (build 18025)\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
@@ -732,51 +732,3 @@ msgid ""
 "black and white; choose <gui><em>Photo</em></gui> for a high resolution "
 "color scan. See <link xref=\"dpi\"/> for more details and more options."
 msgstr ""
-
-#~ msgid ""
-#~ "If the document type is set to text the email will have a PDF attachment "
-#~ "otherwise the email will have a JPEG attachment for each page."
-#~ msgstr ""
-#~ "Jeżeli w opcjach skanowania wybrano \"dokument tekstowy\", to zostanie on "
-#~ "przesłany jako załącznik w formacie PDF. W pozostałych przypadkach skany "
-#~ "zostaną przesłane pod postacią załączników zapisanych w formacie JPEG (każda "
-#~ "strona jako osobny plik)."
-
-#~ msgid "Simple Scan Help"
-#~ msgstr "Proste skanowanie - pomoc"
-
-#~ msgid "Rotating Pages"
-#~ msgstr "Obracanie stron"
-
-#~ msgid ""
-#~ "If your scanner has an Automatic Document Feeder (ADF) you can scan all the "
-#~ "pages by selecting the <guiseq><gui>Document</gui><gui>Scan</gui><gui>All "
-#~ "Pages From Feeder</gui></guiseq> menu."
-#~ msgstr ""
-#~ "Jeśli Twój skaner posiada automatyczny podajnik dokumentów (ADF) możesz "
-#~ "zeskanować wszystkie strony poprzez wybranie menu "
-#~ "<guiseq><gui>Dokument</gui><gui>Skanowanie</gui><gui>Wszystkie strony z "
-#~ "podajnika</gui></guiseq>."
-
-#~ msgid "Portable Document Format (PDF)"
-#~ msgstr "Portable Document Format (PDF)"
-
-#~ msgid "Connect the scanner to your computer."
-#~ msgstr "Podłącz skaner do swojego komputera."
-
-#~ msgid "The page will be shown as it is scanned."
-#~ msgstr "Wyświetlona strona jest taką, jaka została zeskanowana."
-
-#~ msgid ""
-#~ "Press the scan button in the toolbar (or "
-#~ "<keyseq><key>Ctrl</key><key>1</key></keyseq>)."
-#~ msgstr ""
-#~ "Wciśnij przycisk skanowania na pasku narzędzi (lub "
-#~ "<keyseq><key>Ctrl</key><key>1</key></keyseq>)."
-
-#~ msgid "To stop the scan at any time press <key>Escape</key>."
-#~ msgstr ""
-#~ "Możesz zatrzymać skanowanie w każdej chwili wciskając <key>Escape</key>."
-
-#~ msgid "To remove the selected page use the <key>Delete</key> key."
-#~ msgstr "Aby usunąć zaznaczoną stronę użyj klawisza <key>Delete</key>."
diff --git a/help/pt_BR/pt_BR.po b/help/pt_BR/pt_BR.po
index 75d2275..e807351 100644
--- a/help/pt_BR/pt_BR.po
+++ b/help/pt_BR/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-04-26 05:45+0000\n"
-"X-Generator: Launchpad (build 17995)\n"
+"X-Launchpad-Export-Date: 2016-05-07 04:36+0000\n"
+"X-Generator: Launchpad (build 18025)\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
@@ -740,222 +740,3 @@ msgid ""
 "black and white; choose <gui><em>Photo</em></gui> for a high resolution "
 "color scan. See <link xref=\"dpi\"/> for more details and more options."
 msgstr ""
-
-#~ msgid "Simple Scan Help"
-#~ msgstr "Ajuda do Simple Scan"
-
-#~ msgid "Portable Document Format (PDF)"
-#~ msgstr "Portable Document Format (PDF)"
-
-#~ msgid ""
-#~ "Fixed crop sizes can be chosen from the "
-#~ "<guiseq><gui>Page</gui><gui>Crop</gui></guiseq> menu that match commonly "
-#~ "used paper sizes."
-#~ msgstr ""
-#~ "Tamanhos fixos de recorte podem ser escolhidos no menu "
-#~ "<guiseq><gui>Página</gui><gui>Recortar</gui></guiseq> que possui os tamanhos "
-#~ "mais usados de papel."
-
-#~ msgid ""
-#~ "The crop area can be adjusted by clicking on the inside of the crop area "
-#~ "border and dragging the mouse."
-#~ msgstr ""
-#~ "A área de recorte pode ser ajustada clicando no interior da margem da área "
-#~ "de recorte e arrastando com o mouse."
-
-#~ msgid ""
-#~ "To use only part of the scanned page enable crop by selecting the crop "
-#~ "button in the toolbar. A mask will be shown over the current page with the "
-#~ "area not being used shown in gray."
-#~ msgstr ""
-#~ "Para usar somente parte de uma página digitalizada, ative o recurso de "
-#~ "recorte selecionando o botão Recortar na barra de ferramentas. Uma máscara "
-#~ "será mostrada sobre a página atual, com a área que não será utilizada "
-#~ "mostrada em cinza."
-
-#~ msgid ""
-#~ "If your scanner has an Automatic Document Feeder (ADF) you can scan all the "
-#~ "pages by selecting the <guiseq><gui>Document</gui><gui>Scan</gui><gui>All "
-#~ "Pages From Feeder</gui></guiseq> menu."
-#~ msgstr ""
-#~ "Se seu digitalizador tiver um alimentador automático de documentos, você "
-#~ "pode digitalizar todas as páginas ao selecionar no menu "
-#~ "<guiseq><gui>Documento</gui><gui>Digitalizar</gui><gui>Todas as  páginas do "
-#~ "alimentador</gui></guiseq>."
-
-#~ msgid ""
-#~ "By default both sides of the paper will be scanned if your scanned supports "
-#~ "this. Single side scanning can be configured from the "
-#~ "<guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu."
-#~ msgstr ""
-#~ "Por padrão, ambos os  lados do papel serão digitalizados se seu "
-#~ "digitalizador suportar este recurso. A digitalização de somente um lado do "
-#~ "papel pode ser configurada a partir do menu "
-#~ "<guiseq><gui>Documento</gui><gui>Preferências</gui></guiseq>."
-
-#~ msgid ""
-#~ "If the document type is set to text the email will have a PDF attachment "
-#~ "otherwise the email will have a JPEG attachment for each page."
-#~ msgstr ""
-#~ "Se o tipo de documento é definido como texto, o e-mail terá um anexo em PDF. "
-#~ "Senão, o e-mail terá um anexo JPEG para cada página."
-
-#~ msgid ""
-#~ "By default text documents will be scanned at 200 dots per inch (dpi) and "
-#~ "photos at 400 dpi. To change these settings open the preferences from the "
-#~ "<guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu."
-#~ msgstr ""
-#~ "O padrão é que os documentos de texto sejam digitalizados em 200 pontos por "
-#~ "polegada (dpi) e as fotos em 400 dpi. Para mudar estas configurações, abra "
-#~ "as preferências no menu "
-#~ "<guiseq><gui>Documentos</gui><gui>Preferências</gui></guiseq>."
-
-#~ msgid "Each new page that is scanned will use the previous crop."
-#~ msgstr ""
-#~ "Cada nova página digitalizada usará os tamanhos de recorte anteriores."
-
-#~ msgid ""
-#~ "To print the current document use the "
-#~ "<guiseq><gui>Document</gui><gui>Print</gui></guiseq> menu "
-#~ "(<keyseq><key>Ctrl</key><key>P</key></keyseq>)."
-#~ msgstr ""
-#~ "Para imprimir o documento, use o menu "
-#~ "<guiseq><gui>Documento</gui><gui>Imprimir</gui></guiseq> "
-#~ "(<keyseq><key>Ctrl</key><key>P</key></keyseq>)."
-
-#~ msgid ""
-#~ "To move a page, select it and move the page left or right using the "
-#~ "<key>&lt;</key> and <key>&gt;</key> keys."
-#~ msgstr ""
-#~ "Para mover uma página, selecione e mova a página para a esquerda ou direita "
-#~ "usando as teclas <key>&lt;</key> e <key>&gt;</key>."
-
-#~ msgid "Rotating Pages"
-#~ msgstr "Girando páginas"
-
-#~ msgid "To remove the selected page use the <key>Delete</key> key."
-#~ msgstr ""
-#~ "Para excluir a página selecionada, utilize a tecla <key>Delete</key>."
-
-#~ msgid ""
-#~ "To save the current document to a file use the "
-#~ "<guiseq><gui>Document</gui><gui>Save</gui></guiseq> menu "
-#~ "(<keyseq><key>Ctrl</key><key>S</key></keyseq>). When you save, there is a "
-#~ "choice of three file types."
-#~ msgstr ""
-#~ "Para salvar o documento atual em um arquivo, utilize o menu "
-#~ "<guiseq><gui>Documento</gui><gui>Salvar</gui></guiseq "
-#~ "(<keyseq><key>Ctrl</key><key>S</key></keyseq>). Quando você salvar, poderá "
-#~ "escolher entre três tipos de arquivo."
-
-#~ msgid "Use this type if you want to modify or upload the scanned images."
-#~ msgstr ""
-#~ "Use este tipo se você deseja modificar ou enviar suas imagens digitalizadas."
-
-#~ msgid "Use this type if you have scanned multiple pages of text."
-#~ msgstr "Utilize este tipo se você digitalizou várias páginas de texto."
-
-#~ msgid ""
-#~ "A PDF can contain multiple pages (like a book) and is easy to distribute to "
-#~ "other people. Most people do not have software to modify PDF documents so "
-#~ "this format is best used for archiving."
-#~ msgstr ""
-#~ "Um PDF pode conter deversas páginas (como um livro) e é facilmente "
-#~ "distribuído para outras pessoas. A maioria das pessoas não têm programas "
-#~ "para modificar documentos PDF, então este formato é melhor utilizado para "
-#~ "arquivamento."
-
-#~ msgid ""
-#~ "To rotate a page use the rotation buttons in the toolbar or the <key>[</key> "
-#~ "and <key>]</key> keys. Each new page that is scanned will use the previous "
-#~ "rotation."
-#~ msgstr ""
-#~ "Para girar uma página use os botões de rotação na barra de ferramentas ou as "
-#~ "teclas <key>[</key> e <key>]</key>. Cada nova página que for digitalizada "
-#~ "usará a rotação anterior."
-
-#~ msgid ""
-#~ "PNG files contain the raw data from the scanner. This makes them much larger "
-#~ "than JPEG files and not suitable for distributing. If you have scanned "
-#~ "multiple pages then a PNG file will be written for each page."
-#~ msgstr ""
-#~ "Arquivos PNG contém dados brutos vindos do digitalizador. Por isto são muito "
-#~ "maiores que arquivos JPEG e não são adequados para distribuição. Se você "
-#~ "digitalizou diversas páginas, então um arquivo PNG será gravado para cada "
-#~ "página."
-
-#~ msgid "To stop the scan at any time press <key>Escape</key>."
-#~ msgstr ""
-#~ "Para parar a digitalização a qualquer tempo, pressione <key>Escape</key>."
-
-#~ msgid "The page will be shown as it is scanned."
-#~ msgstr "A página será exibida enquanto é digitalizada."
-
-#~ msgid ""
-#~ "Each page you scan is added to the end of your document. To start a new "
-#~ "document select <guiseq><gui>Document</gui><gui>New</gui></guiseq>. "
-#~ "Individual pages can be deleted by right clicking a page or pressing the "
-#~ "<key>Delete</key> key."
-#~ msgstr ""
-#~ "Cada página que você digitaliza é adicionada ao final de seu documento. Para "
-#~ "iniciar um novo documento, selecione "
-#~ "<guiseq><gui>Documento</gui><gui>Novo</gui></guiseq>. Páginas podem ser "
-#~ "individualmente excluídas com um clique direito do mouse ou pressionando a "
-#~ "tecla <key>Delete</key>."
-
-#~ msgid ""
-#~ "The type of scan can be changed from the "
-#~ "<guiseq><gui>Document</gui><gui>Scan</gui></guiseq> menu. Choose "
-#~ "<gui>Text</gui> if you want the document to be quickly scanned in black and "
-#~ "white or <gui>Photo</gui> for a high resolution color scan."
-#~ msgstr ""
-#~ "O tipo da digitalização pode ser alterado a partir do menu "
-#~ "<guiseq><gui>Documento</gui><gui>Digitalizar</gui></guiseq>. Selecione "
-#~ "<gui>Texto</gui> se você deseja que o documento seja digitalizado "
-#~ "rapidamente em preto e branco ou <gui>Foto</gui> para uma digitalização "
-#~ "colorida em alta resolução."
-
-#~ msgid "Connect the scanner to your computer."
-#~ msgstr "Conecte o digitalizador ao computador."
-
-#~ msgid ""
-#~ "Press the scan button in the toolbar (or "
-#~ "<keyseq><key>Ctrl</key><key>1</key></keyseq>)."
-#~ msgstr ""
-#~ "Pressione o botão Digitalizar na barra de ferramentas (ou "
-#~ "<keyseq><key>Ctrl</key><key>1</key></keyseq>)."
-
-#~ msgid ""
-#~ "Your local scanners are automatically detected each time you start "
-#~ "<app>Simple Scan</app> and each time you plug in USB scanner. If you have a "
-#~ "network scanner you will need to restart <app>Simple Scan</app> for it to be "
-#~ "detected."
-#~ msgstr ""
-#~ "Seus digitalizadores locais serão automaticamente detectados cada vez que "
-#~ "você iniciar o <app>Digitalizador simples</app> e cada vez que você conectar "
-#~ "um digitalizador USB. Se você possuir um digitalizador na rede, você terá "
-#~ "que reiniciar o <app>Digitalizador simples</app> para que seja detectado."
-
-#~ msgid "Use this type if you need high resolution files for editing"
-#~ msgstr ""
-#~ "Use este tipo se você precisa de arquivos de alta resolução para edição"
-
-#~ msgid ""
-#~ "If you have multiple scanners you can change which scanner is selected from "
-#~ "the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu."
-#~ msgstr ""
-#~ "Se você possui diversos digitalizadores, você pode alterar o digitalizador a "
-#~ "ser selecionado a partir do menu "
-#~ "<guiseq><gui>Documento</gui><gui>Preferências</gui></guiseq>."
-
-#~ msgid ""
-#~ "JPEG file is the file format used by digital cameras and is very small and "
-#~ "so easy to distribute. Most people have software to modify JPEG photos and "
-#~ "this format is suitable for uploading to social networking sites. If you "
-#~ "have scanned multiple pages then a JPEG file will be written for each page."
-#~ msgstr ""
-#~ "JPEG é o formato utilizado por câmeras digitais, é pequeno e facilmente "
-#~ "distribuído. A maioria das pessoa têm programas para modificar fotos em JPEG "
-#~ "e este formato é adequado para envio aos sites de redes sociais. Se você "
-#~ "digitalizou várias páginas, então um arquivo JPEG será gravado para cada "
-#~ "página."
diff --git a/help/ru/ru.po b/help/ru/ru.po
index bd69f3b..7d67e28 100644
--- a/help/ru/ru.po
+++ b/help/ru/ru.po
@@ -14,17 +14,15 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-04-26 05:45+0000\n"
-"X-Generator: Launchpad (build 17995)\n"
+"X-Launchpad-Export-Date: 2016-05-07 04:36+0000\n"
+"X-Generator: Launchpad (build 18025)\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
-"  Aleksey Kabanov https://launchpad.net/~ak099\n"
-"  ned https://launchpad.net/~ru100\n"
-"  ☠Jay ZDLin☠ https://launchpad.net/~black-buddha666"
+"  Aleksey Kabanov https://launchpad.net/~ak099"
 
 #. (itstool) path: credit/name
 #: C/index.page:7
@@ -740,219 +738,3 @@ msgid ""
 "black and white; choose <gui><em>Photo</em></gui> for a high resolution "
 "color scan. See <link xref=\"dpi\"/> for more details and more options."
 msgstr ""
-
-#~ msgid "Simple Scan Help"
-#~ msgstr "Справка Simple Scan"
-
-#~ msgid ""
-#~ "To move a page, select it and move the page left or right using the "
-#~ "<key>&lt;</key> and <key>&gt;</key> keys."
-#~ msgstr ""
-#~ "Чтобы переместить страницу, выберите её и передвиньте влево или вправо "
-#~ "клавишами <key>&lt;</key> и <key>&gt;</key>."
-
-#~ msgid "Rotating Pages"
-#~ msgstr "Поворот страниц"
-
-#~ msgid "To remove the selected page use the <key>Delete</key> key."
-#~ msgstr ""
-#~ "Для удаления выбранной страницы используйте клавишу <key>Delete</key>."
-
-#~ msgid ""
-#~ "To rotate a page use the rotation buttons in the toolbar or the <key>[</key> "
-#~ "and <key>]</key> keys. Each new page that is scanned will use the previous "
-#~ "rotation."
-#~ msgstr ""
-#~ "Для поворота страницы используйте кнопки поворота на панели инструментов или "
-#~ "клавиши <key>[</key> и <key>]</key>. Каждая новая отсканированная страница "
-#~ "будет поворачиваться так же, как предыдущая."
-
-#~ msgid ""
-#~ "To save the current document to a file use the "
-#~ "<guiseq><gui>Document</gui><gui>Save</gui></guiseq> menu "
-#~ "(<keyseq><key>Ctrl</key><key>S</key></keyseq>). When you save, there is a "
-#~ "choice of three file types."
-#~ msgstr ""
-#~ "Чтобы сохранить текущий документ в файл, используйте меню "
-#~ "<guiseq><gui>Документ</gui><gui>Сохранить</gui></guiseq> "
-#~ "(<keyseq><key>Ctrl</key><key>S</key></keyseq>). При сохранении у вас будет "
-#~ "выбор из трёх типов файлов."
-
-#~ msgid "Portable Document Format (PDF)"
-#~ msgstr "Portable Document Format (PDF)"
-
-#~ msgid ""
-#~ "PNG files contain the raw data from the scanner. This makes them much larger "
-#~ "than JPEG files and not suitable for distributing. If you have scanned "
-#~ "multiple pages then a PNG file will be written for each page."
-#~ msgstr ""
-#~ "Файлы PNG содержат необработанные данные со сканера. Поэтому их размер "
-#~ "гораздо больше, чем у файлов JPEG, и они не так подходят для "
-#~ "распространения. Если вы отсканировали несколько страниц, для каждой из них "
-#~ "будет создан отдельный файл PNG."
-
-#~ msgid "Use this type if you want to modify or upload the scanned images."
-#~ msgstr ""
-#~ "Используйте этот тип файлов, если хотите изменять или публиковать "
-#~ "отсканированные изображения."
-
-#~ msgid ""
-#~ "JPEG file is the file format used by digital cameras and is very small and "
-#~ "so easy to distribute. Most people have software to modify JPEG photos and "
-#~ "this format is suitable for uploading to social networking sites. If you "
-#~ "have scanned multiple pages then a JPEG file will be written for each page."
-#~ msgstr ""
-#~ "JPEG — это формат файлов, используемый цифровыми фотокамерами. Такие файлы "
-#~ "невелики по размеру и их легко распространять. У многих имеются программы "
-#~ "для изменения снимков JPEG, и этот формат подходит для публикации в "
-#~ "социальных сетях. Если вы отсканировали несколько страниц, то для каждой из "
-#~ "них будет создан отдельный файл JPEG."
-
-#~ msgid "Use this type if you have scanned multiple pages of text."
-#~ msgstr ""
-#~ "Используйте этот тип файла, если вы отсканировали несколько страниц текста."
-
-#~ msgid ""
-#~ "A PDF can contain multiple pages (like a book) and is easy to distribute to "
-#~ "other people. Most people do not have software to modify PDF documents so "
-#~ "this format is best used for archiving."
-#~ msgstr ""
-#~ "PDF может содержать несколько страниц (как книга) и его легко передать "
-#~ "другим людям. У многих нет программы для изменения документов PDF, так что "
-#~ "этот формат наилучшим образом подходит для архива документов."
-
-#~ msgid "Connect the scanner to your computer."
-#~ msgstr "Подключите сканер к компьютеру."
-
-#~ msgid ""
-#~ "Press the scan button in the toolbar (or "
-#~ "<keyseq><key>Ctrl</key><key>1</key></keyseq>)."
-#~ msgstr ""
-#~ "Нажмите кнопку сканирования на панели инструментов (или "
-#~ "<keyseq><key>Ctrl</key><key>1</key></keyseq>)."
-
-#~ msgid ""
-#~ "Your local scanners are automatically detected each time you start "
-#~ "<app>Simple Scan</app> and each time you plug in USB scanner. If you have a "
-#~ "network scanner you will need to restart <app>Simple Scan</app> for it to be "
-#~ "detected."
-#~ msgstr ""
-#~ "Ваши локальные сканеры распознаются автоматически при каждом запуске "
-#~ "<app>Simple Scan</app> и при подключении сканера через USB. Если у вас "
-#~ "сетевой сканер, вам потребуется перезапустить <app>Simple Scan</app>, чтобы "
-#~ "он был распознан."
-
-#~ msgid "Use this type if you need high resolution files for editing"
-#~ msgstr ""
-#~ "Используйте этот формат, если вам нужны файлы высокого разрешения для "
-#~ "редактирования"
-
-#~ msgid ""
-#~ "If you have multiple scanners you can change which scanner is selected from "
-#~ "the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu."
-#~ msgstr ""
-#~ "При наличии нескольких сканеров можно выбрать нужный в меню "
-#~ "<guiseq><gui>Документ</gui><gui>Параметры</gui></guiseq>."
-
-#~ msgid ""
-#~ "Fixed crop sizes can be chosen from the "
-#~ "<guiseq><gui>Page</gui><gui>Crop</gui></guiseq> menu that match commonly "
-#~ "used paper sizes."
-#~ msgstr ""
-#~ "В меню <guiseq><gui>Страница</gui><gui>Обрезать</gui></guiseq> можно выбрать "
-#~ "области обрезки фиксированного размера, соответствующие часто используемым "
-#~ "размерам бумаги."
-
-#~ msgid ""
-#~ "The crop area can be adjusted by clicking on the inside of the crop area "
-#~ "border and dragging the mouse."
-#~ msgstr ""
-#~ "Область обрезки можно настроить, щёлкнув на внутренней границы этой области "
-#~ "и перетаскивая её мышью."
-
-#~ msgid ""
-#~ "To use only part of the scanned page enable crop by selecting the crop "
-#~ "button in the toolbar. A mask will be shown over the current page with the "
-#~ "area not being used shown in gray."
-#~ msgstr ""
-#~ "Чтобы использовать лишь часть отсканированной страницы, включите обрезку, "
-#~ "нажав кнопку обрезки на панели инструментов. Над текущей страницей появится "
-#~ "маска, на которой неиспользуемая область страницы будет закрашена серым."
-
-#~ msgid ""
-#~ "By default both sides of the paper will be scanned if your scanned supports "
-#~ "this. Single side scanning can be configured from the "
-#~ "<guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu."
-#~ msgstr ""
-#~ "По умолчанию будут отсканированы обе стороны листа, если сканер поддерживает "
-#~ "двустороннее сканирование. Сканирование одной стороны можно настроить в меню "
-#~ "<guiseq><gui>Документ</gui><gui>Параметры</gui></guiseq>."
-
-#~ msgid ""
-#~ "If your scanner has an Automatic Document Feeder (ADF) you can scan all the "
-#~ "pages by selecting the <guiseq><gui>Document</gui><gui>Scan</gui><gui>All "
-#~ "Pages From Feeder</gui></guiseq> menu."
-#~ msgstr ""
-#~ "Если ваш сканер оснащён автоподатчиком страниц (ADF), можно отсканировать "
-#~ "все страницы, выбрав в меню "
-#~ "<guiseq><gui>Документ</gui><gui>Scan</gui><gui>Все страницы из "
-#~ "автоподатчика</gui></guiseq>."
-
-#~ msgid "Each new page that is scanned will use the previous crop."
-#~ msgstr ""
-#~ "Каждая вновь отсканированная страница будет использовать область обрезки "
-#~ "предыдущей страницы."
-
-#~ msgid ""
-#~ "If the document type is set to text the email will have a PDF attachment "
-#~ "otherwise the email will have a JPEG attachment for each page."
-#~ msgstr ""
-#~ "Если задан текстовый тип документа, то в письмо будет вложен PDF, в "
-#~ "противном случае будут вложены файлы JPEG для каждой страницы."
-
-#~ msgid ""
-#~ "By default text documents will be scanned at 200 dots per inch (dpi) and "
-#~ "photos at 400 dpi. To change these settings open the preferences from the "
-#~ "<guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu."
-#~ msgstr ""
-#~ "По умолчанию текстовые документы сканируются с разрешением 200 точек на дюйм "
-#~ "(dpi), а фотографии — 400 dpi. Чтобы изменить разрешение, воспользуйтесь "
-#~ "настройками из меню <guiseq><gui>Документ</gui><gui>Параметры</gui></guiseq>."
-
-#~ msgid "To stop the scan at any time press <key>Escape</key>."
-#~ msgstr "Для остановки сканирования в любой момент нажмите <key>Escape</key>."
-
-#~ msgid ""
-#~ "Each page you scan is added to the end of your document. To start a new "
-#~ "document select <guiseq><gui>Document</gui><gui>New</gui></guiseq>. "
-#~ "Individual pages can be deleted by right clicking a page or pressing the "
-#~ "<key>Delete</key> key."
-#~ msgstr ""
-#~ "Каждая отсканированная страница будет добавляться в конец вашего документа. "
-#~ "Чтобы начать новый документ, выберите "
-#~ "<guiseq><gui>Документ</gui><gui>Создать</gui></guiseq>. Отдельные страницы "
-#~ "можно удалить, щелкнув на них правой кнопкой или нажав клавишу "
-#~ "<key>Delete</key>."
-
-#~ msgid ""
-#~ "To print the current document use the "
-#~ "<guiseq><gui>Document</gui><gui>Print</gui></guiseq> menu "
-#~ "(<keyseq><key>Ctrl</key><key>P</key></keyseq>)."
-#~ msgstr ""
-#~ "Для отправки документа на печать воспользуйтесь меню "
-#~ "<guiseq><gui>Документ</gui><gui>Печать</gui></guiseq> "
-#~ "(<keyseq><key>Ctrl</key><key>P</key></keyseq>)."
-
-#~ msgid "The page will be shown as it is scanned."
-#~ msgstr "Страница будет отображаться по мере сканирования."
-
-#~ msgid ""
-#~ "The type of scan can be changed from the "
-#~ "<guiseq><gui>Document</gui><gui>Scan</gui></guiseq> menu. Choose "
-#~ "<gui>Text</gui> if you want the document to be quickly scanned in black and "
-#~ "white or <gui>Photo</gui> for a high resolution color scan."
-#~ msgstr ""
-#~ "Тип сканирования можно изменить в меню "
-#~ "<guiseq><gui>Документ</gui><gui>Сканировать</gui></guiseq>. Выберите "
-#~ "<gui>Текст</gui> для быстрого сканирования в чёрно-белом режиме или "
-#~ "<gui>Фотография</gui> для сканирования в цвете с высоким разрешением."
diff --git a/help/sk/adf.page b/help/sk/adf.page
index 65aae4d..0da45f5 100644
--- a/help/sk/adf.page
+++ b/help/sk/adf.page
@@ -13,9 +13,9 @@
     </p>
       <steps>
 	<title/>
-	<title>Use a Keyboard Shortcut</title>
+	<title>Používať klávesové skratky</title>
 	<item>
-	  <p>Press <keyseq><key>Ctrl</key><key>F</key></keyseq></p>
+	  <p>Stlač <keyseq><key>Ctrl</key><key>F</key></keyseq></p>
 	</item>      
       </steps>
       
diff --git a/help/sk/brightness-contrast.page b/help/sk/brightness-contrast.page
index d2e64ec..6456228 100644
--- a/help/sk/brightness-contrast.page
+++ b/help/sk/brightness-contrast.page
@@ -5,7 +5,7 @@
         <link type="guide" xref="index#acquire"/>
     </info>
 
-	<title>Setting brightness and Contrast</title>
+	<title>Nastaviť jas a kontrast</title>
 
     <p>
     Some scanners allow the user to adjust the brightness and contrast when scanning.
diff --git a/help/sk/index.page b/help/sk/index.page
index 352e9db..3836d99 100644
--- a/help/sk/index.page
+++ b/help/sk/index.page
@@ -13,7 +13,7 @@
 		<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
 	</info>
 
-	<title><media type="image" src="figures/icon.png"/> Simple Scan Manual</title>
+	<title><media type="image" src="figures/icon.png"/> Príručka k programu Jednoduché skenovanie</title>
     
     <section id="acquire" style="2column">
         <title>Skenovanie stránok</title>
@@ -28,6 +28,6 @@
     </section>
 
     <section id="shortcuts" style="2column">
-	<title>Simple Scan Shortcuts</title>
+	<title>Simple Scan klávesové skratky</title>
     </section>
 </page>
diff --git a/help/sk/sk.po b/help/sk/sk.po
index d7660c9..56b8e05 100644
--- a/help/sk/sk.po
+++ b/help/sk/sk.po
@@ -9,21 +9,22 @@ msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2016-04-25 14:55+0200\n"
-"PO-Revision-Date: 2016-03-12 15:09+0000\n"
+"PO-Revision-Date: 2016-07-09 08:21+0000\n"
 "Last-Translator: Dusan Kazik <prescott66@gmail.com>\n"
 "Language-Team: slovenčina <>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-04-26 05:45+0000\n"
-"X-Generator: Launchpad (build 17995)\n"
+"X-Launchpad-Export-Date: 2016-07-10 05:20+0000\n"
+"X-Generator: Launchpad (build 18115)\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
-"  Dusan Kazik https://launchpad.net/~prescott66"
+"  Dusan Kazik https://launchpad.net/~prescott66\n"
+"  Eduard Hummel https://launchpad.net/~eduardhummel"
 
 #. (itstool) path: credit/name
 #: C/index.page:7
@@ -33,7 +34,7 @@ msgstr "Robert Ancell"
 #. (itstool) path: credit/name
 #: C/index.page:11
 msgid "Ali Shtarbanov"
-msgstr ""
+msgstr "Ali Shtarbanov"
 
 #. (itstool) path: title/media
 #. This is a reference to an external file such as an image or video. When
@@ -50,6 +51,8 @@ msgstr ""
 #: C/index.page:17
 msgid "<media type=\"image\" src=\"figures/icon.png\"/> Simple Scan Manual"
 msgstr ""
+"<media type=\"image\" src=\"figures/icon.png\"/> Príručka k programu "
+"Jednoduché skenovanie"
 
 #. (itstool) path: section/title
 #: C/index.page:20
@@ -69,7 +72,7 @@ msgstr "Použitie dokumentu"
 #. (itstool) path: section/title
 #: C/index.page:32
 msgid "Simple Scan Shortcuts"
-msgstr ""
+msgstr "Simple Scan klávesové skratky"
 
 #. (itstool) path: page/title
 #: C/adf.page:9
@@ -86,12 +89,12 @@ msgstr ""
 #. (itstool) path: steps/title
 #: C/adf.page:17
 msgid "Use a Keyboard Shortcut"
-msgstr ""
+msgstr "Používať klávesové skratky"
 
 #. (itstool) path: item/p
 #: C/adf.page:19
 msgid "Press <keyseq><key>Ctrl</key><key>F</key></keyseq>"
-msgstr ""
+msgstr "Stlač <keyseq><key>Ctrl</key><key>F</key></keyseq>"
 
 #. (itstool) path: steps/title
 #: C/adf.page:24
@@ -160,7 +163,7 @@ msgstr ""
 #. (itstool) path: page/title
 #: C/brightness-contrast.page:9
 msgid "Setting brightness and Contrast"
-msgstr ""
+msgstr "Nastaviť jas a kontrast"
 
 #. (itstool) path: page/p
 #: C/brightness-contrast.page:11
@@ -730,61 +733,3 @@ msgid ""
 "black and white; choose <gui><em>Photo</em></gui> for a high resolution "
 "color scan. See <link xref=\"dpi\"/> for more details and more options."
 msgstr ""
-
-#~ msgid "Simple Scan Help"
-#~ msgstr "Pomocník aplikácie Jednoduché skenovanie"
-
-#~ msgid "Rotating Pages"
-#~ msgstr "Otáčanie stránok"
-
-#~ msgid "Use this type if you have scanned multiple pages of text."
-#~ msgstr "Použite tento typ, ak skenujete viacero stránok s textom."
-
-#~ msgid "Use this type if you want to modify or upload the scanned images."
-#~ msgstr ""
-#~ "Použite tento typ, ak chcete upravovať, alebo nahrávať skenované obrázky."
-
-#~ msgid "Use this type if you need high resolution files for editing"
-#~ msgstr ""
-#~ "Použite tento typ, ak potrebujete súbory s vysokým rozlíšením na upravovanie"
-
-#~ msgid ""
-#~ "If you have multiple scanners you can change which scanner is selected from "
-#~ "the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu."
-#~ msgstr ""
-#~ "Ak máte viacero skenerov, môžete zmeniť, ktorý skener je vybratý z ponuky "
-#~ "<guiseq><gui>Dokument</gui><gui>Nastavenia</gui></guiseq>."
-
-#~ msgid ""
-#~ "Your local scanners are automatically detected each time you start "
-#~ "<app>Simple Scan</app> and each time you plug in USB scanner. If you have a "
-#~ "network scanner you will need to restart <app>Simple Scan</app> for it to be "
-#~ "detected."
-#~ msgstr ""
-#~ "Vaše miestne skenery sú automaticky rozpoznané vždy keď spustíte aplikáciu "
-#~ "<app>Jednoduché skenovanie</app> a vždy keď pripojíte skener prostredníctvom "
-#~ "USB. Ak máte sieťový skener, budete musieť reštartovať aplikáciu "
-#~ "<app>Jednoduché skenovanie</app> kvôli jeho rozpoznaniu."
-
-#~ msgid "Connect the scanner to your computer."
-#~ msgstr "Pripojte skener k vášmu počítaču."
-
-#~ msgid ""
-#~ "Press the scan button in the toolbar (or "
-#~ "<keyseq><key>Ctrl</key><key>1</key></keyseq>)."
-#~ msgstr ""
-#~ "Stlačte tlačidlo skenovania v paneli nástrojov (alebo "
-#~ "<keyseq><key>Ctrl</key><key>1</key></keyseq>)."
-
-#~ msgid "The page will be shown as it is scanned."
-#~ msgstr "Stránka bude zobrazená, ako bude oskenovaná."
-
-#~ msgid ""
-#~ "The crop area can be adjusted by clicking on the inside of the crop area "
-#~ "border and dragging the mouse."
-#~ msgstr ""
-#~ "Oblasť orezania môže byť upravená kliknutím v hranici oblasti orezania a "
-#~ "potiahnutím myši."
-
-#~ msgid "Each new page that is scanned will use the previous crop."
-#~ msgstr "Každá nová oskenovaná stránka použije predchádzajúce orezanie."
diff --git a/help/sl/sl.po b/help/sl/sl.po
index 08a6283..150c341 100644
--- a/help/sl/sl.po
+++ b/help/sl/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-04-26 05:45+0000\n"
-"X-Generator: Launchpad (build 17995)\n"
+"X-Launchpad-Export-Date: 2016-05-07 04:36+0000\n"
+"X-Generator: Launchpad (build 18025)\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
diff --git a/help/sr/sr.po b/help/sr/sr.po
index 415d7a7..908fedb 100644
--- a/help/sr/sr.po
+++ b/help/sr/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-04-26 05:45+0000\n"
-"X-Generator: Launchpad (build 17995)\n"
+"X-Launchpad-Export-Date: 2016-05-07 04:36+0000\n"
+"X-Generator: Launchpad (build 18025)\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
diff --git a/help/uk/uk.po b/help/uk/uk.po
index 0bd80f8..b3cee84 100644
--- a/help/uk/uk.po
+++ b/help/uk/uk.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-04-26 05:45+0000\n"
-"X-Generator: Launchpad (build 17995)\n"
+"X-Launchpad-Export-Date: 2016-05-07 04:36+0000\n"
+"X-Generator: Launchpad (build 18025)\n"
 "Language: uk\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
@@ -743,232 +743,3 @@ msgid ""
 "black and white; choose <gui><em>Photo</em></gui> for a high resolution "
 "color scan. See <link xref=\"dpi\"/> for more details and more options."
 msgstr ""
-
-#~ msgid "Rotating Pages"
-#~ msgstr "Обертання сторінок"
-
-#~ msgid "To remove the selected page use the <key>Delete</key> key."
-#~ msgstr ""
-#~ "Щоб вилучити позначену сторінку, натисніть клавішу <key>Delete</key>."
-
-#~ msgid "Portable Document Format (PDF)"
-#~ msgstr "Portable Document Format (PDF)"
-
-#~ msgid "Connect the scanner to your computer."
-#~ msgstr "З’єднайте сканер з вашим комп’ютером."
-
-#~ msgid ""
-#~ "Press the scan button in the toolbar (or "
-#~ "<keyseq><key>Ctrl</key><key>1</key></keyseq>)."
-#~ msgstr ""
-#~ "Натисніть кнопку сканування на панелі інструментів (або комбінацію клавіш "
-#~ "<keyseq><key>Ctrl</key><key>1</key></keyseq>)."
-
-#~ msgid "Simple Scan Help"
-#~ msgstr "Довідка із Простого сканування"
-
-#~ msgid ""
-#~ "If your scanner has an Automatic Document Feeder (ADF) you can scan all the "
-#~ "pages by selecting the <guiseq><gui>Document</gui><gui>Scan</gui><gui>All "
-#~ "Pages From Feeder</gui></guiseq> menu."
-#~ msgstr ""
-#~ "Якщо ваш сканер обладнано засобом автоматичного подавання документів (АПД "
-#~ "або ADF), ви зможете виконати сканування всіх сторінок документа за "
-#~ "допомогою одного пункту меню: "
-#~ "<guiseq><gui>Документ</gui><gui>Сканувати</gui><gui>Всі сторінки з "
-#~ "лотка</gui></guiseq>."
-
-#~ msgid ""
-#~ "By default both sides of the paper will be scanned if your scanned supports "
-#~ "this. Single side scanning can be configured from the "
-#~ "<guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu."
-#~ msgstr ""
-#~ "Типово, програма виконуватиме сканування документа з обох боків, якщо "
-#~ "підтримку такого сканування передбачено обладнанням. Налаштувати програму на "
-#~ "сканування документів з одного боку можна за допомогою пункту меню "
-#~ "<guiseq><gui>Документ</gui><gui>Налаштування</gui></guiseq>."
-
-#~ msgid ""
-#~ "To use only part of the scanned page enable crop by selecting the crop "
-#~ "button in the toolbar. A mask will be shown over the current page with the "
-#~ "area not being used shown in gray."
-#~ msgstr ""
-#~ "Щоб використати лише частину з сканованої сторінки, увімкніть засіб "
-#~ "обрізання натисканням відповідної кнопки на панелі інструментів. Частину "
-#~ "сторінки, яку не буде включено до остаточного зображення, буде позначено "
-#~ "сірим кольором."
-
-#~ msgid ""
-#~ "The crop area can be adjusted by clicking on the inside of the crop area "
-#~ "border and dragging the mouse."
-#~ msgstr ""
-#~ "Скоригувати область обрізання можна перетягуванням краю області за допомогою "
-#~ "вказівника миші (натисніть і утримуйте ліву кнопку, перетягніть край області "
-#~ "у потрібну позицію)."
-
-#~ msgid ""
-#~ "Fixed crop sizes can be chosen from the "
-#~ "<guiseq><gui>Page</gui><gui>Crop</gui></guiseq> menu that match commonly "
-#~ "used paper sizes."
-#~ msgstr ""
-#~ "Фіксовані розміри областей обрізання можна вибрати за допомогою пункту меню "
-#~ "<guiseq><gui>Сторінка</gui><gui>Обрізати</gui></guiseq>. Ви зможете "
-#~ "скористатися наперед визначеними основними розмірами аркушів паперу."
-
-#~ msgid "Each new page that is scanned will use the previous crop."
-#~ msgstr ""
-#~ "Сканування кожної наступної сторінки виконуватиметься з врахуванням "
-#~ "визначених параметрів обрізання."
-
-#~ msgid ""
-#~ "By default text documents will be scanned at 200 dots per inch (dpi) and "
-#~ "photos at 400 dpi. To change these settings open the preferences from the "
-#~ "<guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu."
-#~ msgstr ""
-#~ "Типові текстові документи скануватимуться з роздільною здатністю 200 точок "
-#~ "на дюйм (т/д), а фотографії — 400 т/д. Щоб змінити ці параметри, "
-#~ "скористайтеся пунктом меню "
-#~ "<guiseq><gui>Документ</gui><gui>Налаштування</gui></guiseq>."
-
-#~ msgid ""
-#~ "If the document type is set to text the email will have a PDF attachment "
-#~ "otherwise the email will have a JPEG attachment for each page."
-#~ msgstr ""
-#~ "Якщо визначено текстовий тип документа, до повідомлення буде долучено "
-#~ "документ у форматі PDF. У іншому разі кожну сторінку документа буде долучено "
-#~ "як зображення JPEG."
-
-#~ msgid ""
-#~ "To print the current document use the "
-#~ "<guiseq><gui>Document</gui><gui>Print</gui></guiseq> menu "
-#~ "(<keyseq><key>Ctrl</key><key>P</key></keyseq>)."
-#~ msgstr ""
-#~ "Щоб надрукувати поточний документ, скористайтеся пунктом меню "
-#~ "<guiseq><gui>Документ</gui><gui>Друк</gui></guiseq> "
-#~ "(<keyseq><key>Ctrl</key><key>P</key></keyseq>)."
-
-#~ msgid ""
-#~ "To move a page, select it and move the page left or right using the "
-#~ "<key>&lt;</key> and <key>&gt;</key> keys."
-#~ msgstr ""
-#~ "Щоб пересунути сторінку, позначте її і скористайтеся для пересування "
-#~ "клавішами <key>&lt;</key> та <key>&gt;</key>."
-
-#~ msgid ""
-#~ "To rotate a page use the rotation buttons in the toolbar or the <key>[</key> "
-#~ "and <key>]</key> keys. Each new page that is scanned will use the previous "
-#~ "rotation."
-#~ msgstr ""
-#~ "Щоб виконати обертання сторінки, скористайтеся кнопками обертання на панелі "
-#~ "інструментів або клавішами <key>[</key> та <key>]</key>. Обертання кожної "
-#~ "наступної сканованої сторінки виконуватиметься відповідно до параметрів "
-#~ "обертання попередньої сторінки."
-
-#~ msgid ""
-#~ "To save the current document to a file use the "
-#~ "<guiseq><gui>Document</gui><gui>Save</gui></guiseq> menu "
-#~ "(<keyseq><key>Ctrl</key><key>S</key></keyseq>). When you save, there is a "
-#~ "choice of three file types."
-#~ msgstr ""
-#~ "Щоб зберегти поточний документ до файла, скористайтеся пунктом меню "
-#~ "<guiseq><gui>Документ</gui><gui>Зберегти</gui></guiseq> "
-#~ "(<keyseq><key>Ctrl</key><key>S</key></keyseq>). Ви можете обрати один з "
-#~ "трьох форматів зберігання даних."
-
-#~ msgid ""
-#~ "A PDF can contain multiple pages (like a book) and is easy to distribute to "
-#~ "other people. Most people do not have software to modify PDF documents so "
-#~ "this format is best used for archiving."
-#~ msgstr ""
-#~ "У одному файлі PDF може міститися декілька сторінок (як у книзі), його можна "
-#~ "без проблем надсилати іншим користувачам. У більшості користувачів немає "
-#~ "програмного забезпечення, призначеного для внесення змін до документів PDF, "
-#~ "тому краще користуватися цим форматом, якщо потреби у зміні документів немає."
-
-#~ msgid "Use this type if you have scanned multiple pages of text."
-#~ msgstr ""
-#~ "Скористайтеся цим форматом, якщо виконується сканування декількох текстових "
-#~ "сторінок."
-
-#~ msgid ""
-#~ "JPEG file is the file format used by digital cameras and is very small and "
-#~ "so easy to distribute. Most people have software to modify JPEG photos and "
-#~ "this format is suitable for uploading to social networking sites. If you "
-#~ "have scanned multiple pages then a JPEG file will be written for each page."
-#~ msgstr ""
-#~ "Формат файлів JPEG використовується цифровими фотоапаратами. Зазвичай, файли "
-#~ "JPEG є доволі малими. Такі файли легко поширювати. Програмне забезпечення "
-#~ "для внесення змін до файлів JPEG є у більшості користувачів. Цим форматом "
-#~ "можна скористатися для поширення файлів за допомогою соціальних мереж. Якщо "
-#~ "виконується сканування декількох сторінок, кожну з них буде записано до "
-#~ "окремого файла JPEG."
-
-#~ msgid "Use this type if you want to modify or upload the scanned images."
-#~ msgstr ""
-#~ "Скористайтеся цим форматом, якщо скановані сторінки доведеться редагувати "
-#~ "або вивантажувати для перегляду на сервер."
-
-#~ msgid ""
-#~ "PNG files contain the raw data from the scanner. This makes them much larger "
-#~ "than JPEG files and not suitable for distributing. If you have scanned "
-#~ "multiple pages then a PNG file will be written for each page."
-#~ msgstr ""
-#~ "У файлах PNG містяться необроблені дані, отримані зі сканера. Це робить такі "
-#~ "файли набагато більшими за файли JPEG, отже ці файли не дуже пасують для "
-#~ "поширення. Якщо виконуватиметься  сканування декількох сторінок, кожну з них "
-#~ "буде записано до окремого файла PNG."
-
-#~ msgid "Use this type if you need high resolution files for editing"
-#~ msgstr ""
-#~ "Скористайтеся цим форматом, якщо вам потрібні зображення з високою "
-#~ "роздільною здатністю для наступного редагування."
-
-#~ msgid ""
-#~ "If you have multiple scanners you can change which scanner is selected from "
-#~ "the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu."
-#~ msgstr ""
-#~ "Якщо ви користуєтеся декількома сканерами, ви можете змінити сканер, який "
-#~ "використовуватиметься програмою, за допомогою пункту меню  "
-#~ "<guiseq><gui>Документ</gui><gui>Налаштування</gui></guiseq>."
-
-#~ msgid ""
-#~ "Your local scanners are automatically detected each time you start "
-#~ "<app>Simple Scan</app> and each time you plug in USB scanner. If you have a "
-#~ "network scanner you will need to restart <app>Simple Scan</app> for it to be "
-#~ "detected."
-#~ msgstr ""
-#~ "Програма автоматично визначатиме з’єднані з вашим комп’ютером сканери "
-#~ "кожного разу під час запуску <app>Простого сканування</app> та з’єднання з "
-#~ "комп’ютером USB-сканера. Якщо ви хочете скористатися сканером з мережі, вам "
-#~ "слід перезапустити <app>Просте сканування</app>, перш ніж сканер буде "
-#~ "виявлено програмою."
-
-#~ msgid "The page will be shown as it is scanned."
-#~ msgstr "Програма покаже скановану сторінку."
-
-#~ msgid ""
-#~ "Each page you scan is added to the end of your document. To start a new "
-#~ "document select <guiseq><gui>Document</gui><gui>New</gui></guiseq>. "
-#~ "Individual pages can be deleted by right clicking a page or pressing the "
-#~ "<key>Delete</key> key."
-#~ msgstr ""
-#~ "Скановані сторінки додаються у кінець вашого документа. Щоб створити новий "
-#~ "документ, скористайтеся пунктом меню "
-#~ "<guiseq><gui>Документ</gui><gui>Створити</gui></guiseq>. Вилучити окремі "
-#~ "сторінки можна клацанням на мініатюрі сторінки правою кнопкою миші або "
-#~ "натисканням клавіші <key>Delete</key>."
-
-#~ msgid ""
-#~ "The type of scan can be changed from the "
-#~ "<guiseq><gui>Document</gui><gui>Scan</gui></guiseq> menu. Choose "
-#~ "<gui>Text</gui> if you want the document to be quickly scanned in black and "
-#~ "white or <gui>Photo</gui> for a high resolution color scan."
-#~ msgstr ""
-#~ "Змінити тип сканування можна за допомогою пункту меню "
-#~ "<guiseq><gui>Документ</gui><gui>Сканувати</gui></guiseq>. Виберіть "
-#~ "<gui>Текст</gui>, якщо потрібно швидко створити чорно-біле зображення "
-#~ "документа. Пункт <gui>Фотографія</gui> призначено для отримання кольорових "
-#~ "зображень з високою роздільною здатністю."
-
-#~ msgid "To stop the scan at any time press <key>Escape</key>."
-#~ msgstr "Щоб зупинити сканування, просто натисніть клавішу <key>Esc</key>."
diff --git a/help/zh_TW/zh_TW.po b/help/zh_TW/zh_TW.po
index 22fefa2..4a4eaec 100644
--- a/help/zh_TW/zh_TW.po
+++ b/help/zh_TW/zh_TW.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-04-26 05:45+0000\n"
-"X-Generator: Launchpad (build 17995)\n"
+"X-Launchpad-Export-Date: 2016-05-07 04:36+0000\n"
+"X-Generator: Launchpad (build 18025)\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
@@ -729,14 +729,3 @@ msgid ""
 "black and white; choose <gui><em>Photo</em></gui> for a high resolution "
 "color scan. See <link xref=\"dpi\"/> for more details and more options."
 msgstr ""
-
-#~ msgid "Rotating Pages"
-#~ msgstr "旋轉頁面"
-
-#~ msgid ""
-#~ "Press the scan button in the toolbar (or "
-#~ "<keyseq><key>Ctrl</key><key>1</key></keyseq>)."
-#~ msgstr "按下工具列的「掃描」鍵 (或 <keyseq><key>Ctrl</key><key>1</key></keyseq>)。"
-
-#~ msgid "To stop the scan at any time press <key>Escape</key>."
-#~ msgstr "任何時候想終止掃描，按 <key>Esc</key>。"
diff --git a/m4/appstream-xml.m4 b/m4/appstream-xml.m4
new file mode 100644
index 0000000..1472802
--- /dev/null
+++ b/m4/appstream-xml.m4
@@ -0,0 +1,86 @@
+# appstream-xml.m4
+#
+# serial 6
+
+dnl APPSTREAM_XML
+dnl Installs and validates AppData XML files.
+dnl
+dnl Call APPSTREAM_XML in configure.ac to check for the appstream-util tool.
+dnl Add @APPSTREAM_XML_RULES@ to a Makefile.am to substitute the make rules. Add
+dnl .appdata.xml files to appstream_XML in Makefile.am and they will be validated
+dnl at make check time, if appstream-util is installed, as well as installed
+dnl to the correct location automatically. Add --enable-appstream-util to
+dnl DISTCHECK_CONFIGURE_FLAGS in Makefile.am to require valid AppData XML when
+dnl doing a distcheck.
+dnl
+dnl Adding files to appstream_XML does not distribute them automatically.
+
+AC_DEFUN([APPSTREAM_XML],
+[
+  m4_pattern_allow([AM_V_GEN])
+  AC_ARG_ENABLE([appstream-util],
+                [AS_HELP_STRING([--disable-appstream-util],
+                                [Disable validating AppData XML files during check phase])])
+
+  AS_IF([test "x$enable_appstream_validate" != "xno"],
+        [AC_PATH_PROG([APPSTREAM_UTIL], [appstream-util])
+         AS_IF([test "x$APPSTREAM_UTIL" = "x"],
+               [have_appstream_validate=no],
+               [have_appstream_validate=yes
+                AC_SUBST([APPSTREAM_UTIL])])],
+        [have_appstream_validate=no])
+
+  AS_IF([test "x$have_appstream_validate" != "xno"],
+        [appstream_validate=yes],
+        [appstream_validate=no
+         AS_IF([test "x$enable_appstream_validate" = "xyes"],
+               [AC_MSG_ERROR([AppData validation was requested but appstream-util was not found])])])
+
+  AC_SUBST([appstreamxmldir], [${datadir}/appdata])
+
+  APPSTREAM_XML_RULES='
+.PHONY : uninstall-appstream-xml install-appstream-xml clean-appstream-xml
+
+mostlyclean-am: clean-appstream-xml
+
+%.appdata.valid: %.appdata.xml
+	$(AM_V_GEN) if test -f "$<"; then d=; else d="$(srcdir)/"; fi; \
+		if test -n "$(APPSTREAM_UTIL)"; \
+			then $(APPSTREAM_UTIL) --nonet validate $${d}$<; fi \
+		&& touch [$]@
+
+check-am: $(appstream_XML:.appdata.xml=.appdata.valid)
+uninstall-am: uninstall-appstream-xml
+install-data-am: install-appstream-xml
+
+.SECONDARY: $(appstream_XML)
+
+install-appstream-xml: $(appstream_XML)
+	@$(NORMAL_INSTALL)
+	if test -n "$^"; then \
+		test -z "$(appstreamxmldir)" || $(MKDIR_P) "$(DESTDIR)$(appstreamxmldir)"; \
+		$(INSTALL_DATA) $^ "$(DESTDIR)$(appstreamxmldir)"; \
+	fi
+
+uninstall-appstream-xml:
+	@$(NORMAL_UNINSTALL)
+	@list='\''$(appstream_XML)'\''; test -n "$(appstreamxmldir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e '\''s|^.*/||'\''`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '\''$(DESTDIR)$(appstreamxmldir)'\'' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(appstreamxmldir)" && rm -f $$files
+
+clean-appstream-xml:
+	rm -f $(appstream_XML:.appdata.xml=.appdata.valid)
+'
+  _APPSTREAM_XML_SUBST(APPSTREAM_XML_RULES)
+])
+
+dnl _APPSTREAM_XML_SUBST(VARIABLE)
+dnl Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
+AC_DEFUN([_APPSTREAM_XML_SUBST],
+[
+AC_SUBST([$1])
+m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])])
+]
+)
diff --git a/m4/gettext.m4 b/m4/gettext.m4
new file mode 100644
index 0000000..da31efe
--- /dev/null
+++ b/m4/gettext.m4
@@ -0,0 +1,405 @@
+# gettext.m4 serial 67 (gettext-0.19.6)
+dnl Copyright (C) 1995-2014 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 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 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 Mac OS 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_LINK_IFELSE(
+            [AC_LANG_PROGRAM(
+               [[
+#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_LINK_IFELSE(
+              [AC_LANG_PROGRAM(
+                 [[
+#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_LINK_IFELSE(
+                [AC_LANG_PROGRAM(
+                   [[
+#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], [])
+
+
+dnl Usage: AM_GNU_GETTEXT_REQUIRE_VERSION([gettext-version])
+AC_DEFUN([AM_GNU_GETTEXT_REQUIRE_VERSION], [])
diff --git a/m4/iconv.m4 b/m4/iconv.m4
new file mode 100644
index 0000000..4e37363
--- /dev/null
+++ b/m4/iconv.m4
@@ -0,0 +1,271 @@
+# iconv.m4 serial 19 (gettext-0.18.2)
+dnl Copyright (C) 2000-2002, 2007-2014 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_LINK_IFELSE will then fail, the second AC_LINK_IFELSE 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_LINK_IFELSE(
+      [AC_LANG_PROGRAM(
+         [[
+#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_LINK_IFELSE(
+        [AC_LANG_PROGRAM(
+           [[
+#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, AIX 6.1..7.1, HP-UX 11.11,
+      dnl Solaris 10.
+      am_save_LIBS="$LIBS"
+      if test $am_cv_lib_iconv = yes; then
+        LIBS="$LIBS $LIBICONV"
+      fi
+      am_cv_func_iconv_works=no
+      for ac_iconv_const in '' 'const'; do
+        AC_RUN_IFELSE(
+          [AC_LANG_PROGRAM(
+             [[
+#include <iconv.h>
+#include <string.h>
+
+#ifndef ICONV_CONST
+# define ICONV_CONST $ac_iconv_const
+#endif
+             ]],
+             [[int result = 0;
+  /* 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 ICONV_CONST char input[] = "\342\202\254"; /* EURO SIGN */
+        char buf[10];
+        ICONV_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,
+                            &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if (res == 0)
+          result |= 1;
+        iconv_close (cd_utf8_to_88591);
+      }
+  }
+  /* 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 ICONV_CONST char input[] = "\263";
+        char buf[10];
+        ICONV_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,
+                            &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if (res == 0)
+          result |= 2;
+        iconv_close (cd_ascii_to_88591);
+      }
+  }
+  /* Test against AIX 6.1..7.1 bug: Buffer overrun.  */
+  {
+    iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1");
+    if (cd_88591_to_utf8 != (iconv_t)(-1))
+      {
+        static ICONV_CONST char input[] = "\304";
+        static char buf[2] = { (char)0xDE, (char)0xAD };
+        ICONV_CONST char *inptr = input;
+        size_t inbytesleft = 1;
+        char *outptr = buf;
+        size_t outbytesleft = 1;
+        size_t res = iconv (cd_88591_to_utf8,
+                            &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD)
+          result |= 4;
+        iconv_close (cd_88591_to_utf8);
+      }
+  }
+#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 ICONV_CONST char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
+        char buf[50];
+        ICONV_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,
+                            &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if ((int)res > 0)
+          result |= 8;
+        iconv_close (cd_88591_to_utf8);
+      }
+  }
+#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))
+    result |= 16;
+  return result;
+]])],
+          [am_cv_func_iconv_works=yes], ,
+          [case "$host_os" in
+             aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
+             *)            am_cv_func_iconv_works="guessing yes" ;;
+           esac])
+        test "$am_cv_func_iconv_works" = no || break
+      done
+      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])]],
+    [m4_ifdef([gl_00GNULIB],
+       [[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_COMPILE_IFELSE(
+        [AC_LANG_PROGRAM(
+           [[
+#include <stdlib.h>
+#include <iconv.h>
+extern
+#ifdef __cplusplus
+"C"
+#endif
+#if defined(__STDC__) || defined(_MSC_VER) || 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.])
+    dnl Also substitute ICONV_CONST in the gnulib generated <iconv.h>.
+    m4_ifdef([gl_ICONV_H_DEFAULTS],
+      [AC_REQUIRE([gl_ICONV_H_DEFAULTS])
+       if test -n "$am_cv_proto_iconv_arg1"; then
+         ICONV_CONST="const"
+       fi
+      ])
+  fi
+])
diff --git a/m4/intlmacosx.m4 b/m4/intlmacosx.m4
new file mode 100644
index 0000000..bba7b3d
--- /dev/null
+++ b/m4/intlmacosx.m4
@@ -0,0 +1,56 @@
+# intlmacosx.m4 serial 5 (gettext-0.18.2)
+dnl Copyright (C) 2004-2014 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 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 is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Checks for special options needed on Mac OS X.
+dnl Defines INTL_MACOSX_LIBS.
+AC_DEFUN([gt_INTL_MACOSX],
+[
+  dnl Check for API introduced in Mac OS X 10.2.
+  AC_CACHE_CHECK([for CFPreferencesCopyAppValue],
+    [gt_cv_func_CFPreferencesCopyAppValue],
+    [gt_save_LIBS="$LIBS"
+     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
+     AC_LINK_IFELSE(
+       [AC_LANG_PROGRAM(
+          [[#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 Mac OS X function CFPreferencesCopyAppValue in the CoreFoundation framework.])
+  fi
+  dnl Check for API introduced in Mac OS X 10.3.
+  AC_CACHE_CHECK([for CFLocaleCopyCurrent], [gt_cv_func_CFLocaleCopyCurrent],
+    [gt_save_LIBS="$LIBS"
+     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
+     AC_LINK_IFELSE(
+       [AC_LANG_PROGRAM(
+          [[#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 Mac OS 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/intltool.m4 b/m4/intltool.m4
deleted file mode 100644
index c25b7b1..0000000
--- a/m4/intltool.m4
+++ /dev/null
@@ -1,212 +0,0 @@
-## intltool.m4 - Configure intltool for the target system. -*-Shell-script-*-
-## Copyright (C) 2001 Eazel, Inc.
-## Author: Maciej Stachowiak <mjs@noisehavoc.org>
-##         Kenneth Christiansen <kenneth@gnu.org>
-##
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
-## (at your option) any later version.
-##
-## This program is distributed in the hope that it will be useful, but
-## WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-##
-## As a special exception to the GNU General Public License, if you
-## distribute this file as part of a program that contains a
-## configuration script generated by Autoconf, you may include it under
-## the same distribution terms that you use for the rest of that program.
-
-dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
-# serial 42 IT_PROG_INTLTOOL
-AC_DEFUN([IT_PROG_INTLTOOL], [
-AC_PREREQ([2.50])dnl
-AC_REQUIRE([AM_NLS])dnl
-
-case "$am__api_version" in
-    1.[01234])
-	AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool])
-    ;;
-    *)
-    ;;
-esac
-
-INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
-INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-if test -n "$1"; then
-    AC_MSG_CHECKING([for intltool >= $1])
-    AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found])
-    test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
-	AC_MSG_ERROR([Your intltool is too old.  You need intltool $1 or later.])
-fi
-
-AC_PATH_PROG(INTLTOOL_UPDATE, [intltool-update])
-AC_PATH_PROG(INTLTOOL_MERGE, [intltool-merge])
-AC_PATH_PROG(INTLTOOL_EXTRACT, [intltool-extract])
-if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
-    AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.])
-fi
-
-if test -z "$AM_DEFAULT_VERBOSITY"; then
-  AM_DEFAULT_VERBOSITY=1
-fi
-AC_SUBST([AM_DEFAULT_VERBOSITY])
-
-INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))'
-INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))'
-INTLTOOL__v_MERGE_0='@echo "  ITMRG " [$]@;'
-AC_SUBST(INTLTOOL_V_MERGE)
-AC_SUBST(INTLTOOL__v_MERGE_)
-AC_SUBST(INTLTOOL__v_MERGE_0)
-
-INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))'
-intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))'
-intltool__v_merge_options_0='-q'
-AC_SUBST(INTLTOOL_V_MERGE_OPTIONS)
-AC_SUBST(intltool__v_merge_options_)
-AC_SUBST(intltool__v_merge_options_0)
-
-  INTLTOOL_DESKTOP_RULE='%.desktop:   %.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-     INTLTOOL_KEYS_RULE='%.keys:      %.keys.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-     INTLTOOL_PROP_RULE='%.prop:      %.prop.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-      INTLTOOL_OAF_RULE='%.oaf:       %.oaf.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< [$]@'
-     INTLTOOL_PONG_RULE='%.pong:      %.pong.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-   INTLTOOL_SERVER_RULE='%.server:    %.server.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-    INTLTOOL_SHEET_RULE='%.sheet:     %.sheet.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-       INTLTOOL_UI_RULE='%.ui:        %.ui.in        $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-      INTLTOOL_XML_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then
-      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< [$]@'
-else
-      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.[$][$]RANDOM && mkdir [$][$]_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u [$][$]_it_tmp_dir $< [$]@ && rmdir [$][$]_it_tmp_dir'
-fi
-      INTLTOOL_XAM_RULE='%.xam:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-      INTLTOOL_KBD_RULE='%.kbd:       %.kbd.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-    INTLTOOL_CAVES_RULE='%.caves:     %.caves.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-  INTLTOOL_SCHEMAS_RULE='%.schemas:   %.schemas.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-    INTLTOOL_THEME_RULE='%.theme:     %.theme.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-    INTLTOOL_SERVICE_RULE='%.service: %.service.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-   INTLTOOL_POLICY_RULE='%.policy:    %.policy.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-
-_IT_SUBST(INTLTOOL_DESKTOP_RULE)
-_IT_SUBST(INTLTOOL_DIRECTORY_RULE)
-_IT_SUBST(INTLTOOL_KEYS_RULE)
-_IT_SUBST(INTLTOOL_PROP_RULE)
-_IT_SUBST(INTLTOOL_OAF_RULE)
-_IT_SUBST(INTLTOOL_PONG_RULE)
-_IT_SUBST(INTLTOOL_SERVER_RULE)
-_IT_SUBST(INTLTOOL_SHEET_RULE)
-_IT_SUBST(INTLTOOL_SOUNDLIST_RULE)
-_IT_SUBST(INTLTOOL_UI_RULE)
-_IT_SUBST(INTLTOOL_XAM_RULE)
-_IT_SUBST(INTLTOOL_KBD_RULE)
-_IT_SUBST(INTLTOOL_XML_RULE)
-_IT_SUBST(INTLTOOL_XML_NOMERGE_RULE)
-_IT_SUBST(INTLTOOL_CAVES_RULE)
-_IT_SUBST(INTLTOOL_SCHEMAS_RULE)
-_IT_SUBST(INTLTOOL_THEME_RULE)
-_IT_SUBST(INTLTOOL_SERVICE_RULE)
-_IT_SUBST(INTLTOOL_POLICY_RULE)
-
-# Check the gettext tools to make sure they are GNU
-AC_PATH_PROG(XGETTEXT, xgettext)
-AC_PATH_PROG(MSGMERGE, msgmerge)
-AC_PATH_PROG(MSGFMT, msgfmt)
-AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
-    AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
-fi
-xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
-mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
-mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
-if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
-    AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
-fi
-
-AC_PATH_PROG(INTLTOOL_PERL, perl)
-if test -z "$INTLTOOL_PERL"; then
-   AC_MSG_ERROR([perl not found])
-fi
-AC_MSG_CHECKING([for perl >= 5.8.1])
-$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
-if test $? -ne 0; then
-   AC_MSG_ERROR([perl 5.8.1 is required for intltool])
-else
-   IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"`
-   AC_MSG_RESULT([$IT_PERL_VERSION])
-fi
-if test "x$2" != "xno-xml"; then
-   AC_MSG_CHECKING([for XML::Parser])
-   if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
-       AC_MSG_RESULT([ok])
-   else
-       AC_MSG_ERROR([XML::Parser perl module is required for intltool])
-   fi
-fi
-
-# Substitute ALL_LINGUAS so we can use it in po/Makefile
-AC_SUBST(ALL_LINGUAS)
-
-IT_PO_SUBDIR([po])
-
-])
-
-
-# IT_PO_SUBDIR(DIRNAME)
-# ---------------------
-# All po subdirs have to be declared with this macro; the subdir "po" is
-# declared by IT_PROG_INTLTOOL.
-#
-AC_DEFUN([IT_PO_SUBDIR],
-[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS.
-dnl
-dnl The following CONFIG_COMMANDS should be executed at the very end
-dnl of config.status.
-AC_CONFIG_COMMANDS_PRE([
-  AC_CONFIG_COMMANDS([$1/stamp-it], [
-    if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then
-       AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.])
-    fi
-    rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp"
-    >"$1/stamp-it.tmp"
-    [sed '/^#/d
-	 s/^[[].*] *//
-	 /^[ 	]*$/d
-	'"s|^|	$ac_top_srcdir/|" \
-      "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES"
-    ]
-    [sed '/^POTFILES =/,/[^\\]$/ {
-		/^POTFILES =/!d
-		r $1/POTFILES
-	  }
-	 ' "$1/Makefile.in" >"$1/Makefile"]
-    rm -f "$1/Makefile.tmp"
-    mv "$1/stamp-it.tmp" "$1/stamp-it"
-  ])
-])dnl
-])
-
-# _IT_SUBST(VARIABLE)
-# -------------------
-# Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
-#
-AC_DEFUN([_IT_SUBST],
-[
-AC_SUBST([$1])
-m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])])
-]
-)
-
-# deprecated macros
-AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
-# A hint is needed for aclocal from Automake <= 1.9.4:
-# AC_DEFUN([AC_PROG_INTLTOOL], ...)
-
diff --git a/m4/lib-ld.m4 b/m4/lib-ld.m4
new file mode 100644
index 0000000..91ca911
--- /dev/null
+++ b/m4/lib-ld.m4
@@ -0,0 +1,119 @@
+# lib-ld.m4 serial 6
+dnl Copyright (C) 1996-2003, 2009-2015 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/_*LT_PATH/AC_LIB_PROG/ and s/lt_/acl_/ to avoid
+dnl collision with libtool.m4.
+
+dnl From libtool-2.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 lds 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-2.4. Sets the variable LD.
+AC_DEFUN([AC_LIB_PROG_LD],
+[AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+
+AC_ARG_WITH([gnu-ld],
+    [AS_HELP_STRING([--with-gnu-ld],
+        [assume the C compiler uses GNU ld [default=no]])],
+    [test "$withval" = no || with_gnu_ld=yes],
+    [with_gnu_ld=no])dnl
+
+# Prepare PATH_SEPARATOR.
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
+  # contains only /bin. Note that ksh looks also at the FPATH variable,
+  # so we have to set that as well for the test.
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+    && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+           || PATH_SEPARATOR=';'
+       }
+fi
+
+ac_prog=ld
+if test "$GCC" = yes; then
+  # Check if gcc -print-prog-name=ld gives a path.
+  AC_MSG_CHECKING([for ld used by $CC])
+  case $host in
+  *-*-mingw*)
+    # gcc leaves a trailing carriage return which upsets mingw
+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+  *)
+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+  esac
+  case $ac_prog in
+    # Accept absolute paths.
+    [[\\/]]* | ?:[[\\/]]*)
+      re_direlt='/[[^/]][[^/]]*/\.\./'
+      # Canonicalize the pathname of ld
+      ac_prog=`echo "$ac_prog"| sed 's%\\\\%/%g'`
+      while echo "$ac_prog" | grep "$re_direlt" > /dev/null 2>&1; do
+        ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
+      done
+      test -z "$LD" && LD="$ac_prog"
+      ;;
+  "")
+    # If it fails, then pretend we aren't using GCC.
+    ac_prog=ld
+    ;;
+  *)
+    # If it is relative, then search for the first ld in PATH.
+    with_gnu_ld=unknown
+    ;;
+  esac
+elif test "$with_gnu_ld" = yes; then
+  AC_MSG_CHECKING([for GNU ld])
+else
+  AC_MSG_CHECKING([for non-GNU ld])
+fi
+AC_CACHE_VAL([acl_cv_path_LD],
+[if test -z "$LD"; then
+  acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  for ac_dir in $PATH; do
+    IFS="$acl_save_ifs"
+    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 variants of GNU ld 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="$acl_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..d8d5d1f
--- /dev/null
+++ b/m4/lib-link.m4
@@ -0,0 +1,777 @@
+# lib-link.m4 serial 26 (gettext-0.18.2)
+dnl Copyright (C) 2001-2015 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],[m4_translit([$1],[./+-], [____])])
+  pushdef([NAME],[m4_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],[m4_translit([$1],[./+-], [____])])
+  pushdef([NAME],[m4_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_LINK_IFELSE(
+      [AC_LANG_PROGRAM([[$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_libname_spec,
+dnl   acl_library_names_spec,
+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],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
+                                   [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
+  define([acl_frompackage_]NAME, [$2])
+  popdef([NAME])
+  pushdef([PACK],[$2])
+  pushdef([PACKUP],[m4_translit(PACK,[abcdefghijklmnopqrstuvwxyz./+-],
+                                     [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
+  define([acl_libsinpackage_]PACKUP,
+    m4_ifdef([acl_libsinpackage_]PACKUP, [m4_defn([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],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
+                                   [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
+  pushdef([PACK],[m4_ifdef([acl_frompackage_]NAME, [acl_frompackage_]NAME, lib[$1])])
+  pushdef([PACKUP],[m4_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],[m4_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..0465f47
--- /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-2015 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/po.m4 b/m4/po.m4
new file mode 100644
index 0000000..d4bc262
--- /dev/null
+++ b/m4/po.m4
@@ -0,0 +1,453 @@
+# po.m4 serial 24 (gettext-0.19)
+dnl Copyright (C) 1995-2014 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 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 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.60])
+
+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([AC_PROG_MKDIR_P])dnl
+  AC_REQUIRE([AC_PROG_SED])dnl
+  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.19])
+
+  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"
+          gt_tab=`printf '\t'`
+          cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ${gt_tab}]*\$/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 assignment 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 assignment 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.
+  tab=`printf '\t'`
+  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.
+/^['"${tab}"' ]*VARIABLE['"${tab}"' ]*=/{
+  # Seen the first line of the variable definition.
+  s/^['"${tab}"' ]*VARIABLE['"${tab}"' ]*=//
+  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 assignment 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"
+  tab=`printf '\t'`
+  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
+${tab}@echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \
+${tab}\$(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
+${tab}@echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \
+${tab}\$(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..0921e1e
--- /dev/null
+++ b/m4/progtest.m4
@@ -0,0 +1,91 @@
+# progtest.m4 serial 7 (gettext-0.18.2)
+dnl Copyright (C) 1996-2003, 2005, 2008-2015 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 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 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
+  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
+  # contains only /bin. Note that ksh looks also at the FPATH variable,
+  # so we have to set that as well for the test.
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+    && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+           || PATH_SEPARATOR=';'
+       }
+fi
+
+# 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/m4/yelp.m4 b/m4/yelp.m4
index 5db847f..709c48e 100644
--- a/m4/yelp.m4
+++ b/m4/yelp.m4
@@ -180,7 +180,13 @@ install-help: $(_HELP_LC_FILES)
 	    elif test "x$$lc" != "xC"; then \
 	      if test "x$(YELP_LC_MEDIA_LINKS)" != "x"; then \
 	        echo "$(LN_S) -f $(HELP_DIR)/C/$(HELP_ID)/$$f $$helpdir$$f"; \
-	        $(LN_S) -f "$(HELP_DIR)/C/$(HELP_ID)/$$f" "$$helpdir$$f" || exit 1; \
+	        dname="$$f"; \
+	        pars="../"; \
+	        while test "$$dname" != "." -a "$$dname" != "/"; do \
+	          pars="../$$pars"; \
+	          dname=$$(dirname "$$dname"); \
+	        done; \
+	        $(LN_S) -f $$pars"C/$(HELP_ID)/$$f" "$$helpdir$$f" || exit 1; \
 	      fi; \
 	    fi; \
 	  done; \
diff --git a/po/LINGUAS b/po/LINGUAS
index fd7e6b8..2b5d62b 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -18,6 +18,7 @@ es
 et
 eu
 fi
+fr_CA
 fr
 gd
 gl
@@ -30,6 +31,7 @@ it
 ja
 kk
 km
+ko
 ky
 lt
 lv
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index fcd2c3b..8f34f00 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -1,220 +1,482 @@
-# Makefile for program source directory in GNU NLS utilities package.
-# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
-# Copyright (C) 2004-2008 Rodney Dawes <dobey.pwns@gmail.com>
+# 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 may be copied and used freely without restrictions.  It may
-# be used in projects which are not available under a GNU Public License,
-# but which still want to provide support for the GNU gettext functionality.
+# Copying and distribution of this file, with or without modification,
+# are permitted in any medium without royalty provided the copyright
+# notice and this notice are preserved.  This file is offered as-is,
+# without any warranty.
 #
-# - Modified by Owen Taylor <otaylor@redhat.com> to use GETTEXT_PACKAGE
-#   instead of PACKAGE and to look for po2tbl in ./ not in intl/
-#
-# - Modified by jacob berkman <jacob@ximian.com> to install
-#   Makefile.in.in and po2tbl.sed.in for use with glib-gettextize
-#
-# - Modified by Rodney Dawes <dobey.pwns@gmail.com> for use with intltool
-#
-# We have the following line for use by intltoolize:
-# INTLTOOL_MAKEFILE
+# Origin: gettext-0.19.7
+GETTEXT_MACRO_VERSION = 0.19
 
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 PACKAGE = @PACKAGE@
 VERSION = @VERSION@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 
-SHELL = @SHELL@
+SED = @SED@
+SHELL = /bin/sh
+@SET_MAKE@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
 VPATH = @srcdir@
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
-datadir = @datadir@
 datarootdir = @datarootdir@
-libdir = @libdir@
+datadir = @datadir@
 localedir = @localedir@
-subdir = po
-install_sh = @install_sh@
-# Automake >= 1.8 provides @mkdir_p@.
-# Until it can be supposed, use the safe fallback:
-mkdir_p = $(install_sh) -d
+gettextsrcdir = $(datadir)/gettext/po
 
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 
-GMSGFMT = @GMSGFMT@
-MSGFMT = @MSGFMT@
-XGETTEXT = @XGETTEXT@
-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-MSGMERGE = INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
-GENPOT   = INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
-
-ALL_LINGUAS = @ALL_LINGUAS@
-
-PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; else echo "$(ALL_LINGUAS)"; fi)
-
-USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep \^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep \^$$lang$$`"; then printf "$$lang "; fi; done; fi)
+# 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@
+
+# When building gettext-tools, we prefer to use the built programs
+# rather than installed programs.  However, we can't do that when we
+# are cross compiling.
+CROSS_COMPILING = @CROSS_COMPILING@
+
+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)
 
-USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
+POTFILES = \
 
-POFILES=$(shell LINGUAS="$(PO_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done)
+CATALOGS = @CATALOGS@
 
-DISTFILES = Makefile.in.in POTFILES.in $(POFILES)
-EXTRA_DISTFILES = ChangeLog POTFILES.skip Makevars LINGUAS
+POFILESDEPS_ = $(srcdir)/$(DOMAIN).pot
+POFILESDEPS_yes = $(POFILESDEPS_)
+POFILESDEPS_no =
+POFILESDEPS = $(POFILESDEPS_$(PO_DEPENDS_ON_POT))
 
-POTFILES = \
-# This comment gets stripped out
+DISTFILESDEPS_ = update-po
+DISTFILESDEPS_yes = $(DISTFILESDEPS_)
+DISTFILESDEPS_no =
+DISTFILESDEPS = $(DISTFILESDEPS_$(DIST_DEPENDS_ON_UPDATE_PO))
 
-CATALOGS=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.gmo "; done)
+# Makevars gets inserted here. (Don't remove this line!)
 
 .SUFFIXES:
-.SUFFIXES: .po .pox .gmo .mo .msg .cat
-
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-INTLTOOL_V_MSGFMT = $(INTLTOOL__v_MSGFMT_$(V))
-INTLTOOL__v_MSGFMT_= $(INTLTOOL__v_MSGFMT_$(AM_DEFAULT_VERBOSITY))
-INTLTOOL__v_MSGFMT_0 = @echo "  MSGFMT" $@;
-
-.po.pox:
-	$(MAKE) $(GETTEXT_PACKAGE).pot
-	$(MSGMERGE) $* $(GETTEXT_PACKAGE).pot -o $*.pox
+.SUFFIXES: .po .gmo .mo .sed .sin .nop .po-create .po-update
 
 .po.mo:
-	$(INTLTOOL_V_MSGFMT)$(MSGFMT) -o $@ $<
+	@echo "$(MSGFMT) -c -o $@ $<"; \
+	$(MSGFMT) -c -o t-$@ $< && mv t-$@ $@
 
 .po.gmo:
-	$(INTLTOOL_V_MSGFMT)file=`echo $* | sed 's,.*/,,'`.gmo \
-	  && rm -f $$file && $(GMSGFMT) -o $$file $<
+	@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
 
-.po.cat:
-	sed -f ../intl/po2msg.sed < $< > $*.msg \
-	  && rm -f $@ && gencat $@ $*.msg
+.sin.sed:
+	sed -e '/^#/d' $< > t-$@
+	mv t-$@ $@
 
 
 all: all-@USE_NLS@
 
-all-yes: $(CATALOGS)
+all-yes: stamp-po
 all-no:
 
-$(GETTEXT_PACKAGE).pot: $(POTFILES)
-	$(GENPOT)
+# 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
+	@$(CHECK_MACRO_VERSION)
+	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.
+# The determination of whether the package xyz is a GNU one is based on the
+# heuristic whether some file in the top level directory mentions "GNU xyz".
+# If GNU 'find' is available, we avoid grepping through monster files.
+$(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
+	package_gnu="$(PACKAGE_GNU)"; \
+	test -n "$$package_gnu" || { \
+	  if { if (LC_ALL=C find --version) 2>/dev/null | grep GNU >/dev/null; then \
+		 LC_ALL=C find -L $(top_srcdir) -maxdepth 1 -type f \
+			       -size -10000000c -exec grep 'GNU @PACKAGE@' \
+			       /dev/null '{}' ';' 2>/dev/null; \
+	       else \
+		 LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null; \
+	       fi; \
+	     } | grep -v 'libtool:' >/dev/null; then \
+	     package_gnu=yes; \
+	   else \
+	     package_gnu=no; \
+	   fi; \
+	}; \
+	if test "$$package_gnu" = "yes"; then \
+	  package_prefix='GNU '; \
+	else \
+	  package_prefix=''; \
+	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_prefix}@PACKAGE@" \
+	      --package-version='@VERSION@' \
+	      --msgid-bugs-address="$$msgid_bugs_address" \
+	    ;; \
+	esac
+	test ! -f $(DOMAIN).po || { \
+	  if test -f $(srcdir)/$(DOMAIN).pot-header; then \
+	    sed -e '1,/^#$$/d' < $(DOMAIN).po > $(DOMAIN).1po && \
+	    cat $(srcdir)/$(DOMAIN).pot-header $(DOMAIN).1po > $(DOMAIN).po; \
+	    rm -f $(DOMAIN).1po; \
+	  fi; \
+	  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): $(POFILESDEPS)
+	@lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \
+	if test -f "$(srcdir)/$${lang}.po"; then \
+	  test -f $(srcdir)/$(DOMAIN).pot || $(MAKE) $(srcdir)/$(DOMAIN).pot; \
+	  test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+	  echo "$${cdcmd}$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot"; \
+	  cd $(srcdir) \
+	    && { 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_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-data
+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
-	linguas="$(USE_LINGUAS)"; \
-	for lang in $$linguas; do \
-	  dir=$(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \
-	  $(mkdir_p) $$dir; \
-	  if test -r $$lang.gmo; then \
-	    $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
-	    echo "installing $$lang.gmo as $$dir/$(GETTEXT_PACKAGE).mo"; \
-	  else \
-	    $(INSTALL_DATA) $(srcdir)/$$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
-	    echo "installing $(srcdir)/$$lang.gmo as" \
-		 "$$dir/$(GETTEXT_PACKAGE).mo"; \
-	  fi; \
-	  if test -r $$lang.gmo.m; then \
-	    $(INSTALL_DATA) $$lang.gmo.m $$dir/$(GETTEXT_PACKAGE).mo.m; \
-	    echo "installing $$lang.gmo.m as $$dir/$(GETTEXT_PACKAGE).mo.m"; \
-	  else \
-	    if test -r $(srcdir)/$$lang.gmo.m ; then \
-	      $(INSTALL_DATA) $(srcdir)/$$lang.gmo.m \
-		$$dir/$(GETTEXT_PACKAGE).mo.m; \
-	      echo "installing $(srcdir)/$$lang.gmo.m as" \
-		   "$$dir/$(GETTEXT_PACKAGE).mo.m"; \
-	    else \
-	      true; \
+	@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; \
-	  fi; \
+	  done; \
 	done
 
-# Empty stubs to satisfy archaic automake needs
-dvi info ctags tags CTAGS TAGS ID:
-
-# Define this as empty until I found a useful application.
-install-exec installcheck:
+install-strip: install
 
-uninstall:
-	linguas="$(USE_LINGUAS)"; \
-	for lang in $$linguas; do \
-	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
-	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
+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
 
-check: all $(GETTEXT_PACKAGE).pot
-	rm -f missing notexist
-	srcdir=$(srcdir) $(INTLTOOL_UPDATE) -m
-	if [ -r missing -o -r notexist ]; then \
-	  exit 1; \
+# 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 *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp
-	rm -f .intltool-merge-cache
+	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 stamp-it
-	rm -f *.mo *.msg *.cat *.cat.m *.gmo
+	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 Makefile.in.in
-
-distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
-dist distdir: $(DISTFILES)
+	rm -f stamp-po $(GMOFILES)
+
+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+dist distdir:
+	test -z "$(DISTFILESDEPS)" || $(MAKE) $(DISTFILESDEPS)
+	@$(MAKE) dist2
+# This is a separate target because 'update-po' must be executed before.
+dist2: stamp-po $(DISTFILES)
 	dists="$(DISTFILES)"; \
-	extra_dists="$(EXTRA_DISTFILES)"; \
-	for file in $$extra_dists; do \
-	  test -f $(srcdir)/$$file && dists="$$dists $(srcdir)/$$file"; \
+	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 \
-	  test -f $$file || file="$(srcdir)/$$file"; \
-	  ln $$file $(distdir) 2> /dev/null \
-	    || cp -p $$file $(distdir); \
+	  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) $(GETTEXT_PACKAGE).pot
+	$(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" && test "$(CROSS_COMPILING)" != "yes"; then PATH=`pwd`/../src:$$PATH; fi; \
 	tmpdir=`pwd`; \
-	linguas="$(USE_LINGUAS)"; \
-	for lang in $$linguas; do \
-	  echo "$$lang:"; \
-	  result="`$(MSGMERGE) -o $$tmpdir/$$lang.new.po $$lang`"; \
-	  if $$result; then \
-	    if cmp $(srcdir)/$$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; \
-	        rm -f $$tmpdir/$$lang.new.po; \
-	        exit 1; \
-	      fi; \
-	    fi; \
-	  else \
-	    echo "msgmerge for $$lang.gmo failed!"; \
+	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; \
-	done
-
-Makefile POTFILES: stamp-it
-	@if test ! -f $@; then \
-	  rm -f stamp-it; \
-	  $(MAKE) stamp-it; \
+	else \
+	  echo "msgmerge for $$lang.po failed!" 1>&2; \
+	  rm -f $$tmpdir/$$lang.new.po; \
 	fi
 
-stamp-it: Makefile.in.in $(top_builddir)/config.status POTFILES.in
+$(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) \
-	  && CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= CONFIG_LINKS= \
-	       $(SHELL) ./config.status
+	  && @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.
diff --git a/po/Makevars b/po/Makevars
new file mode 100644
index 0000000..21db722
--- /dev/null
+++ b/po/Makevars
@@ -0,0 +1,78 @@
+# Makefile variables for PO directory in any package using GNU gettext.
+
+# Usually the message domain is the same as the package name.
+DOMAIN = $(PACKAGE)
+
+# These two variables depend on the location of this directory.
+subdir = po
+top_builddir = ..
+
+# These options get passed to xgettext.
+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ --from-code=UTF-8
+
+# This is the copyright holder that gets inserted into the header of the
+# $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
+# package.  (Note that the msgstr strings, extracted from the package's
+# sources, belong to the copyright holder of the package.)  Translators are
+# expected to transfer the copyright for their translations to this person
+# or entity, or to disclaim their copyright.  The empty string stands for
+# the public domain; in this case the translators are expected to disclaim
+# their copyright.
+COPYRIGHT_HOLDER = Robert Ancell <robert.ancell@canonical.com>
+
+# This tells whether or not to prepend "GNU " prefix to the package
+# name that gets inserted into the header of the $(DOMAIN).pot file.
+# Possible values are "yes", "no", or empty.  If it is empty, try to
+# detect it automatically by scanning the files in $(top_srcdir) for
+# "GNU packagename" string.
+PACKAGE_GNU =
+
+# This is the email address or URL to which the translators shall report
+# bugs in the untranslated strings:
+# - Strings which are not entire sentences, see the maintainer guidelines
+#   in the GNU gettext documentation, section 'Preparing Strings'.
+# - Strings which use unclear terms or require additional context to be
+#   understood.
+# - Strings which make invalid assumptions about notation of date, time or
+#   money.
+# - Pluralisation problems.
+# - Incorrect English spelling.
+# - Incorrect formatting.
+# It can be your email address, or a mailing list address where translators
+# can write to without being subscribed, or the URL of a web page through
+# which the translators can contact you.
+MSGID_BUGS_ADDRESS =
+
+# This is the list of locale categories, beyond LC_MESSAGES, for which the
+# message catalogs shall be used.  It is usually empty.
+EXTRA_LOCALE_CATEGORIES =
+
+# This tells whether the $(DOMAIN).pot file contains messages with an 'msgctxt'
+# context.  Possible values are "yes" and "no".  Set this to yes if the
+# package uses functions taking also a message context, like pgettext(), or
+# if in $(XGETTEXT_OPTIONS) you define keywords with a context argument.
+USE_MSGCTXT = yes
+
+# These options get passed to msgmerge.
+# Useful options are in particular:
+#   --previous            to keep previous msgids of translated messages,
+#   --quiet               to reduce the verbosity.
+MSGMERGE_OPTIONS =
+
+# These options get passed to msginit.
+# If you want to disable line wrapping when writing PO files, add
+# --no-wrap to MSGMERGE_OPTIONS, XGETTEXT_OPTIONS, and
+# MSGINIT_OPTIONS.
+MSGINIT_OPTIONS =
+
+# This tells whether or not to regenerate a PO file when $(DOMAIN).pot
+# has changed.  Possible values are "yes" and "no".  Set this to no if
+# the POT file is checked in the repository and the version control
+# program ignores timestamps.
+PO_DEPENDS_ON_POT = no
+
+# This tells whether or not to forcibly update $(DOMAIN).pot and
+# regenerate PO files on "make dist".  Possible values are "yes" and
+# "no".  Set this to no if the POT file and PO files are maintained
+# externally.
+DIST_DEPENDS_ON_UPDATE_PO = no
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 00a1363..5963914 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,10 +1,8 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
-[encoding: UTF-8]
-[type: gettext/glade]data/simple-scan.ui
+data/simple-scan.ui
 data/simple-scan.desktop.in
-data/org.gnome.SimpleScan.gschema.xml.in
-data/appdata/simple-scan.appdata.xml.in
+data/simple-scan.appdata.xml.in
 src/book.vala
 src/book-view.vala
 src/page.vala
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
deleted file mode 100644
index 6c210b4..0000000
--- a/po/POTFILES.skip
+++ /dev/null
@@ -1,7 +0,0 @@
-src/book.c
-src/book-view.c
-src/page.c
-src/page-view.c
-src/scanner.c
-src/simple-scan.c
-src/ui.c
diff --git a/po/Rules-quot b/po/Rules-quot
new file mode 100644
index 0000000..baf6528
--- /dev/null
+++ b/po/Rules-quot
@@ -0,0 +1,58 @@
+# This file, Rules-quot, can be copied and used freely without restrictions.
+# 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-tools" && test "$(CROSS_COMPILING)" != "yes"; 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) $(MSGINIT_OPTIONS) -i $(DOMAIN).pot --no-translator -l $$lang -o - 2>/dev/null \
+	   | $(SED) -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | \
+	   { case `$(MSGFILTER) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
+	     '' | 0.[0-9] | 0.[0-9].* | 0.1[0-8] | 0.1[0-8].*) \
+	       $(MSGFILTER) $(SED) -f `echo $$lang | sed -e 's/.*@//'`.sed \
+	       ;; \
+	     *) \
+	       $(MSGFILTER) `echo $$lang | sed -e 's/.*@//'` \
+	       ;; \
+	     esac } 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/af.gmo b/po/af.gmo
new file mode 100644
index 0000000..aa95810
--- /dev/null
+++ b/po/af.gmo
diff --git a/po/af.po b/po/af.po
index 162e178..d693dbd 100644
--- a/po/af.po
+++ b/po/af.po
@@ -7,405 +7,309 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-06 14:16+1200\n"
+"POT-Creation-Date: 2016-07-29 12:47+1200\n"
 "PO-Revision-Date: 2012-09-03 08:13+0000\n"
 "Last-Translator: Dawid de Jager <dawid.dejager@gmail.com>\n"
 "Language-Team: Afrikaans <af@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-04-14 05:39+0000\n"
-"X-Generator: Launchpad (build 17990)\n"
+"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 
 #. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:2
+#: data/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_Verleen toegang"
 
 #. Label beside username entry
-#: ../data/simple-scan.ui.h:4
+#: data/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "_Gebruikersnaam vir hulpbron:"
 
 #. Label beside password entry
-#: ../data/simple-scan.ui.h:6
+#: data/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Wagwoord:"
 
 #. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:8
+#: data/simple-scan.ui:188
 msgid "Front and Back"
 msgstr "Voor en agter"
 
 #. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:10
+#: data/simple-scan.ui:192
 msgid "Front"
 msgstr "Voor"
 
 #. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:12
+#: data/simple-scan.ui:196
 msgid "Back"
 msgstr "Terug"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
-#: ../data/appdata/simple-scan.appdata.xml.in.h:1
+#: data/simple-scan.ui:225 data/simple-scan.ui:809
+#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr "Eenvoudige Skandeer"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:16
+#: data/simple-scan.ui:241
 msgid "_Document"
 msgstr "_Dokument"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:18
+#: data/simple-scan.ui:260
 msgid "Sc_an"
 msgstr "Sk_andeer"
 
+#. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:20
+#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
 msgid "Single _Page"
 msgstr "Enkel _Bladsy"
 
+#. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:22
+#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr "Alle Bladsye Vanaf _Voerder"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:24
+#: data/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "_Staak skandering"
 
-#: ../data/simple-scan.ui.h:25
+#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
 msgid "Text"
 msgstr "Teks"
 
-#: ../data/simple-scan.ui.h:26
+#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
 msgid "Photo"
 msgstr "Foto"
 
 #. Menu item to reorder pages
-#. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1183 ../src/ui.vala:1841
+#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr ""
 
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: data/simple-scan.ui:367
 msgid "_Email"
 msgstr "_E-pos"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: data/simple-scan.ui:430
 msgid "_Page"
 msgstr "_Bladsy"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: data/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "Roteer _linksom"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: data/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "Roteer _regsom"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: data/simple-scan.ui:460
 msgid "_Crop"
 msgstr "_Insny"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: data/simple-scan.ui:470
 msgid "_None"
 msgstr "_Geen"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: data/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: data/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: data/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: data/simple-scan.ui:514
 msgid "_Letter"
 msgstr "_Letter (VSA)"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: data/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "Le_gal (VSA)"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: data/simple-scan.ui:536
 msgid "4×6"
 msgstr ""
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: data/simple-scan.ui:547
 msgid "_Custom"
 msgstr "_Pasmaak"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: data/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr "_Roteer Insnit"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: data/simple-scan.ui:578
 msgid "Move Left"
 msgstr ""
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: data/simple-scan.ui:587
 msgid "Move Right"
 msgstr "Beweeg na regs"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: data/simple-scan.ui:624
 msgid "_Help"
 msgstr "_Hulp"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: data/simple-scan.ui:632
 msgid "_Contents"
 msgstr "_Inhoud"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: data/simple-scan.ui:674 data/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "Begin 'n nuwe dokument"
 
-#: ../data/simple-scan.ui.h:67
+#: data/simple-scan.ui:675
 msgid "New"
 msgstr "Nuwe"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: data/simple-scan.ui:689 data/simple-scan.ui:836
 msgid "Scan a single page from the scanner"
 msgstr "Skandeer 'n enkelbladsy vanaf die skandeerder"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: data/simple-scan.ui:691 data/simple-scan.ui:837
 msgid "Scan"
 msgstr "Skandeer"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: data/simple-scan.ui:707 data/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "Stoor dokument na 'n lêer"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1842
+#: data/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "Stoor"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: data/simple-scan.ui:724 data/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "Staak huidige skandering"
 
-#: ../data/simple-scan.ui.h:77
+#: data/simple-scan.ui:725 data/simple-scan.ui:825
 msgid "Stop"
 msgstr "Stop"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: data/simple-scan.ui:749 data/simple-scan.ui:936
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Roteer die bladsy na links (anti-kloksgewys)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: data/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "Roteer linksom"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: data/simple-scan.ui:764 data/simple-scan.ui:914
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Roteer die bladsy na regs (kloksgewys)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: data/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "Roteer regsom"
 
-#: ../data/simple-scan.ui.h:86
+#: data/simple-scan.ui:779 data/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "Snoei die gekose bladsy"
 
-#: ../data/simple-scan.ui.h:87
+#: data/simple-scan.ui:781
 msgid "Crop"
 msgstr "Insny"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1849
+#: data/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "Voorkeure"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: data/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "Skandeer B_ron"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: data/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "_Teks resolusie"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: data/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "_Foto resolusie:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: data/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "Skandeer Kant:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: data/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "Bladsy grootte:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: data/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: data/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: data/simple-scan.ui:1260
 msgid "Quality:"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:2
+#: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:3
+#: data/simple-scan.desktop.in:5
 msgid "Scan Documents"
 msgstr "Skandeer dokumente"
 
-#: ../data/simple-scan.desktop.in.h:4
+#: data/simple-scan.desktop.in:6
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Device to scan from"
-msgstr "Skanderingstoestel"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "SANE device to acquire images from."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "Type of document being scanned"
-msgstr "Tipe dokument wat geskandeer word"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
-msgid ""
-"Type of document being scanned. This setting decides on the scan resolution, "
-"colors and post-processing."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
-msgid "Width of paper in tenths of a mm"
-msgstr "Wydte van papier in tiendes van 'n mm"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
+#: data/simple-scan.desktop.in:8
+msgid "scanner"
 msgstr ""
-"Die wydte van die papier in tiendes van 'n mm (of 0 vir outomatiese "
-"bespeuring)"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
-msgid "Height of paper in tenths of a mm"
-msgstr "Hoogte van papier in tiendes van 'n mm"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-"Die hoogte van die papier in tiendes van 'n mm (of 0 vir outomatiese "
-"papierbespeuring)"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "Brightness of scan"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "The brightness adjustment from -100 to 100 (0 being none)."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid "Contrast of scan"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "The contrast adjustment from -100 to 100 (0 being none)."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid "Resolution for text scans"
-msgstr "Resolusie van geskandeerde teks"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
-msgid "The resolution in dots-per-inch to use when scanning text."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
-msgid "Resolution for photo scans"
-msgstr "Resolusie van geskandeerde foto's"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
-msgid "Page side to scan"
-msgstr "Kant van bladsy om te skandeer"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
-msgid "The page side to scan."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
-msgid "Directory to save files to"
-msgstr "Gids om lêers in te stoor"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
-msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
-msgstr ""
-"Die gids om die lêers in stoor. Verstek is die dokumente gids indien "
-"onveranderd"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
-msgid "Quality value to use for JPEG compression"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Quality value to use for JPEG compression."
-msgstr ""
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+#: data/simple-scan.appdata.xml.in:8
 msgid ""
 "A really easy way to scan both documents and photos. You can crop out the "
 "bad parts of a photo and rotate it if it is the wrong way round. You can "
@@ -413,196 +317,162 @@ msgid ""
 "formats."
 msgstr ""
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+#: data/simple-scan.appdata.xml.in:13
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Geen skandeerders is beskikbaar nie. Koppel asb.'n skandeerder."
 
-#. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "Kan nie aan skandeerder koppel nie"
 
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "Nie in staat om te begin skandeer nie"
 
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1236 src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr ""
 
-#. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr ""
 
-#. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr ""
 
-#: ../src/simple-scan.vala:26
+#: src/simple-scan.vala:26
 msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr ""
 
-#. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:391
+#: src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Skandering het misluk"
 
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:318 src/ui.vala:1602 src/ui.vala:1887
 msgid "_Close"
 msgstr ""
 
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:327
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr ""
 
-#. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:375
 msgid "No scanners detected"
 msgstr ""
 
-#. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:377
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:382
 msgid "Additional software needed"
 msgstr ""
 
-#. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr ""
 
-#. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:506 src/ui.vala:1843
 msgid "Save As..."
 msgstr "Stoor as..."
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:509 src/ui.vala:675
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:510 src/ui.vala:676
 msgid "_Save"
 msgstr ""
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "Geskandeerde dokument.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:521
 msgid "Image Files"
 msgstr "Beeldlêers"
 
-#. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:527
 msgid "All Files"
 msgstr "Alle lêers"
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr ""
 
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr ""
 
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr ""
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:557
 msgid "File format:"
 msgstr ""
 
-#. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:650
 msgid "Failed to save file"
 msgstr "Kon nie die leêr stoor nie"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:673
 msgid "If you don't save, changes will be permanently lost."
 msgstr ""
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:708
+#: src/ui.vala:708
 msgid "Save current document?"
 msgstr ""
 
-#. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:710
 msgid "Discard Changes"
 msgstr ""
 
-#. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr ""
 
-#. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr ""
 
-#. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1206
 msgid "Combine sides"
 msgstr ""
 
-#. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr ""
 
-#. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1226
 msgid "Reverse"
 msgstr ""
 
-#. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr ""
 
-#. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr ""
 
-#. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1472
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -618,17 +488,15 @@ msgid ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
 
-#. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "Aangaande Simple Scan"
 
-#. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -640,190 +508,167 @@ msgstr ""
 "  Launchpad Translations Administrators https://launchpad.net/~rosetta\n"
 "  Willem van der Colff https://launchpad.net/~wilalla"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr ""
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr ""
 
-#. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
-#. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1581
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
 msgstr ""
 
-#. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
-#. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1587
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
 msgstr ""
 
-#. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr ""
 
-#. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
-#. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1598
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
 msgstr ""
 
-#. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1602
 msgid "Install drivers"
 msgstr ""
 
-#. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
-#. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr ""
 
-#. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr ""
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr ""
 
-#. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1676
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr ""
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (verstek resolusie)"
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (hoë resolusie)"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/ui.vala:1793
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1835
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1840
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1844
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1845
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1853
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1854
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1855
 msgid "Quit"
 msgstr ""
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "Verander _skandeerder"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr ""
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1897
 msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1947
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1949
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:1957
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:1959
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:1967
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:1969
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2008
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
@@ -836,15 +681,27 @@ msgstr ""
 #~ "Gebruik:\n"
 #~ "%s [TOESTEL...] - Skandeerder"
 
+#~ msgid "Device to scan from"
+#~ msgstr "Skanderingstoestel"
+
 #~ msgid "Direction of scan"
 #~ msgstr "Skanderingsrigting"
 
+#~ msgid "Page side to scan"
+#~ msgstr "Kant van bladsy om te skandeer"
+
 #~ msgid "Width of scanned image in pixels"
 #~ msgstr "Wydte van geskandeerde beeld in pixels"
 
+#~ msgid "Width of paper in tenths of a mm"
+#~ msgstr "Wydte van papier in tiendes van 'n mm"
+
 #~ msgid "Window width in pixels"
 #~ msgstr "Venster wydte in pixels"
 
+#~ msgid "Type of document being scanned"
+#~ msgstr "Tipe dokument wat geskandeer word"
+
 #~ msgid "Window height in pixels"
 #~ msgstr "Venster hoogte in pixels"
 
@@ -857,6 +714,15 @@ msgstr ""
 #~ msgid "4&#xD7;6"
 #~ msgstr "4&#xD7;6"
 
+#~ msgid "Directory to save files to"
+#~ msgstr "Gids om lêers in te stoor"
+
+#~ msgid "Height of paper in tenths of a mm"
+#~ msgstr "Hoogte van papier in tiendes van 'n mm"
+
+#~ msgid "Resolution for text scans"
+#~ msgstr "Resolusie van geskandeerde teks"
+
 #~ msgid "Height of scanned image in pixels"
 #~ msgstr "Hoogte van geskandeerde beeld in pixels"
 
@@ -867,6 +733,9 @@ msgstr ""
 #~ "Die hoogte van geskandeerde beeld in pixels. Die waarde is verander na die "
 #~ "waarde van die laaste geskandeerde bladsy."
 
+#~ msgid "Resolution for photo scans"
+#~ msgstr "Resolusie van geskandeerde foto's"
+
 #~ msgid "Resolution of last scanned image"
 #~ msgstr "Resolusie van die laaste geskandeerde beeld"
 
@@ -876,3 +745,23 @@ msgstr ""
 #~ msgstr ""
 #~ "Die wydte van geskandeerde beeld in pixels. Die waarde is verstel na die "
 #~ "waarde van die laaste geskandeerde bladsy."
+
+#~ msgid ""
+#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr ""
+#~ "Die wydte van die papier in tiendes van 'n mm (of 0 vir outomatiese "
+#~ "bespeuring)"
+
+#~ msgid ""
+#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr ""
+#~ "Die hoogte van die papier in tiendes van 'n mm (of 0 vir outomatiese "
+#~ "papierbespeuring)"
+
+#~ msgid ""
+#~ "The directory to save files to. Defaults to the documents directory if unset."
+#~ msgstr ""
+#~ "Die gids om die lêers in stoor. Verstek is die dokumente gids indien "
+#~ "onveranderd"
diff --git a/po/am.gmo b/po/am.gmo
new file mode 100644
index 0000000..b2fde04
--- /dev/null
+++ b/po/am.gmo
diff --git a/po/am.po b/po/am.po
index 55336f6..1491e7f 100644
--- a/po/am.po
+++ b/po/am.po
@@ -7,399 +7,309 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-06 14:16+1200\n"
+"POT-Creation-Date: 2016-07-29 12:47+1200\n"
 "PO-Revision-Date: 2015-03-15 04:56+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Amharic <am@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-04-14 05:39+0000\n"
-"X-Generator: Launchpad (build 17990)\n"
+"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 
 #. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:2
+#: data/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_መፍቀጃ"
 
 #. Label beside username entry
-#: ../data/simple-scan.ui.h:4
+#: data/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "_የተጠቃሚ ስም ለምንጮቹ:"
 
 #. Label beside password entry
-#: ../data/simple-scan.ui.h:6
+#: data/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_የመግቢያ ቃል:"
 
 #. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:8
+#: data/simple-scan.ui:188
 msgid "Front and Back"
 msgstr "ፊት ለፊት እና ጀርባ"
 
 #. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:10
+#: data/simple-scan.ui:192
 msgid "Front"
 msgstr "ፊት ለፊት"
 
 #. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:12
+#: data/simple-scan.ui:196
 msgid "Back"
 msgstr "ጀርባ"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
-#: ../data/appdata/simple-scan.appdata.xml.in.h:1
+#: data/simple-scan.ui:225 data/simple-scan.ui:809
+#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr "ቀላል ማሰሻ"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:16
+#: data/simple-scan.ui:241
 msgid "_Document"
 msgstr "_ሰነድ"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:18
+#: data/simple-scan.ui:260
 msgid "Sc_an"
 msgstr "ማሰ_ሻ"
 
+#. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:20
+#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
 msgid "Single _Page"
 msgstr "ነጠላ _ገጽ"
 
+#. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:22
+#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr "ሁሉንም ገጾች ከ _መጋቢው"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:24
+#: data/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "ማሰሻ _ማስቆሚያ"
 
-#: ../data/simple-scan.ui.h:25
+#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
 msgid "Text"
 msgstr "ጽሁፍ"
 
-#: ../data/simple-scan.ui.h:26
+#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
 msgid "Photo"
 msgstr "ፎቶ"
 
 #. Menu item to reorder pages
-#. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1183 ../src/ui.vala:1841
+#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr "ገጾች መመዝገቢያ"
 
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: data/simple-scan.ui:367
 msgid "_Email"
 msgstr "_ኢሜይል"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: data/simple-scan.ui:430
 msgid "_Page"
 msgstr "_ገጽ"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: data/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "ወደ _ግራ ማዞሪያ"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: data/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "ወደ _ቀኝ ማዞሪያ"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: data/simple-scan.ui:460
 msgid "_Crop"
 msgstr "መከርከሚያ"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: data/simple-scan.ui:470
 msgid "_None"
 msgstr "_ምንም"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: data/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: data/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: data/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: data/simple-scan.ui:514
 msgid "_Letter"
 msgstr "_ደብዳቤ"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: data/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "ሕጋ_ዊ"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: data/simple-scan.ui:536
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: data/simple-scan.ui:547
 msgid "_Custom"
 msgstr "_ማስተካከያ"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: data/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr "መከርከሚያ _ማዞሪያ"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: data/simple-scan.ui:578
 msgid "Move Left"
 msgstr "ወደ ግራ ማንቀሳቀሻ"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: data/simple-scan.ui:587
 msgid "Move Right"
 msgstr "ወደ ቀኝ ማንቀሳቀሻ"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: data/simple-scan.ui:624
 msgid "_Help"
 msgstr "_እርዳታ"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: data/simple-scan.ui:632
 msgid "_Contents"
 msgstr "_ይዞታዎች"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: data/simple-scan.ui:674 data/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "አዲስ ሰነድ ማስጀመሪያ"
 
-#: ../data/simple-scan.ui.h:67
+#: data/simple-scan.ui:675
 msgid "New"
 msgstr "አዲስ"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: data/simple-scan.ui:689 data/simple-scan.ui:836
 msgid "Scan a single page from the scanner"
 msgstr "ነጠላ ገጽ ከ ማሰሻው ላያ ማሰሻ"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: data/simple-scan.ui:691 data/simple-scan.ui:837
 msgid "Scan"
 msgstr "ማሰሻ"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: data/simple-scan.ui:707 data/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "ሰነድ ወደ ፋይል ማስቀመጫ"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1842
+#: data/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "ማስቀመጫ"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: data/simple-scan.ui:724 data/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "የ አሁኑን ማሰሻ ማስቆሚያ"
 
-#: ../data/simple-scan.ui.h:77
+#: data/simple-scan.ui:725 data/simple-scan.ui:825
 msgid "Stop"
 msgstr "ማስቆሚያ"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: data/simple-scan.ui:749 data/simple-scan.ui:936
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "ገጽ ወደ ግራ ማዞሪያ (ከ ቀኝ-ወደ ግራ)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: data/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "ወደ ግራ ማዞሪያ"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: data/simple-scan.ui:764 data/simple-scan.ui:914
 msgid "Rotate the page to the right (clockwise)"
 msgstr "ገጽ ወደ ቀኝ ማዞሪያ (ከ ግራ-ወደ ቀኝ)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: data/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "ወደ ቀኝ ማዞሪያ"
 
-#: ../data/simple-scan.ui.h:86
+#: data/simple-scan.ui:779 data/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "የተመረጠውን ገጽ መከርከሚያ"
 
-#: ../data/simple-scan.ui.h:87
+#: data/simple-scan.ui:781
 msgid "Crop"
 msgstr "መከርከሚያ"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1849
+#: data/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "ምርጫዎች"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: data/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "የ ማሰሻ ም_ንጮች:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: data/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "የ _ጽሁፍ ሪዞልሽን:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: data/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "የ _ፎቶ ሪዞልሽን:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: data/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "የ ጎን ማሰሻ:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: data/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "የ ገጽ መጠን"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: data/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "ብሩህነት:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: data/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "ማነፃፃሪያ:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: data/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "ጥራት:"
 
-#: ../data/simple-scan.desktop.in.h:2
+#: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr "ሰነድ ማሰሻ"
 
-#: ../data/simple-scan.desktop.in.h:3
+#: data/simple-scan.desktop.in:5
 msgid "Scan Documents"
 msgstr "ሰነድ ማሰሻ"
 
-#: ../data/simple-scan.desktop.in.h:4
+#: data/simple-scan.desktop.in:6
 msgid "scan;scanner;flatbed;adf;"
 msgstr "ማሰሻ;ማሰሻ;ጠፍጣፋ;adf;"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Device to scan from"
-msgstr "ማሰሻ አካል ከ"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "SANE device to acquire images from."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "Type of document being scanned"
-msgstr "የ ሚታሰሰው የ ሰነድ አይነት"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
-msgid ""
-"Type of document being scanned. This setting decides on the scan resolution, "
-"colors and post-processing."
-msgstr "የ ሚታሰሰው የ ሰነድ አይነት: ይህ ማሰናጃ የ ማሰሻውን ሪዞሊሽን ይወስናል: ቀለሞች: እና የ በኋላ-ሂደቶች"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
-msgid "Width of paper in tenths of a mm"
-msgstr "የ ወረቀት ስፋት በ ሚሚ አንድ አስረኛ"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr "የ ወረቀት ስፋት በ ሚሚ አንድ አስረኛ (ወይንም ራሱ በራሱ ፈልጎ ማግኛ)"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
-msgid "Height of paper in tenths of a mm"
-msgstr "የ ወረቀት እርዝመት በ ሚሚ አንድ አስረኛ"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr "የ ወረቀት እርዝመት በ ሚሚ አንድ አስረኛ (ወይንም ራሱ በራሱ ፈልጎ ማግኛ)"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "Brightness of scan"
-msgstr "የ ማሰሻ ብሩህነት"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "The brightness adjustment from -100 to 100 (0 being none)."
-msgstr "ብርሀን ማስተካከያ ከ -100 እስከ 100 (0 ባዶ ማለት ነው)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid "Contrast of scan"
-msgstr "የ ማሰሻ ማነፃፀሪያ"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "The contrast adjustment from -100 to 100 (0 being none)."
-msgstr "ማጥቆሪያ ማስተካከያ ከ -100 እስከ 100 (0 ባዶ ማለት ነው)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid "Resolution for text scans"
-msgstr "የ ጽሁፍ ሪዞሊሽን ለ ማሰሻ"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
-msgid "The resolution in dots-per-inch to use when scanning text."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
-msgid "Resolution for photo scans"
-msgstr "የ ፎቶ ሪዞሊሽን ለ ማሰሻ"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
-msgid "Page side to scan"
-msgstr "የሚታሰሰው ገጽ"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
-msgid "The page side to scan."
-msgstr "የሚታሰሰው ገጽ"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
-msgid "Directory to save files to"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
-msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
-msgid "Quality value to use for JPEG compression"
+#: data/simple-scan.desktop.in:8
+msgid "scanner"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Quality value to use for JPEG compression."
-msgstr ""
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+#: data/simple-scan.appdata.xml.in:8
 msgid ""
 "A really easy way to scan both documents and photos. You can crop out the "
 "bad parts of a photo and rotate it if it is the wrong way round. You can "
@@ -407,196 +317,162 @@ msgid ""
 "formats."
 msgstr ""
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+#: data/simple-scan.appdata.xml.in:13
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr ""
 
-#. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr ""
 
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr ""
 
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1236 src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr ""
 
-#. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "የተለቀቀውን እትም ማሳያ"
 
-#. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr ""
 
-#: ../src/simple-scan.vala:26
+#: src/simple-scan.vala:26
 msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr ""
 
-#. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:391
+#: src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "ማሰስ አልተቻለም"
 
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr "ያስኪዱ '%s --እርዳታ'  ዝግጁ የሆኑ የትእዛዝ መስመሮችን ለማየት"
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:318 src/ui.vala:1602 src/ui.vala:1887
 msgid "_Close"
 msgstr "_መዝጊያ"
 
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:327
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "የተጠቃሚ ስም እና የመግቢያ ቃል ያስፈልጋል እዚህ ጋር ለመድረስ '%s'"
 
-#. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:375
 msgid "No scanners detected"
 msgstr "ምንም ማሰሻ አልተገኘም"
 
-#. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:377
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:382
 msgid "Additional software needed"
 msgstr ""
 
-#. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr ""
 
-#. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:506 src/ui.vala:1843
 msgid "Save As..."
 msgstr "ማስቀመጫ እንደ..."
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:509 src/ui.vala:675
 msgid "_Cancel"
 msgstr "_መሰረዣ"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:510 src/ui.vala:676
 msgid "_Save"
 msgstr "_ማሰቀመጫ"
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr ""
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:521
 msgid "Image Files"
 msgstr "የምስል ፋይሎች"
 
-#. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:527
 msgid "All Files"
 msgstr "ሁሉንም ፋይሎች"
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (በርካት-ገጽ ሰነድ)"
 
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (የታመቀ)"
 
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (ያልታመቀ)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:557
 msgid "File format:"
 msgstr ""
 
-#. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:650
 msgid "Failed to save file"
 msgstr "ፋይሉን ማስቀመጥ አልተቻለም"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:673
 msgid "If you don't save, changes will be permanently lost."
 msgstr ""
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:708
+#: src/ui.vala:708
 msgid "Save current document?"
 msgstr "የ አሁኑን ሰነድ ላስቀምጠው?"
 
-#. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:710
 msgid "Discard Changes"
 msgstr "ለውጦቹን ማስወገጃ"
 
-#. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr ""
 
-#. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr ""
 
-#. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1206
 msgid "Combine sides"
 msgstr ""
 
-#. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr ""
 
-#. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1226
 msgid "Reverse"
 msgstr ""
 
-#. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr ""
 
-#. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr ""
 
-#. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1472
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -612,212 +488,238 @@ msgid ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
 
-#. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "ሰለ ቀላል ማሰሻ"
 
-#. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "የ ቀላል ሰነድ ማሰሻ መሳሪያ"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  samson https://launchpad.net/~sambelet"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr ""
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr ""
 
-#. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
-#. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1581
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
 msgstr ""
 
-#. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
-#. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1587
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
 msgstr ""
 
-#. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr ""
 
-#. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
-#. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1598
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
 msgstr ""
 
-#. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1602
 msgid "Install drivers"
 msgstr ""
 
-#. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
-#. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr ""
 
-#. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr ""
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr ""
 
-#. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1676
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr ""
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (ነባር)"
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/ui.vala:1793
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1835
 msgid "New Document"
 msgstr "አዲስ ሰነድ"
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1840
 msgid "Document"
 msgstr "ሰነድ"
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1844
 msgid "Email..."
 msgstr "ኢሜይል..."
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1845
 msgid "Print..."
 msgstr "ማተሚያ..."
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1853
 msgid "Help"
 msgstr "እርዳታ"
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1854
 msgid "About"
 msgstr "ስለ"
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1855
 msgid "Quit"
 msgstr "ማጥፊያ"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "_ማሰሻ መቀየሪያ"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr ""
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1897
 msgid "Automatic"
 msgstr "ራሱ በራሱ"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1947
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1949
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:1957
 msgid "Less"
 msgstr "ትንሽ"
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:1959
 msgid "More"
 msgstr "ተጨማሪ"
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:1967
 msgid "Minimum"
 msgstr "አነስተኛ"
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:1969
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2008
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
 
+#~ msgid "Contrast of scan"
+#~ msgstr "የ ማሰሻ ማነፃፀሪያ"
+
+#~ msgid "Brightness of scan"
+#~ msgstr "የ ማሰሻ ብሩህነት"
+
 #~ msgid "Scanned Document"
 #~ msgstr "የታሰሰው ሰነድ"
 
 #~ msgid "Select File _Type"
 #~ msgstr "የ ፋይል _አይነት ይምረጡ"
+
+#~ msgid ""
+#~ "Type of document being scanned. This setting decides on the scan resolution, "
+#~ "colors and post-processing."
+#~ msgstr "የ ሚታሰሰው የ ሰነድ አይነት: ይህ ማሰናጃ የ ማሰሻውን ሪዞሊሽን ይወስናል: ቀለሞች: እና የ በኋላ-ሂደቶች"
+
+#~ msgid "Type of document being scanned"
+#~ msgstr "የ ሚታሰሰው የ ሰነድ አይነት"
+
+#~ msgid ""
+#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr "የ ወረቀት ስፋት በ ሚሚ አንድ አስረኛ (ወይንም ራሱ በራሱ ፈልጎ ማግኛ)"
+
+#~ msgid "Device to scan from"
+#~ msgstr "ማሰሻ አካል ከ"
+
+#~ msgid "Width of paper in tenths of a mm"
+#~ msgstr "የ ወረቀት ስፋት በ ሚሚ አንድ አስረኛ"
+
+#~ msgid "The page side to scan."
+#~ msgstr "የሚታሰሰው ገጽ"
+
+#~ msgid ""
+#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr "የ ወረቀት እርዝመት በ ሚሚ አንድ አስረኛ (ወይንም ራሱ በራሱ ፈልጎ ማግኛ)"
+
+#~ msgid "Height of paper in tenths of a mm"
+#~ msgstr "የ ወረቀት እርዝመት በ ሚሚ አንድ አስረኛ"
+
+#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
+#~ msgstr "ማጥቆሪያ ማስተካከያ ከ -100 እስከ 100 (0 ባዶ ማለት ነው)."
+
+#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
+#~ msgstr "ብርሀን ማስተካከያ ከ -100 እስከ 100 (0 ባዶ ማለት ነው)."
+
+#~ msgid "Resolution for text scans"
+#~ msgstr "የ ጽሁፍ ሪዞሊሽን ለ ማሰሻ"
+
+#~ msgid "Resolution for photo scans"
+#~ msgstr "የ ፎቶ ሪዞሊሽን ለ ማሰሻ"
+
+#~ msgid "Page side to scan"
+#~ msgstr "የሚታሰሰው ገጽ"
diff --git a/po/ar.gmo b/po/ar.gmo
new file mode 100644
index 0000000..b4d6cd6
--- /dev/null
+++ b/po/ar.gmo
diff --git a/po/ar.po b/po/ar.po
index 6bcd3a3..45cafc7 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -7,401 +7,309 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-06 14:16+1200\n"
+"POT-Creation-Date: 2016-07-29 12:47+1200\n"
 "PO-Revision-Date: 2012-07-23 08:56+0000\n"
 "Last-Translator: Khaled Hosny <khaledhosny@eglug.org>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-04-14 05:39+0000\n"
-"X-Generator: Launchpad (build 17990)\n"
+"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 
 #. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:2
+#: data/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_خوّل"
 
 #. Label beside username entry
-#: ../data/simple-scan.ui.h:4
+#: data/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "اسم _مستخدم المورد:"
 
 #. Label beside password entry
-#: ../data/simple-scan.ui.h:6
+#: data/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_كلمة السر:"
 
 #. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:8
+#: data/simple-scan.ui:188
 msgid "Front and Back"
 msgstr "الخلف والأمام"
 
 #. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:10
+#: data/simple-scan.ui:192
 msgid "Front"
 msgstr "الأمام"
 
 #. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:12
+#: data/simple-scan.ui:196
 msgid "Back"
 msgstr "الخلف"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
-#: ../data/appdata/simple-scan.appdata.xml.in.h:1
+#: data/simple-scan.ui:225 data/simple-scan.ui:809
+#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr "الماسحة الضوئية"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:16
+#: data/simple-scan.ui:241
 msgid "_Document"
 msgstr "م_ستند"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:18
+#: data/simple-scan.ui:260
 msgid "Sc_an"
 msgstr "امسح"
 
+#. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:20
+#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
 msgid "Single _Page"
 msgstr "صفحة مفردة"
 
+#. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:22
+#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr "كل الصفحات من  _المغذّي"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:24
+#: data/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "أو_قف المسح"
 
-#: ../data/simple-scan.ui.h:25
+#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
 msgid "Text"
 msgstr "نص"
 
-#: ../data/simple-scan.ui.h:26
+#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
 msgid "Photo"
 msgstr "صورة"
 
 #. Menu item to reorder pages
-#. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1183 ../src/ui.vala:1841
+#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr ""
 
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: data/simple-scan.ui:367
 msgid "_Email"
 msgstr "_بريد إلكتروني"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: data/simple-scan.ui:430
 msgid "_Page"
 msgstr "_صفحة"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: data/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "أدر  ي_سارًا"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: data/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "أدر ي_مينًا"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: data/simple-scan.ui:460
 msgid "_Crop"
 msgstr "ا_قتصاص"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: data/simple-scan.ui:470
 msgid "_None"
 msgstr "لا _شيء"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: data/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: data/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: data/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: data/simple-scan.ui:514
 msgid "_Letter"
 msgstr "_خطاب"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: data/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "_قانوني"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: data/simple-scan.ui:536
 msgid "4×6"
 msgstr ""
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: data/simple-scan.ui:547
 msgid "_Custom"
 msgstr "_مخصص"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: data/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr "أ_در الاقتصاص"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: data/simple-scan.ui:578
 msgid "Move Left"
 msgstr "تحرك لليسار"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: data/simple-scan.ui:587
 msgid "Move Right"
 msgstr "تحرك لليمين"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: data/simple-scan.ui:624
 msgid "_Help"
 msgstr "_مساعدة"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: data/simple-scan.ui:632
 msgid "_Contents"
 msgstr "ال_محتويات"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: data/simple-scan.ui:674 data/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "ابدأ مستندا جديدا"
 
-#: ../data/simple-scan.ui.h:67
+#: data/simple-scan.ui:675
 msgid "New"
 msgstr "جديد"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: data/simple-scan.ui:689 data/simple-scan.ui:836
 msgid "Scan a single page from the scanner"
 msgstr "امسح صفحة مفردة من الماسحة"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: data/simple-scan.ui:691 data/simple-scan.ui:837
 msgid "Scan"
 msgstr "امسح"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: data/simple-scan.ui:707 data/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "احفظ المستند في ملف"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1842
+#: data/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "احفظ"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: data/simple-scan.ui:724 data/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "أوقف المسح الحالي"
 
-#: ../data/simple-scan.ui.h:77
+#: data/simple-scan.ui:725 data/simple-scan.ui:825
 msgid "Stop"
 msgstr "أوقف"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: data/simple-scan.ui:749 data/simple-scan.ui:936
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "أدر الصفحة لليسار (عكس عقارب الساعة)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: data/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "أدر يسارا"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: data/simple-scan.ui:764 data/simple-scan.ui:914
 msgid "Rotate the page to the right (clockwise)"
 msgstr "أدر الصفحة لليمين (مع عقارب الساعة)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: data/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "أدر يمينا"
 
-#: ../data/simple-scan.ui.h:86
+#: data/simple-scan.ui:779 data/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "اقتص الصفحة المحددة"
 
-#: ../data/simple-scan.ui.h:87
+#: data/simple-scan.ui:781
 msgid "Crop"
 msgstr "اقتصاص"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1849
+#: data/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "التفضيلات"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: data/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "م_صدر المسح:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: data/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "ميز ال_نص"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: data/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "ميز ال_صورة:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: data/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "جهة المسح:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: data/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "حجم الصفحة:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: data/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: data/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: data/simple-scan.ui:1260
 msgid "Quality:"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:2
+#: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:3
+#: data/simple-scan.desktop.in:5
 msgid "Scan Documents"
 msgstr "امسح المستندات"
 
-#: ../data/simple-scan.desktop.in.h:4
+#: data/simple-scan.desktop.in:6
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Device to scan from"
-msgstr "الجهاز الذي سيمسح منه"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "SANE device to acquire images from."
-msgstr "جهاز SANE  للحصول على الصور منه."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "Type of document being scanned"
-msgstr "نوع المستند الذي يجري مسحه"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
-msgid ""
-"Type of document being scanned. This setting decides on the scan resolution, "
-"colors and post-processing."
-msgstr ""
-"نوع المستند الممسوح. هذا الإعداد يتقرر على أساس ميز المسح، والألوان، ومرحلة "
-"ما بعد المعاجلة."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
-msgid "Width of paper in tenths of a mm"
-msgstr "عرض الورقة بأعشار الملم"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr "عرض الورقة بأعشار الملم (أو 0 لاكتشاف الورقة آليا)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
-msgid "Height of paper in tenths of a mm"
-msgstr "ارتفاع الورقة بأعشار الملم"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr "ارتفاع الورقة بأعشار الملم (أو 0 لاكتشاف الورقة آليا)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "Brightness of scan"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "The brightness adjustment from -100 to 100 (0 being none)."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid "Contrast of scan"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "The contrast adjustment from -100 to 100 (0 being none)."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid "Resolution for text scans"
-msgstr "ميز مسح النصوص"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
-msgid "The resolution in dots-per-inch to use when scanning text."
-msgstr "الميز بالنقطة في البوصة الذي سيستخدم عند مسح النصوص."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
-msgid "Resolution for photo scans"
-msgstr "ميز مسح الصور"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr "الميز بالنقطة في البوصة الذي سيستخدم عند مسح الصور."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
-msgid "Page side to scan"
-msgstr "الجهة التي ستُمسح"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
-msgid "The page side to scan."
-msgstr "جهة الصفحة التي ستُمسح."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
-msgid "Directory to save files to"
-msgstr "دليل حفظ الملفات"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
-msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
-msgstr "الدليل الذي ستحفظ به الملفات. يستخدم دليل المستندات إذا لم يحدد هنا."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
-msgid "Quality value to use for JPEG compression"
+#: data/simple-scan.desktop.in:8
+msgid "scanner"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Quality value to use for JPEG compression."
-msgstr ""
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+#: data/simple-scan.appdata.xml.in:8
 msgid ""
 "A really easy way to scan both documents and photos. You can crop out the "
 "bad parts of a photo and rotate it if it is the wrong way round. You can "
@@ -409,196 +317,162 @@ msgid ""
 "formats."
 msgstr ""
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+#: data/simple-scan.appdata.xml.in:13
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr "لا توجد أي ماسحات. من فضلك وصّل ماسحة."
 
-#. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "تعذّر الاتصال بالماسحة"
 
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "تعذّر بدء المسح"
 
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1236 src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr "خطأ في التواصل مع الماسحة"
 
-#. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "اعرض رقم الإصدارة"
 
-#. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr "اطبع رسائل التنقيح"
 
-#: ../src/simple-scan.vala:26
+#: src/simple-scan.vala:26
 msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr "أصلح ملفات PDF المولدة باستخدام إصدارات قديمة من الماسحة الضوئية"
 
-#. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:391
+#: src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "فشل المسح"
 
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[جهاز...] - أداة مسح ضوئي"
 
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr "نفّذ '%s --help' لعرض القائمة الكاملة لخيارات سطر الأوامر المُتاحة."
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:318 src/ui.vala:1602 src/ui.vala:1887
 msgid "_Close"
 msgstr ""
 
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:327
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "اسم مستخدم وكلمة سر مطلوبين للنفاذ إلى '%s'"
 
-#. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:375
 msgid "No scanners detected"
 msgstr "لم يُعثر على أي ماسحة"
 
-#. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:377
 msgid "Please check your scanner is connected and powered on"
 msgstr "يرجى التحقق من أنّ الماسحة متصلة وتعمل"
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:382
 msgid "Additional software needed"
 msgstr ""
 
-#. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr ""
 
-#. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:506 src/ui.vala:1843
 msgid "Save As..."
 msgstr "احفظ كـ..."
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:509 src/ui.vala:675
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:510 src/ui.vala:676
 msgid "_Save"
 msgstr ""
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "مستند ممسوح.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:521
 msgid "Image Files"
 msgstr "ملفات الصور"
 
-#. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:527
 msgid "All Files"
 msgstr "كل الملفات"
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF‏ (مستند متعدد الصفحات)"
 
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "‏JPEG (مضغوط)"
 
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "‏PNG (غير فقود)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:557
 msgid "File format:"
 msgstr ""
 
-#. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:650
 msgid "Failed to save file"
 msgstr "فشل حفظ الملف"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:673
 msgid "If you don't save, changes will be permanently lost."
 msgstr "ستضيع جميع التغييرات للأبد إذا لم تحفظ."
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:708
+#: src/ui.vala:708
 msgid "Save current document?"
 msgstr "أأحفظ المستند الحالي؟"
 
-#. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:710
 msgid "Discard Changes"
 msgstr "ارفض التغيرات"
 
-#. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "تعذّر حفظ الصورة للمعاينة"
 
-#. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "تعذر فتح معاين الصور"
 
-#. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1206
 msgid "Combine sides"
 msgstr ""
 
-#. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr ""
 
-#. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1226
 msgid "Reverse"
 msgstr ""
 
-#. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr ""
 
-#. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "تعذّر فتح ملف المساعدة"
 
-#. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1472
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -624,17 +498,15 @@ msgstr ""
 "من المفترض أنك تلقيت نسخة من رخصة جنو العمومية مع هذا البرنامج.\n"
 "إذا لم يحدث هذا فانظر <http://www.gnu.org/licenses/>."
 
-#. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "عن \"الماسحة الضوئية\""
 
-#. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "أداة بسيطة لمسح المستندات"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -650,190 +522,167 @@ msgstr ""
 "  hitham https://launchpad.net/~hitham-mil\n"
 "  rashed alhazimi https://launchpad.net/~linex"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "هل ترغب بحفظ المستند قبل الخروج؟"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "أُخرج دون حفظ"
 
-#. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
-#. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1581
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
 msgstr ""
 
-#. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
-#. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1587
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
 msgstr ""
 
-#. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr ""
 
-#. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
-#. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1598
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
 msgstr ""
 
-#. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1602
 msgid "Install drivers"
 msgstr ""
 
-#. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
-#. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr ""
 
-#. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr ""
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr ""
 
-#. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1676
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr ""
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d نقطة\\بوصة (مبدئي)"
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d نقطة\\بوصة (مسودة)"
 
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d نقطة\\بوصة (دقة عالية)"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/ui.vala:1793
 #, c-format
 msgid "%d dpi"
 msgstr "%d نقطة\\بوصة"
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1835
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1840
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1844
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1845
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1853
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1854
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1855
 msgid "Quit"
 msgstr ""
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "غيّر _الماسحة"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr ""
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1897
 msgid "Automatic"
 msgstr "آلي"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1947
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1949
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:1957
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:1959
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:1967
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:1969
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2008
 msgid "Saving document..."
 msgstr "يحفظ المستند..."
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "يحفظ الصفحة %d من أصل %d"
@@ -853,6 +702,12 @@ msgstr "يحفظ الصفحة %d من أصل %d"
 #~ msgid "TRUE if the application window is maximized"
 #~ msgstr "صحيح إن كانت نافذة البرنامج مكبرة"
 
+#~ msgid "Device to scan from"
+#~ msgstr "الجهاز الذي سيمسح منه"
+
+#~ msgid "SANE device to acquire images from."
+#~ msgstr "جهاز SANE  للحصول على الصور منه."
+
 #~ msgid "Direction of scan"
 #~ msgstr "اتجاه المسح"
 
@@ -863,6 +718,9 @@ msgstr "يحفظ الصفحة %d من أصل %d"
 #~ "اتجاه الماسحة  عبر الصفحة الممسوحة . يمكن أن يكون: 'top-to-bottom' 'bottom-"
 #~ "to-top' 'left-to-right' 'right-to-left'"
 
+#~ msgid "Type of document being scanned"
+#~ msgstr "نوع المستند الذي يجري مسحه"
+
 #~ msgid ""
 #~ "Type of document being scanned. 'text' for text documents, 'photo' for "
 #~ "photos. This setting decides on the scan resolution, colors and post-"
@@ -893,17 +751,65 @@ msgstr "يحفظ الصفحة %d من أصل %d"
 #~ msgid "Please check your installation"
 #~ msgstr "من فضلك تحقق من تثبيتك"
 
+#~ msgid "Resolution for text scans"
+#~ msgstr "ميز مسح النصوص"
+
+#~ msgid "Resolution for photo scans"
+#~ msgstr "ميز مسح الصور"
+
 #~ msgid "The resolution in dots-per-inch of the previously scanned image."
 #~ msgstr "الميز بالنقطة في البوصة للصورة الممسوحة سابقا."
 
+#~ msgid "The resolution in dots-per-inch to use when scanning text."
+#~ msgstr "الميز بالنقطة في البوصة الذي سيستخدم عند مسح النصوص."
+
+#~ msgid "The resolution in dots-per-inch to use when scanning photos."
+#~ msgstr "الميز بالنقطة في البوصة الذي سيستخدم عند مسح الصور."
+
+#~ msgid "Directory to save files to"
+#~ msgstr "دليل حفظ الملفات"
+
+#~ msgid ""
+#~ "The directory to save files to. Defaults to the documents directory if unset."
+#~ msgstr "الدليل الذي ستحفظ به الملفات. يستخدم دليل المستندات إذا لم يحدد هنا."
+
 #~ msgid "Scanned Document"
 #~ msgstr "مستند ممسوح"
 
 #~ msgid "Select File _Type"
 #~ msgstr "اختر _نوع الملف"
 
+#~ msgid ""
+#~ "Type of document being scanned. This setting decides on the scan resolution, "
+#~ "colors and post-processing."
+#~ msgstr ""
+#~ "نوع المستند الممسوح. هذا الإعداد يتقرر على أساس ميز المسح، والألوان، ومرحلة "
+#~ "ما بعد المعاجلة."
+
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "اتجاه الماسحة خلال الصفحة الممسوحة."
 
+#~ msgid ""
+#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr "عرض الورقة بأعشار الملم (أو 0 لاكتشاف الورقة آليا)."
+
+#~ msgid ""
+#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr "ارتفاع الورقة بأعشار الملم (أو 0 لاكتشاف الورقة آليا)."
+
+#~ msgid "Height of paper in tenths of a mm"
+#~ msgstr "ارتفاع الورقة بأعشار الملم"
+
+#~ msgid "Width of paper in tenths of a mm"
+#~ msgstr "عرض الورقة بأعشار الملم"
+
 #~ msgid "Resolution of last scanned image"
 #~ msgstr "ميز آخر صورة ممسوحة"
+
+#~ msgid "The page side to scan."
+#~ msgstr "جهة الصفحة التي ستُمسح."
+
+#~ msgid "Page side to scan"
+#~ msgstr "الجهة التي ستُمسح"
diff --git a/po/ast.gmo b/po/ast.gmo
new file mode 100644
index 0000000..679e9e8
--- /dev/null
+++ b/po/ast.gmo
diff --git a/po/ast.po b/po/ast.po
index d54362d..9771a1b 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -7,401 +7,309 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-06 14:16+1200\n"
+"POT-Creation-Date: 2016-07-29 12:47+1200\n"
 "PO-Revision-Date: 2012-07-23 08:57+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Asturian <ast@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-04-14 05:39+0000\n"
-"X-Generator: Launchpad (build 17990)\n"
+"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 
 #. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:2
+#: data/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_Autorizar"
 
 #. Label beside username entry
-#: ../data/simple-scan.ui.h:4
+#: data/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "_Nome d'usuariu pal recursu:"
 
 #. Label beside password entry
-#: ../data/simple-scan.ui.h:6
+#: data/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Contraseña"
 
 #. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:8
+#: data/simple-scan.ui:188
 msgid "Front and Back"
 msgstr ""
 
 #. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:10
+#: data/simple-scan.ui:192
 msgid "Front"
 msgstr ""
 
 #. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:12
+#: data/simple-scan.ui:196
 msgid "Back"
 msgstr ""
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
-#: ../data/appdata/simple-scan.appdata.xml.in.h:1
+#: data/simple-scan.ui:225 data/simple-scan.ui:809
+#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr "Simple Scan"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:16
+#: data/simple-scan.ui:241
 msgid "_Document"
 msgstr "_Documentu"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:18
+#: data/simple-scan.ui:260
 msgid "Sc_an"
 msgstr ""
 
+#. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:20
+#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
 msgid "Single _Page"
 msgstr "U_na páxina"
 
+#. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:22
+#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr "Tol_es páxines dende l'alimentador"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:24
+#: data/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:25
+#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
 msgid "Text"
 msgstr "Testu"
 
-#: ../data/simple-scan.ui.h:26
+#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
 msgid "Photo"
 msgstr "Semeya"
 
 #. Menu item to reorder pages
-#. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1183 ../src/ui.vala:1841
+#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr "Reordenar les páxines"
 
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: data/simple-scan.ui:367
 msgid "_Email"
 msgstr ""
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: data/simple-scan.ui:430
 msgid "_Page"
 msgstr "_Páxina"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: data/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "Voltiar a la e_squierda"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: data/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "Voltiar a la _Drecha"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: data/simple-scan.ui:460
 msgid "_Crop"
 msgstr "_Recortar"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: data/simple-scan.ui:470
 msgid "_None"
 msgstr "_Dengún"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: data/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: data/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: data/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: data/simple-scan.ui:514
 msgid "_Letter"
 msgstr "_Carta"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: data/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "Lle_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: data/simple-scan.ui:536
 msgid "4×6"
 msgstr "4 × 6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: data/simple-scan.ui:547
 msgid "_Custom"
 msgstr "_Personalizáu"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: data/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr "_Voltiar recorte"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: data/simple-scan.ui:578
 msgid "Move Left"
 msgstr ""
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: data/simple-scan.ui:587
 msgid "Move Right"
 msgstr ""
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: data/simple-scan.ui:624
 msgid "_Help"
 msgstr "_Ayuda"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: data/simple-scan.ui:632
 msgid "_Contents"
 msgstr ""
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: data/simple-scan.ui:674 data/simple-scan.ui:885
 msgid "Start a new document"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:67
+#: data/simple-scan.ui:675
 msgid "New"
 msgstr ""
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: data/simple-scan.ui:689 data/simple-scan.ui:836
 msgid "Scan a single page from the scanner"
 msgstr ""
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: data/simple-scan.ui:691 data/simple-scan.ui:837
 msgid "Scan"
 msgstr ""
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: data/simple-scan.ui:707 data/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1842
+#: data/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr ""
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: data/simple-scan.ui:724 data/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:77
+#: data/simple-scan.ui:725 data/simple-scan.ui:825
 msgid "Stop"
 msgstr ""
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: data/simple-scan.ui:749 data/simple-scan.ui:936
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr ""
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: data/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr ""
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: data/simple-scan.ui:764 data/simple-scan.ui:914
 msgid "Rotate the page to the right (clockwise)"
 msgstr ""
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: data/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:86
+#: data/simple-scan.ui:779 data/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:87
+#: data/simple-scan.ui:781
 msgid "Crop"
 msgstr ""
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1849
+#: data/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "Preferencies"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: data/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "Escan_ear:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: data/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: data/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr ""
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: data/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr ""
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: data/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr ""
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: data/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "Brillu:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: data/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "Contraste:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: data/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "Calidá:"
 
-#: ../data/simple-scan.desktop.in.h:2
+#: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr "Escáner de documentos"
 
-#: ../data/simple-scan.desktop.in.h:3
+#: data/simple-scan.desktop.in:5
 msgid "Scan Documents"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:4
+#: data/simple-scan.desktop.in:6
 msgid "scan;scanner;flatbed;adf;"
 msgstr "escanear;escáner;planu;adf;"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Device to scan from"
+#: data/simple-scan.desktop.in:8
+msgid "scanner"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "SANE device to acquire images from."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "Type of document being scanned"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
-msgid ""
-"Type of document being scanned. This setting decides on the scan resolution, "
-"colors and post-processing."
-msgstr ""
-"Triba de documentu escaneándose. Esta configuración afita la resolución "
-"d'escanéu, colores y post-procesamientu."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
-msgid "Width of paper in tenths of a mm"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
-msgid "Height of paper in tenths of a mm"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "Brightness of scan"
-msgstr "Brillu d'escanéu"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "The brightness adjustment from -100 to 100 (0 being none)."
-msgstr "Axuste del brillu dende -100 a 100 (siendo 0 ensin axuste)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid "Contrast of scan"
-msgstr "Contraste del escanéu"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "The contrast adjustment from -100 to 100 (0 being none)."
-msgstr "Axuste de contraste dende -100 a 100 (siendo 0 ensin axuste)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid "Resolution for text scans"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
-msgid "The resolution in dots-per-inch to use when scanning text."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
-msgid "Resolution for photo scans"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
-msgid "Page side to scan"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
-msgid "The page side to scan."
-msgstr "El llau de la páxina a escanear."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
-msgid "Directory to save files to"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
-msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
-msgid "Quality value to use for JPEG compression"
-msgstr "Calidá de la compresión de JPEG"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Quality value to use for JPEG compression."
-msgstr "Calidá de la compresión de JPEG."
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+#: data/simple-scan.appdata.xml.in:8
 msgid ""
 "A really easy way to scan both documents and photos. You can crop out the "
 "bad parts of a photo and rotate it if it is the wrong way round. You can "
@@ -409,198 +317,164 @@ msgid ""
 "formats."
 msgstr ""
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+#: data/simple-scan.appdata.xml.in:13
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr ""
 
-#. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "Nun puede coneutase col escáner"
 
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "Nun puede anicase l'escáner"
 
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1236 src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr "Fallu de comunicación col escáner"
 
-#. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "Amosar versión"
 
-#. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr "Amosar mensaxes de depuración"
 
-#: ../src/simple-scan.vala:26
+#: src/simple-scan.vala:26
 msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr "Iguar ficheros PDF con versiones anteriores de Simple Scan"
 
-#. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:391
+#: src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Falló al escanerr"
 
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[PRESÉU...] - Utilidá d'escanéu"
 
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Executa '%s --help' pa ver una llista completa de les opciones disponibles "
 "na llinia de comandos."
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:318 src/ui.vala:1602 src/ui.vala:1887
 msgid "_Close"
 msgstr "_Zarrar"
 
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:327
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Requierse nome d'usuariu y contraseña p'acceder a '%s'"
 
-#. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:375
 msgid "No scanners detected"
 msgstr "Nun se deteutó dengún escáner"
 
-#. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:377
 msgid "Please check your scanner is connected and powered on"
 msgstr "Por favor comprueba que l'escáner ta coneutáu y activáu"
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:382
 msgid "Additional software needed"
 msgstr ""
 
-#. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr ""
 
-#. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:506 src/ui.vala:1843
 msgid "Save As..."
 msgstr "Guardar como..."
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:509 src/ui.vala:675
 msgid "_Cancel"
 msgstr "_Encaboxar"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:510 src/ui.vala:676
 msgid "_Save"
 msgstr "_Guardar"
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "Documentu Escaneáu.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:521
 msgid "Image Files"
 msgstr ""
 
-#. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:527
 msgid "All Files"
 msgstr ""
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr ""
 
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr ""
 
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr ""
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:557
 msgid "File format:"
 msgstr ""
 
-#. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:650
 msgid "Failed to save file"
 msgstr "Falló al guardar el ficheru"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:673
 msgid "If you don't save, changes will be permanently lost."
 msgstr ""
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:708
+#: src/ui.vala:708
 msgid "Save current document?"
 msgstr ""
 
-#. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:710
 msgid "Discard Changes"
 msgstr ""
 
-#. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "Nun pudo guardase la imaxe de previsualización"
 
-#. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr ""
 
-#. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1206
 msgid "Combine sides"
 msgstr "Combinar llaos"
 
-#. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr "Combinar llaos (inversu)"
 
-#. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1226
 msgid "Reverse"
 msgstr "Inversu"
 
-#. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr "Caltener ensin cambeos"
 
-#. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr ""
 
-#. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1472
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -628,17 +502,15 @@ msgstr ""
 "You should have received a copy of the GNU General Public License\n"
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 
-#. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "Tocante a Simple Scan"
 
-#. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "Una cenciella ferramienta pa escanear documentos"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -647,190 +519,167 @@ msgstr ""
 "  Xuacu Saturio https://launchpad.net/~xuacusk8\n"
 "  ivarela https://launchpad.net/~ivarela"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr ""
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr ""
 
-#. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
-#. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1581
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
 msgstr ""
 
-#. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
-#. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1587
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
 msgstr ""
 
-#. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr ""
 
-#. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
-#. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1598
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
 msgstr ""
 
-#. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1602
 msgid "Install drivers"
 msgstr ""
 
-#. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
-#. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr ""
 
-#. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr ""
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr ""
 
-#. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1676
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr ""
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/ui.vala:1793
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1835
 msgid "New Document"
 msgstr "Documentu nuevu"
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1840
 msgid "Document"
 msgstr "Documentu"
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1844
 msgid "Email..."
 msgstr "Corréu-e..."
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1845
 msgid "Print..."
 msgstr "Imprentar..."
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1853
 msgid "Help"
 msgstr "Ayuda"
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1854
 msgid "About"
 msgstr "Tocante a"
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1855
 msgid "Quit"
 msgstr "Quitar"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr ""
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr ""
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1897
 msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1947
 msgid "Darker"
 msgstr "Más escuru"
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1949
 msgid "Lighter"
 msgstr "Más claru"
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:1957
 msgid "Less"
 msgstr "Menos"
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:1959
 msgid "More"
 msgstr "Más"
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:1967
 msgid "Minimum"
 msgstr "Mínimu"
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:1969
 msgid "Maximum"
 msgstr "Máximu"
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2008
 msgid "Saving document..."
 msgstr "Guardando documentu..."
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Guardando la páxina %d de %d"
@@ -875,5 +724,33 @@ msgstr "Guardando la páxina %d de %d"
 #~ msgid "Files missing"
 #~ msgstr "Ficheros non alcontraos"
 
+#~ msgid "The page side to scan."
+#~ msgstr "El llau de la páxina a escanear."
+
+#~ msgid ""
+#~ "Type of document being scanned. This setting decides on the scan resolution, "
+#~ "colors and post-processing."
+#~ msgstr ""
+#~ "Triba de documentu escaneándose. Esta configuración afita la resolución "
+#~ "d'escanéu, colores y post-procesamientu."
+
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "La direición del escáner a traviés de la páxina escaneada."
+
+#~ msgid "Quality value to use for JPEG compression."
+#~ msgstr "Calidá de la compresión de JPEG."
+
+#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
+#~ msgstr "Axuste de contraste dende -100 a 100 (siendo 0 ensin axuste)."
+
+#~ msgid "Contrast of scan"
+#~ msgstr "Contraste del escanéu"
+
+#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
+#~ msgstr "Axuste del brillu dende -100 a 100 (siendo 0 ensin axuste)."
+
+#~ msgid "Brightness of scan"
+#~ msgstr "Brillu d'escanéu"
+
+#~ msgid "Quality value to use for JPEG compression"
+#~ msgstr "Calidá de la compresión de JPEG"
diff --git a/po/az.gmo b/po/az.gmo
new file mode 100644
index 0000000..5dd7126
--- /dev/null
+++ b/po/az.gmo
diff --git a/po/az.po b/po/az.po
index fb334d9..dd920c7 100644
--- a/po/az.po
+++ b/po/az.po
@@ -7,399 +7,309 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-06 14:16+1200\n"
+"POT-Creation-Date: 2016-07-29 12:47+1200\n"
 "PO-Revision-Date: 2015-01-01 15:02+0000\n"
 "Last-Translator: Nicat Məmmədov <n1c4t97@gmail.com>\n"
 "Language-Team: Azerbaijani <az@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-04-14 05:39+0000\n"
-"X-Generator: Launchpad (build 17990)\n"
+"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 
 #. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:2
+#: data/simple-scan.ui:24
 msgid "_Authorize"
 msgstr ""
 
 #. Label beside username entry
-#: ../data/simple-scan.ui.h:4
+#: data/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr ""
 
 #. Label beside password entry
-#: ../data/simple-scan.ui.h:6
+#: data/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Şifrə:"
 
 #. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:8
+#: data/simple-scan.ui:188
 msgid "Front and Back"
 msgstr "Hər iki üz"
 
 #. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:10
+#: data/simple-scan.ui:192
 msgid "Front"
 msgstr "Ön"
 
 #. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:12
+#: data/simple-scan.ui:196
 msgid "Back"
 msgstr "Arxa"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
-#: ../data/appdata/simple-scan.appdata.xml.in.h:1
+#: data/simple-scan.ui:225 data/simple-scan.ui:809
+#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr ""
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:16
+#: data/simple-scan.ui:241
 msgid "_Document"
 msgstr "_Sәnәd"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:18
+#: data/simple-scan.ui:260
 msgid "Sc_an"
 msgstr ""
 
+#. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:20
+#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
 msgid "Single _Page"
 msgstr ""
 
+#. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:22
+#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr "_AvtoYükləmədəki bütün səhifələr"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:24
+#: data/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:25
+#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
 msgid "Text"
 msgstr "Mətn"
 
-#: ../data/simple-scan.ui.h:26
+#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
 msgid "Photo"
 msgstr ""
 
 #. Menu item to reorder pages
-#. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1183 ../src/ui.vala:1841
+#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr ""
 
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: data/simple-scan.ui:367
 msgid "_Email"
 msgstr "_Epoçt"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: data/simple-scan.ui:430
 msgid "_Page"
 msgstr "_Səhifə"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: data/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr ""
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: data/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr ""
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: data/simple-scan.ui:460
 msgid "_Crop"
 msgstr ""
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: data/simple-scan.ui:470
 msgid "_None"
 msgstr ""
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: data/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: data/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: data/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: data/simple-scan.ui:514
 msgid "_Letter"
 msgstr ""
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: data/simple-scan.ui:525
 msgid "Le_gal"
 msgstr ""
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: data/simple-scan.ui:536
 msgid "4×6"
 msgstr ""
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: data/simple-scan.ui:547
 msgid "_Custom"
 msgstr ""
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: data/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr ""
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: data/simple-scan.ui:578
 msgid "Move Left"
 msgstr ""
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: data/simple-scan.ui:587
 msgid "Move Right"
 msgstr ""
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: data/simple-scan.ui:624
 msgid "_Help"
 msgstr ""
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: data/simple-scan.ui:632
 msgid "_Contents"
 msgstr ""
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: data/simple-scan.ui:674 data/simple-scan.ui:885
 msgid "Start a new document"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:67
+#: data/simple-scan.ui:675
 msgid "New"
 msgstr ""
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: data/simple-scan.ui:689 data/simple-scan.ui:836
 msgid "Scan a single page from the scanner"
 msgstr ""
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: data/simple-scan.ui:691 data/simple-scan.ui:837
 msgid "Scan"
 msgstr ""
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: data/simple-scan.ui:707 data/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1842
+#: data/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr ""
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: data/simple-scan.ui:724 data/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:77
+#: data/simple-scan.ui:725 data/simple-scan.ui:825
 msgid "Stop"
 msgstr ""
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: data/simple-scan.ui:749 data/simple-scan.ui:936
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr ""
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: data/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr ""
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: data/simple-scan.ui:764 data/simple-scan.ui:914
 msgid "Rotate the page to the right (clockwise)"
 msgstr ""
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: data/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:86
+#: data/simple-scan.ui:779 data/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "Seçilmiş səhifəni kəs"
 
-#: ../data/simple-scan.ui.h:87
+#: data/simple-scan.ui:781
 msgid "Crop"
 msgstr "Kəs"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1849
+#: data/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: data/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: data/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: data/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr ""
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: data/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr ""
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: data/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr ""
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: data/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: data/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: data/simple-scan.ui:1260
 msgid "Quality:"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:2
+#: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:3
+#: data/simple-scan.desktop.in:5
 msgid "Scan Documents"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:4
+#: data/simple-scan.desktop.in:6
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Device to scan from"
+#: data/simple-scan.desktop.in:8
+msgid "scanner"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "SANE device to acquire images from."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "Type of document being scanned"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
-msgid ""
-"Type of document being scanned. This setting decides on the scan resolution, "
-"colors and post-processing."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
-msgid "Width of paper in tenths of a mm"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
-msgid "Height of paper in tenths of a mm"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "Brightness of scan"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "The brightness adjustment from -100 to 100 (0 being none)."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid "Contrast of scan"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "The contrast adjustment from -100 to 100 (0 being none)."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid "Resolution for text scans"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
-msgid "The resolution in dots-per-inch to use when scanning text."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
-msgid "Resolution for photo scans"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
-msgid "Page side to scan"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
-msgid "The page side to scan."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
-msgid "Directory to save files to"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
-msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
-msgid "Quality value to use for JPEG compression"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Quality value to use for JPEG compression."
-msgstr ""
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+#: data/simple-scan.appdata.xml.in:8
 msgid ""
 "A really easy way to scan both documents and photos. You can crop out the "
 "bad parts of a photo and rotate it if it is the wrong way round. You can "
@@ -407,196 +317,162 @@ msgid ""
 "formats."
 msgstr ""
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+#: data/simple-scan.appdata.xml.in:13
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr ""
 
-#. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr ""
 
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr ""
 
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1236 src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr ""
 
-#. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr ""
 
-#. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr ""
 
-#: ../src/simple-scan.vala:26
+#: src/simple-scan.vala:26
 msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr ""
 
-#. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:391
+#: src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr ""
 
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:318 src/ui.vala:1602 src/ui.vala:1887
 msgid "_Close"
 msgstr ""
 
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:327
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr ""
 
-#. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:375
 msgid "No scanners detected"
 msgstr ""
 
-#. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:377
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:382
 msgid "Additional software needed"
 msgstr ""
 
-#. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr ""
 
-#. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:506 src/ui.vala:1843
 msgid "Save As..."
 msgstr ""
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:509 src/ui.vala:675
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:510 src/ui.vala:676
 msgid "_Save"
 msgstr ""
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr ""
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:521
 msgid "Image Files"
 msgstr ""
 
-#. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:527
 msgid "All Files"
 msgstr ""
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr ""
 
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr ""
 
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr ""
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:557
 msgid "File format:"
 msgstr ""
 
-#. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:650
 msgid "Failed to save file"
 msgstr ""
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:673
 msgid "If you don't save, changes will be permanently lost."
 msgstr ""
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:708
+#: src/ui.vala:708
 msgid "Save current document?"
 msgstr ""
 
-#. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:710
 msgid "Discard Changes"
 msgstr ""
 
-#. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr ""
 
-#. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr ""
 
-#. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1206
 msgid "Combine sides"
 msgstr ""
 
-#. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr ""
 
-#. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1226
 msgid "Reverse"
 msgstr ""
 
-#. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr ""
 
-#. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr ""
 
-#. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1472
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -612,207 +488,182 @@ msgid ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
 
-#. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr ""
 
-#. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Emin Mastizada https://launchpad.net/~emin25\n"
 "  Nicat Məmmədov https://launchpad.net/~nicat455"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr ""
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr ""
 
-#. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
-#. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1581
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
 msgstr ""
 
-#. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
-#. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1587
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
 msgstr ""
 
-#. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr ""
 
-#. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
-#. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1598
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
 msgstr ""
 
-#. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1602
 msgid "Install drivers"
 msgstr ""
 
-#. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
-#. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr ""
 
-#. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr ""
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr ""
 
-#. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1676
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr ""
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/ui.vala:1793
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1835
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1840
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1844
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1845
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1853
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1854
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1855
 msgid "Quit"
 msgstr ""
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr ""
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr ""
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1897
 msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1947
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1949
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:1957
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:1959
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:1967
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:1969
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2008
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/bg.gmo b/po/bg.gmo
new file mode 100644
index 0000000..c6ead3b
--- /dev/null
+++ b/po/bg.gmo
diff --git a/po/bg.po b/po/bg.po
index 92e52b0..4549aef 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -7,405 +7,309 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-06 14:16+1200\n"
+"POT-Creation-Date: 2016-07-29 12:47+1200\n"
 "PO-Revision-Date: 2012-12-01 09:04+0000\n"
 "Last-Translator: Svetoslav Stefanov <svetlisashkov@yahoo.com>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-04-14 05:39+0000\n"
-"X-Generator: Launchpad (build 17990)\n"
+"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 
 #. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:2
+#: data/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_Идентификация"
 
 #. Label beside username entry
-#: ../data/simple-scan.ui.h:4
+#: data/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "_Потребителско име за ресурса:"
 
 #. Label beside password entry
-#: ../data/simple-scan.ui.h:6
+#: data/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Парола:"
 
 #. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:8
+#: data/simple-scan.ui:188
 msgid "Front and Back"
 msgstr "Предна и обратна страна"
 
 #. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:10
+#: data/simple-scan.ui:192
 msgid "Front"
 msgstr "Предна страна"
 
 #. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:12
+#: data/simple-scan.ui:196
 msgid "Back"
 msgstr "Обратна страна"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
-#: ../data/appdata/simple-scan.appdata.xml.in.h:1
+#: data/simple-scan.ui:225 data/simple-scan.ui:809
+#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr "Опростено сканиране"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:16
+#: data/simple-scan.ui:241
 msgid "_Document"
 msgstr "_Документ"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:18
+#: data/simple-scan.ui:260
 msgid "Sc_an"
 msgstr "Ска_ниране"
 
+#. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:20
+#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
 msgid "Single _Page"
 msgstr "Една _страница"
 
+#. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:22
+#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr "Всички страници от _подавача"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:24
+#: data/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "_Спири сканирането"
 
-#: ../data/simple-scan.ui.h:25
+#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
 msgid "Text"
 msgstr "Текст"
 
-#: ../data/simple-scan.ui.h:26
+#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
 msgid "Photo"
 msgstr "Снимка"
 
 #. Menu item to reorder pages
-#. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1183 ../src/ui.vala:1841
+#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr ""
 
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: data/simple-scan.ui:367
 msgid "_Email"
 msgstr "Изпрати по _имейл"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: data/simple-scan.ui:430
 msgid "_Page"
 msgstr "_Страница"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: data/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "Завърти _наляво"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: data/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "Завърти на_дясно"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: data/simple-scan.ui:460
 msgid "_Crop"
 msgstr "_Изрежи"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: data/simple-scan.ui:470
 msgid "_None"
 msgstr "_Нищо"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: data/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: data/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: data/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: data/simple-scan.ui:514
 msgid "_Letter"
 msgstr "US _Letter"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: data/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "US Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: data/simple-scan.ui:536
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: data/simple-scan.ui:547
 msgid "_Custom"
 msgstr "_Персонализирано"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: data/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr "_Завърти изрязаното"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: data/simple-scan.ui:578
 msgid "Move Left"
 msgstr "Премести наляво"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: data/simple-scan.ui:587
 msgid "Move Right"
 msgstr "Премести надясно"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: data/simple-scan.ui:624
 msgid "_Help"
 msgstr "_Помощ"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: data/simple-scan.ui:632
 msgid "_Contents"
 msgstr "_Съдържание"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: data/simple-scan.ui:674 data/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "Създай нов документ"
 
-#: ../data/simple-scan.ui.h:67
+#: data/simple-scan.ui:675
 msgid "New"
 msgstr "Нов"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: data/simple-scan.ui:689 data/simple-scan.ui:836
 msgid "Scan a single page from the scanner"
 msgstr "Сканиране на една страница със скенера"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: data/simple-scan.ui:691 data/simple-scan.ui:837
 msgid "Scan"
 msgstr "Сканирай"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: data/simple-scan.ui:707 data/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "Съхрани документа като файл"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1842
+#: data/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "Съхрани"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: data/simple-scan.ui:724 data/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "Спри текущото сканиране"
 
-#: ../data/simple-scan.ui.h:77
+#: data/simple-scan.ui:725 data/simple-scan.ui:825
 msgid "Stop"
 msgstr "Спри"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: data/simple-scan.ui:749 data/simple-scan.ui:936
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Завърти страницата на ляво (обратно на часовниковата стрелка)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: data/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "Завърти наляво"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: data/simple-scan.ui:764 data/simple-scan.ui:914
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Завърти страницата на дясно (по часовниковата стрелка)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: data/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "Завърти надясно"
 
-#: ../data/simple-scan.ui.h:86
+#: data/simple-scan.ui:779 data/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "Изрежи избраната страница"
 
-#: ../data/simple-scan.ui.h:87
+#: data/simple-scan.ui:781
 msgid "Crop"
 msgstr "Изрежи"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1849
+#: data/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "Настройки"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: data/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "Изт_очник на сканиране:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: data/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "_Резолюция на текста:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: data/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "_Резолюция на снимката:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: data/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "Избор на страна за сканиране:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: data/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "Размер на листа:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: data/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "Яркост:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: data/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "Контраст:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: data/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "Качество:"
 
-#: ../data/simple-scan.desktop.in.h:2
+#: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:3
+#: data/simple-scan.desktop.in:5
 msgid "Scan Documents"
 msgstr "Сканиране на документи"
 
-#: ../data/simple-scan.desktop.in.h:4
+#: data/simple-scan.desktop.in:6
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Device to scan from"
-msgstr "Устройство за сканиране"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "SANE device to acquire images from."
-msgstr "SANE устройство за получаване на изображения."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "Type of document being scanned"
-msgstr "Вид на сканираният документ"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
-msgid ""
-"Type of document being scanned. This setting decides on the scan resolution, "
-"colors and post-processing."
+#: data/simple-scan.desktop.in:8
+msgid "scanner"
 msgstr ""
-"Видът на сканирания документ. Тази настройка регулира резолюцията, "
-"дълбочината на цветовете, както и пост-обработката."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
-msgid "Width of paper in tenths of a mm"
-msgstr "Ширина на хартията в десетки милиметри"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-"Широчина на листа в десетки милиметри (избери 0 за автоматично разпознаване)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
-msgid "Height of paper in tenths of a mm"
-msgstr "Височина на хартията в десетки милиметри"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-"Височина на хартията в десетки милиметри (или 0 за автоматично разпознаване)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "Brightness of scan"
-msgstr "Яркост на изображението"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "The brightness adjustment from -100 to 100 (0 being none)."
-msgstr "Настройката на яркостта от -100 до 100 (0 — не се променя)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid "Contrast of scan"
-msgstr "Контраст на изображението"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "The contrast adjustment from -100 to 100 (0 being none)."
-msgstr "Настройката на контраста от -100 до 100 (0 — не се променя)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid "Resolution for text scans"
-msgstr "Резолюция на текстовите сканирания"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
-msgid "The resolution in dots-per-inch to use when scanning text."
-msgstr "Резолюция в точки-за-инч при сканиране на текст."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
-msgid "Resolution for photo scans"
-msgstr "Резолюция за сканиране на фотографиите"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr "Резолюция в точки-за-инч при сканиране на снимки."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
-msgid "Page side to scan"
-msgstr "Страна на листа за сканиране"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
-msgid "The page side to scan."
-msgstr "От коя страна на страницата да се сканира."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
-msgid "Directory to save files to"
-msgstr "Папка за съхраняване на файловете"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
-msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
-msgstr ""
-"Папка за съхраняване на файловете. По подразбиране се използва папката с "
-"документи."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
-msgid "Quality value to use for JPEG compression"
-msgstr "Стойността на качеството, за използваната JPEG компресия"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Quality value to use for JPEG compression."
-msgstr "Стойността на качеството, за използваната JPEG компресия."
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+#: data/simple-scan.appdata.xml.in:8
 msgid ""
 "A really easy way to scan both documents and photos. You can crop out the "
 "bad parts of a photo and rotate it if it is the wrong way round. You can "
@@ -413,197 +317,163 @@ msgid ""
 "formats."
 msgstr ""
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+#: data/simple-scan.appdata.xml.in:13
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Няма налични скенери. Моля свържете скенер."
 
-#. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "Не може да се осъществи връзка със скенера"
 
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "Сканирането не може да бъде стартирано"
 
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1236 src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr "Грешка при комуникацията със скенера"
 
-#. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "Покажи версията"
 
-#. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr "Показвай съобщения за изчистване на грешки"
 
-#: ../src/simple-scan.vala:26
+#: src/simple-scan.vala:26
 msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr "Поправи PDF файловете, създадени с по-стари версии на Simple Scan"
 
-#. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:391
+#: src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Неусшно сканиране"
 
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DEVICE...] - Инструмент за сканиране"
 
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Изпълнете „%s --help“, за да видите списъка с всички опции на командния ред."
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:318 src/ui.vala:1602 src/ui.vala:1887
 msgid "_Close"
 msgstr "_Затвори"
 
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:327
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Необходими са потребителско име и парола за достъп до '%s'"
 
-#. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:375
 msgid "No scanners detected"
 msgstr "Не са открити скенери"
 
-#. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:377
 msgid "Please check your scanner is connected and powered on"
 msgstr "Моля проверете дали скенерът ви е свързан и включен"
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:382
 msgid "Additional software needed"
 msgstr ""
 
-#. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr ""
 
-#. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:506 src/ui.vala:1843
 msgid "Save As..."
 msgstr "Съхрани като..."
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:509 src/ui.vala:675
 msgid "_Cancel"
 msgstr "_Отмени"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:510 src/ui.vala:676
 msgid "_Save"
 msgstr "_Съхрани"
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "Сканиран документ.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:521
 msgid "Image Files"
 msgstr "Файлове с изображения"
 
-#. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:527
 msgid "All Files"
 msgstr "Всички файлове"
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (документ с много страници)"
 
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (компресирани)"
 
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (без загуби на качеството)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:557
 msgid "File format:"
 msgstr ""
 
-#. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:650
 msgid "Failed to save file"
 msgstr "Неусшно съхраняване на файла"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:673
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Ако не запазите, промените ще бъдат изгубени."
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:708
+#: src/ui.vala:708
 msgid "Save current document?"
 msgstr "Да съхраним ли текущия документ?"
 
-#. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:710
 msgid "Discard Changes"
 msgstr "Откажи промените"
 
-#. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "Изображението не може да бъде запазено за предварителен преглед"
 
-#. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "Невъзможно е отварянето на приложение за преглед на изображението"
 
-#. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1206
 msgid "Combine sides"
 msgstr ""
 
-#. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr ""
 
-#. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1226
 msgid "Reverse"
 msgstr ""
 
-#. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr ""
 
-#. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "Помощния файл не може да бъде отворен"
 
-#. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1472
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -633,213 +503,187 @@ msgstr ""
 "заедно с тази програма. Ако това не е така, вижте "
 "<http://www.gnu.org/licenses/>."
 
-#. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "За програмата"
 
-#. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "Инструмент за опростено сканиране на документи"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Atanas Kovachki https://launchpad.net/~zdar\n"
 "  Boyan Sotirov https://launchpad.net/~lz1dsb\n"
 "  Krasimir Chonov https://launchpad.net/~kchonov\n"
-"  Miroslav E. Hadzhiev (Хаджиев) https://launchpad.net/~xtigyro\n"
 "  Svetoslav Stefanov https://launchpad.net/~svetlisashkov\n"
 "  Tora Shiro https://launchpad.net/~tora-shiro\n"
 "  i.raynov https://launchpad.net/~ivaylo-raynov\n"
 "  Филип Андонов https://launchpad.net/~vonodna"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "Да съхраня ли документа, преди да затворите програмата?"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "Излез без запазване"
 
-#. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
-#. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1581
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
 msgstr ""
 
-#. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
-#. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1587
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
 msgstr ""
 
-#. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr ""
 
-#. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
-#. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1598
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
 msgstr ""
 
-#. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1602
 msgid "Install drivers"
 msgstr ""
 
-#. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
-#. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr ""
 
-#. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr ""
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr ""
 
-#. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1676
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr ""
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (по подразбиране)"
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (чернова)"
 
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (висока разделителна способност)"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/ui.vala:1793
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1835
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1840
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1844
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1845
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1853
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1854
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1855
 msgid "Quit"
 msgstr ""
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "Смени _скенера"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr ""
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1897
 msgid "Automatic"
 msgstr "Автоматично"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1947
 msgid "Darker"
 msgstr "Тъмно"
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1949
 msgid "Lighter"
 msgstr "Светло"
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:1957
 msgid "Less"
 msgstr "Малко"
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:1959
 msgid "More"
 msgstr "Много"
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:1967
 msgid "Minimum"
 msgstr "Минимално"
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:1969
 msgid "Maximum"
 msgstr "Максимално"
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2008
 msgid "Saving document..."
 msgstr "Съхраняване на документа..."
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Съхраняване на страница %d от %d"
@@ -858,9 +702,15 @@ msgstr "Съхраняване на страница %d от %d"
 #~ "Употреба:\n"
 #~ "  %s [УСТРОЙСТВО...] - Инструмент за сканиране"
 
+#~ msgid "Height of paper in tenths of a mm"
+#~ msgstr "Височина на хартията в десетки милиметри"
+
 #~ msgid "Direction of scan"
 #~ msgstr "Посока на сканиране"
 
+#~ msgid "Page side to scan"
+#~ msgstr "Страна на листа за сканиране"
+
 #~ msgid ""
 #~ "The direction of the scanner across the scanned page. It can be one of the "
 #~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
@@ -878,6 +728,18 @@ msgstr "Съхраняване на страница %d от %d"
 #~ "\"предна\" \"обратна\""
 
 #~ msgid ""
+#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr ""
+#~ "Широчина на листа в десетки милиметри (избери 0 за автоматично разпознаване)."
+
+#~ msgid ""
+#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr ""
+#~ "Височина на хартията в десетки милиметри (или 0 за автоматично разпознаване)."
+
+#~ msgid ""
 #~ "Type of document being scanned. 'text' for text documents, 'photo' for "
 #~ "photos. This setting decides on the scan resolution, colors and post-"
 #~ "processing."
@@ -886,6 +748,9 @@ msgstr "Съхраняване на страница %d от %d"
 #~ "за снимки. Тези настройки определят разделителната способност на "
 #~ "сканирането, цветовете и последващата обработка."
 
+#~ msgid "Width of paper in tenths of a mm"
+#~ msgstr "Ширина на хартията в десетки милиметри"
+
 #~ msgid "Window width in pixels"
 #~ msgstr "Ширина на прозореца в пиксели"
 
@@ -940,9 +805,43 @@ msgstr "Съхраняване на страница %d от %d"
 #~ msgid "TRUE if the application window is maximized"
 #~ msgstr "TRUE ако прозореца на приложението е максимизиран."
 
+#~ msgid "The page side to scan."
+#~ msgstr "От коя страна на страницата да се сканира."
+
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "Посоката на сканиране на страницата."
 
+#~ msgid "Quality value to use for JPEG compression."
+#~ msgstr "Стойността на качеството, за използваната JPEG компресия."
+
+#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
+#~ msgstr "Настройката на контраста от -100 до 100 (0 — не се променя)."
+
+#~ msgid "Contrast of scan"
+#~ msgstr "Контраст на изображението"
+
+#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
+#~ msgstr "Настройката на яркостта от -100 до 100 (0 — не се променя)."
+
+#~ msgid "Brightness of scan"
+#~ msgstr "Яркост на изображението"
+
+#~ msgid "Quality value to use for JPEG compression"
+#~ msgstr "Стойността на качеството, за използваната JPEG компресия"
+
+#~ msgid "Device to scan from"
+#~ msgstr "Устройство за сканиране"
+
+#~ msgid ""
+#~ "Type of document being scanned. This setting decides on the scan resolution, "
+#~ "colors and post-processing."
+#~ msgstr ""
+#~ "Видът на сканирания документ. Тази настройка регулира резолюцията, "
+#~ "дълбочината на цветовете, както и пост-обработката."
+
+#~ msgid "Type of document being scanned"
+#~ msgstr "Вид на сканираният документ"
+
 #~ msgid ""
 #~ "The width of scanned image in pixels. This value is updated to what the last "
 #~ "scanned page was."
@@ -957,11 +856,35 @@ msgstr "Съхраняване на страница %d от %d"
 #~ "Височина на сканираните изображения в пиксели. Тази стойност се обновява при "
 #~ "всяко ново сканиране."
 
+#~ msgid "SANE device to acquire images from."
+#~ msgstr "SANE устройство за получаване на изображения."
+
+#~ msgid "Resolution for text scans"
+#~ msgstr "Резолюция на текстовите сканирания"
+
 #~ msgid "The resolution in dots-per-inch of the previously scanned image."
 #~ msgstr "Резолюция в точки-за-инч от предишното сканирано изображение."
 
 #~ msgid "Resolution of last scanned image"
 #~ msgstr "Резолюция на последното сканирано изображение"
 
+#~ msgid "Resolution for photo scans"
+#~ msgstr "Резолюция за сканиране на фотографиите"
+
+#~ msgid "The resolution in dots-per-inch to use when scanning text."
+#~ msgstr "Резолюция в точки-за-инч при сканиране на текст."
+
+#~ msgid "The resolution in dots-per-inch to use when scanning photos."
+#~ msgstr "Резолюция в точки-за-инч при сканиране на снимки."
+
+#~ msgid ""
+#~ "The directory to save files to. Defaults to the documents directory if unset."
+#~ msgstr ""
+#~ "Папка за съхраняване на файловете. По подразбиране се използва папката с "
+#~ "документи."
+
+#~ msgid "Directory to save files to"
+#~ msgstr "Папка за съхраняване на файловете"
+
 #~ msgid "Please check your installation"
 #~ msgstr "Моля, проверете дали правилно сте инсталирали програмата"
diff --git a/po/bo.gmo b/po/bo.gmo
new file mode 100644
index 0000000..ea48783
--- /dev/null
+++ b/po/bo.gmo
diff --git a/po/bo.po b/po/bo.po
index 08f2fdc..9c353c2 100644
--- a/po/bo.po
+++ b/po/bo.po
@@ -7,401 +7,309 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-06 14:16+1200\n"
+"POT-Creation-Date: 2016-07-29 12:47+1200\n"
 "PO-Revision-Date: 2012-04-17 06:12+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Tibetan <bo@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-04-14 05:40+0000\n"
-"X-Generator: Launchpad (build 17990)\n"
+"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 
 #. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:2
+#: data/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "ཐོབ་ཐང་སྟེར_A"
 
 #. Label beside username entry
-#: ../data/simple-scan.ui.h:4
+#: data/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "གཏེར་མཛོད་སྤྱོད་མཁན་གྱི་མིང་_U:"
 
 #. Label beside password entry
-#: ../data/simple-scan.ui.h:6
+#: data/simple-scan.ui:117
 msgid "_Password:"
 msgstr "གསང་གྲངས_P:"
 
 #. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:8
+#: data/simple-scan.ui:188
 msgid "Front and Back"
 msgstr "རྒྱབ་ཕྱོགས་དང་མདུན་ཕྱོགས"
 
 #. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:10
+#: data/simple-scan.ui:192
 msgid "Front"
 msgstr "མདུན་ཕྱོགས"
 
 #. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:12
+#: data/simple-scan.ui:196
 msgid "Back"
 msgstr "རྒྱབ་ཕྱོགས"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
-#: ../data/appdata/simple-scan.appdata.xml.in.h:1
+#: data/simple-scan.ui:225 data/simple-scan.ui:809
+#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr "པར་བཤུ་དཀྱུས་མ"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:16
+#: data/simple-scan.ui:241
 msgid "_Document"
 msgstr "ཡི་གེ_D"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:18
+#: data/simple-scan.ui:260
 msgid "Sc_an"
 msgstr "པར་བཤུ_a"
 
+#. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:20
+#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
 msgid "Single _Page"
 msgstr "ཤོག་བུ་རྐང་ཅིག _P"
 
+#. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:22
+#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr "སྤྲོད་མཁན་ནས་བྱུང་བའི་ཤོག་ལེབ་ཡོངས་རྫོགས _F"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:24
+#: data/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "པར་ལེན་མཚམས་བཞག_S"
 
-#: ../data/simple-scan.ui.h:25
+#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
 msgid "Text"
 msgstr "ཡི་གེ"
 
-#: ../data/simple-scan.ui.h:26
+#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
 msgid "Photo"
 msgstr "པར"
 
 #. Menu item to reorder pages
-#. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1183 ../src/ui.vala:1841
+#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr ""
 
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: data/simple-scan.ui:367
 msgid "_Email"
 msgstr "གློག་འཕྲིན_E"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: data/simple-scan.ui:430
 msgid "_Page"
 msgstr "ཤོག་ལེབ_P"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: data/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "གཡོན་སྐོར _L"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: data/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "གཡས་སྐོར་ _R"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: data/simple-scan.ui:460
 msgid "_Crop"
 msgstr "གཅོད_C"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: data/simple-scan.ui:470
 msgid "_None"
 msgstr "ཅི་མེད་པ_N"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: data/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: data/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: data/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: data/simple-scan.ui:514
 msgid "_Letter"
 msgstr "འཕྲིན་ཡིག_L"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: data/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "ཁྲིམས་མཐུན_g"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: data/simple-scan.ui:536
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: data/simple-scan.ui:547
 msgid "_Custom"
 msgstr "སྲོལ་རྒྱུན_C"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: data/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr "དྲས་གཅོད་སྐོར་བ_R"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: data/simple-scan.ui:578
 msgid "Move Left"
 msgstr "གཡོན་ལ་སྤོར"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: data/simple-scan.ui:587
 msgid "Move Right"
 msgstr "གཡས་ལ་སྤོར"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: data/simple-scan.ui:624
 msgid "_Help"
 msgstr "རོགས་རམ_H"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: data/simple-scan.ui:632
 msgid "_Contents"
 msgstr "ནང་གསེས_C"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: data/simple-scan.ui:674 data/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "ཡིག་གེ་གསར་འཛུགས"
 
-#: ../data/simple-scan.ui.h:67
+#: data/simple-scan.ui:675
 msgid "New"
 msgstr "གསར་པ"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: data/simple-scan.ui:689 data/simple-scan.ui:836
 msgid "Scan a single page from the scanner"
 msgstr "པར་བཤུ་ཆས་ནས་བྱུང་བའི་ཤོག་བུ་རྐང་ཅིག་དེ་པར་བཤུ"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: data/simple-scan.ui:691 data/simple-scan.ui:837
 msgid "Scan"
 msgstr "པར་བཤུ"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: data/simple-scan.ui:707 data/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "ཡི་གེ་ཡིག་ཆའི་ནང་གསོག་ཉར"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1842
+#: data/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "གསོག་ཉར"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: data/simple-scan.ui:724 data/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "པར་བཤུ་བྱེད་བཞིན་པ་དེ་མཚམས་བཞག"
 
-#: ../data/simple-scan.ui.h:77
+#: data/simple-scan.ui:725 data/simple-scan.ui:825
 msgid "Stop"
 msgstr "མཚམས་བཞག"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: data/simple-scan.ui:749 data/simple-scan.ui:936
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "ཤོག་ལེབ་གཡོན་སྐོར་རྒྱག་པ"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: data/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "གཡོན་སྐོར"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: data/simple-scan.ui:764 data/simple-scan.ui:914
 msgid "Rotate the page to the right (clockwise)"
 msgstr "ཤོག་ལེབ་གཡས་སྐོར་རྒྱག་པ"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: data/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "གཡས་སྐོར"
 
-#: ../data/simple-scan.ui.h:86
+#: data/simple-scan.ui:779 data/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "བདམས་ཟིན་པའི་ཤོག་ལེབ་གཅད་བཟོ"
 
-#: ../data/simple-scan.ui.h:87
+#: data/simple-scan.ui:781
 msgid "Crop"
 msgstr "གཅད"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1849
+#: data/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "རང་མོས་སྒྲིག་བཟོ"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: data/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "པར་བཤུ་གཏེར་མཛོད_o:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: data/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "ཡི་གེའི་སྤུས་ཚད_T"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: data/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "པར་གྱི་སྤྭུས་ཚད"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: data/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "ཟུར་པར་བཤུ"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: data/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "ཤོག་ལེབ་ཞེང་ཚད"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: data/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "དཀར་ཚད:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: data/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: data/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "སྤུས་ཚད:"
 
-#: ../data/simple-scan.desktop.in.h:2
+#: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:3
+#: data/simple-scan.desktop.in:5
 msgid "Scan Documents"
 msgstr "ཡིག་གེ་པར་བཤུ"
 
-#: ../data/simple-scan.desktop.in.h:4
+#: data/simple-scan.desktop.in:6
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Device to scan from"
-msgstr "འབྱུང་ཁུངས་མི་འདྲ་བའི་པར་བཤུ་སྒྲིག་ཆས"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "SANE device to acquire images from."
-msgstr "པར་རིས་འདོནསའི་SANE་སྒྲིག་ཆས་"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "Type of document being scanned"
-msgstr "པར་བཤུ་ཡིག་ཆའི་རིགས"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
-msgid ""
-"Type of document being scanned. This setting decides on the scan resolution, "
-"colors and post-processing."
+#: data/simple-scan.desktop.in:8
+msgid "scanner"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
-msgid "Width of paper in tenths of a mm"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
-msgid "Height of paper in tenths of a mm"
-msgstr "ཤོག་ལེབ་ཀྱི་མཐོ་ཚད་བཅུ་ཆའི་རྨིད་སྟོང་ཆ་ཚོད་"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "Brightness of scan"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "The brightness adjustment from -100 to 100 (0 being none)."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid "Contrast of scan"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "The contrast adjustment from -100 to 100 (0 being none)."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid "Resolution for text scans"
-msgstr "ཡི་གེའི་པར་བཤུའི་སྤུས་ཚད"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
-msgid "The resolution in dots-per-inch to use when scanning text."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
-msgid "Resolution for photo scans"
-msgstr "པར་བཤུའི་སྤུས་ཚད"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
-msgid "Page side to scan"
-msgstr "པར་བཤུ་དགོས་པའི་ཤོག་ཟུར"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
-msgid "The page side to scan."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
-msgid "Directory to save files to"
-msgstr "ཡིག་ཆ་གསོག་སྣོད"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
-msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
-msgstr ""
-"ཡིག་ཆ་གསོག་སའི་གནས། "
-"གལ་སྲིད་རང་མོས་སྒྲིག་འཛུགས་མེད་ན་སྔོན་འཛུགས་འཇུག་སྣོད་བེད་སྤྱོད"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
-msgid "Quality value to use for JPEG compression"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Quality value to use for JPEG compression."
-msgstr ""
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+#: data/simple-scan.appdata.xml.in:8
 msgid ""
 "A really easy way to scan both documents and photos. You can crop out the "
 "bad parts of a photo and rotate it if it is the wrong way round. You can "
@@ -409,196 +317,162 @@ msgid ""
 "formats."
 msgstr ""
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+#: data/simple-scan.appdata.xml.in:13
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr "པར་བཤུ་ཆས་བསྒྲིགས་མི་འདུག པར་བཤུ་ཆས་ཞིག་སྒྲིགས་རོགས"
 
-#. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "པར་བཤུ་ཆས་དང་སྦྲེལ་མ་ཐུབ"
 
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "པར་བཤུ་འགོ་འཛུགས་མ་ཐུབ"
 
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1236 src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr "པར་བཤུ་ཆས་དང་འབྲེལ་གཏུགས་མ་ཐུབ་པའི་ནོར་འཁྲུལ"
 
-#. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr ""
 
-#. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr ""
 
-#: ../src/simple-scan.vala:26
+#: src/simple-scan.vala:26
 msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr ""
 
-#. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:391
+#: src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "པར་བཤུ་བྱེད་མ་ཐུབ་པ"
 
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:318 src/ui.vala:1602 src/ui.vala:1887
 msgid "_Close"
 msgstr ""
 
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:327
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "'%s'མཁོ་སྤྱོད་བྱེད་པར་སྤྱོད་མཁན་མིང་དང་གསང་གྲངས་དགོས་པ"
 
-#. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:375
 msgid "No scanners detected"
 msgstr "པར་བཤུ་ཆས་རྙེད་མ་བྱུང་"
 
-#. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:377
 msgid "Please check your scanner is connected and powered on"
 msgstr "ཁྱོད་ཀྱི་པར་བཤུ་ཆས་སྦྲེལ་ཡོད་པ་དང་གློག་བཏང་ཡོད་པར་དག་བཤེར་བྱེད་རོགས"
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:382
 msgid "Additional software needed"
 msgstr ""
 
-#. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr ""
 
-#. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:506 src/ui.vala:1843
 msgid "Save As..."
 msgstr "ཉར་སྟངས་་་"
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:509 src/ui.vala:675
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:510 src/ui.vala:676
 msgid "_Save"
 msgstr ""
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "པར་བཤུས་ཡིག་ཆ.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:521
 msgid "Image Files"
 msgstr "གཟུགས་བརྙན་ཡིག་ཆ"
 
-#. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:527
 msgid "All Files"
 msgstr "ཡིག་ཆ་ཡོངས་རྫོགས"
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF(ཤོག་ལེབ་མང་པོའི་ཡིག་ཆ)"
 
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (བསྡུ་འཇུག)"
 
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (བོར་བརླག་མ་ཤོར་བ)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:557
 msgid "File format:"
 msgstr ""
 
-#. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:650
 msgid "Failed to save file"
 msgstr "ཡིག་ཆ་གསོག་འཇོག་བྱེད་མ་ཐུབ"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:673
 msgid "If you don't save, changes will be permanently lost."
 msgstr "ཁྱོད་ཀྱིས་གསོག་འཇོག་མ་བྱས་ན་བཟོ་བཅོས་རྣམས་ནམ་ཡང་བརླགས་འགྲོ་ངེས"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:708
+#: src/ui.vala:708
 msgid "Save current document?"
 msgstr "དང་ཐོག་གི་ཡིག་ཆ་ཉར་ཚགས"
 
-#. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:710
 msgid "Discard Changes"
 msgstr "བཟོ་བཅོས་རྣམས་འདོར་བ"
 
-#. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr ""
 
-#. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "སྔོན་ལྟ་ཉེར་སྤྱོད་ཁ་ཕྱེ་མ་ཐུབ་པ"
 
-#. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1206
 msgid "Combine sides"
 msgstr ""
 
-#. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr ""
 
-#. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1226
 msgid "Reverse"
 msgstr ""
 
-#. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr ""
 
-#. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "རོགས་འདེགས་ཡིག་ཆ་ཁ་ཕྱེ་མ་ཐུབ"
 
-#. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1472
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -626,207 +500,182 @@ msgstr ""
 "You should have received a copy of the GNU General Public License\n"
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 
-#. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "པར་བཤུ་བ་དཀྱུས་མའི་སྐོར"
 
-#. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "ཡིག་ཆ་པར་བཤུ་ཆས་དཀྱུས་མ"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Rockworld https://launchpad.net/~rockrock2222222\n"
 "  Tennom https://launchpad.net/~tennomyathog"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "ཕྱིར་འཐེན་མ་བྱས་གོང་གསོག་འཇོག་བྱེད་པ"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "གསོག་འཇོག་མ་བྱས་པར་ཕྱིར་འཐེན"
 
-#. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
-#. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1581
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
 msgstr ""
 
-#. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
-#. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1587
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
 msgstr ""
 
-#. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr ""
 
-#. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
-#. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1598
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
 msgstr ""
 
-#. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1602
 msgid "Install drivers"
 msgstr ""
 
-#. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
-#. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr ""
 
-#. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr ""
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr ""
 
-#. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1676
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr ""
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (སྔོན་འཛུགས)"
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (ཟིན་བྲིས)"
 
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (སྤུས་ཚད་མཐོན་པོ)"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/ui.vala:1793
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1835
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1840
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1844
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1845
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1853
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1854
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1855
 msgid "Quit"
 msgstr ""
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "པར་བཤུ་ཆས་བརྗེ་བ_S"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr ""
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1897
 msgid "Automatic"
 msgstr "ར་ང་འགུལ་ངང"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1947
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1949
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:1957
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:1959
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:1967
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:1969
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2008
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
@@ -834,15 +683,36 @@ msgstr ""
 #~ msgid "4&#xD7;6"
 #~ msgstr "4&#xD7;6"
 
+#~ msgid "Device to scan from"
+#~ msgstr "འབྱུང་ཁུངས་མི་འདྲ་བའི་པར་བཤུ་སྒྲིག་ཆས"
+
 #~ msgid "Direction of scan"
 #~ msgstr "པར་བཤུ་ཁ་ཕྱོགས"
 
+#~ msgid "Directory to save files to"
+#~ msgstr "ཡིག་ཆ་གསོག་སྣོད"
+
+#~ msgid "Height of paper in tenths of a mm"
+#~ msgstr "ཤོག་ལེབ་ཀྱི་མཐོ་ཚད་བཅུ་ཆའི་རྨིད་སྟོང་ཆ་ཚོད་"
+
 #~ msgid "Height of scanned image in pixels"
 #~ msgstr "པར་བཤུ་བྱས་ཟིན་པའི་གཟུགས་བརྙན་མཐོ་ཚད་ཀྱི་ཚོན་གྲངས"
 
+#~ msgid "Page side to scan"
+#~ msgstr "པར་བཤུ་དགོས་པའི་ཤོག་ཟུར"
+
+#~ msgid "Resolution for photo scans"
+#~ msgstr "པར་བཤུའི་སྤུས་ཚད"
+
+#~ msgid "Resolution for text scans"
+#~ msgstr "ཡི་གེའི་པར་བཤུའི་སྤུས་ཚད"
+
 #~ msgid "Resolution of last scanned image"
 #~ msgstr "ཐེངས་རྗེས་མར་པར་བཤུའི་གཟུགས་བརྙན་གྱི་སྤུས་ཚད"
 
+#~ msgid "SANE device to acquire images from."
+#~ msgstr "པར་རིས་འདོནསའི་SANE་སྒྲིག་ཆས་"
+
 #~ msgid "TRUE if the application window is maximized"
 #~ msgstr "གལ་སྲིད་ཉེར་སྤྱོད་སྒེའུ་ཁུང་རྒྱ་བསྐྱེད་ཚར་ན་TRUEའམ་་བདེན་པར་འཛུགས"
 
@@ -854,6 +724,12 @@ msgstr ""
 #~ "'གོང་ནས་འོག' 'འོག་ནས་གོང' 'གཡོན་ནས་གཡས' 'གཡས་ནས་གཡོན'"
 
 #~ msgid ""
+#~ "The directory to save files to. Defaults to the documents directory if unset."
+#~ msgstr ""
+#~ "ཡིག་ཆ་གསོག་སའི་གནས། "
+#~ "གལ་སྲིད་རང་མོས་སྒྲིག་འཛུགས་མེད་ན་སྔོན་འཛུགས་འཇུག་སྣོད་བེད་སྤྱོད"
+
+#~ msgid ""
 #~ "The height of scanned image in pixels. This value is updated to what the "
 #~ "last scanned page was."
 #~ msgstr ""
@@ -867,6 +743,9 @@ msgstr ""
 #~ "The width of scanned image in pixels. This value is updated to what the last "
 #~ "scanned page was."
 
+#~ msgid "Type of document being scanned"
+#~ msgstr "པར་བཤུ་ཡིག་ཆའི་རིགས"
+
 #~ msgid ""
 #~ "Type of document being scanned. 'text' for text documents, 'photo' for "
 #~ "photos. This setting decides on the scan resolution, colors and post-"
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/ca.gmo b/po/ca.gmo
new file mode 100644
index 0000000..aea0692
--- /dev/null
+++ b/po/ca.gmo
diff --git a/po/ca.po b/po/ca.po
index 5bae924..6e72abc 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,607 +7,481 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-06 14:16+1200\n"
-"PO-Revision-Date: 2012-07-23 08:57+0000\n"
+"POT-Creation-Date: 2016-07-29 12:47+1200\n"
+"PO-Revision-Date: 2016-06-07 16:16+0000\n"
 "Last-Translator: David Planella <david.planella@ubuntu.com>\n"
 "Language-Team: Catalan <ca@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-04-14 05:39+0000\n"
-"X-Generator: Launchpad (build 17990)\n"
+"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 
 #. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:2
+#: data/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_Autoritza"
 
 #. Label beside username entry
-#: ../data/simple-scan.ui.h:4
+#: data/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "_Nom d'usuari del recurs:"
 
 #. Label beside password entry
-#: ../data/simple-scan.ui.h:6
+#: data/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Contrasenya:"
 
 #. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:8
+#: data/simple-scan.ui:188
 msgid "Front and Back"
 msgstr "Ambdues cares"
 
 #. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:10
+#: data/simple-scan.ui:192
 msgid "Front"
 msgstr "Anvers de la pàgina"
 
 #. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:12
+#: data/simple-scan.ui:196
 msgid "Back"
 msgstr "Revers de la pàgina"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
-#: ../data/appdata/simple-scan.appdata.xml.in.h:1
+#: data/simple-scan.ui:225 data/simple-scan.ui:809
+#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr "Escaneig senzill"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:16
+#: data/simple-scan.ui:241
 msgid "_Document"
 msgstr "_Document"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:18
+#: data/simple-scan.ui:260
 msgid "Sc_an"
 msgstr "Esc_aneja"
 
+#. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:20
+#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
 msgid "Single _Page"
 msgstr "Pàgina _individual"
 
+#. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:22
+#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr "Totes les pàgines de l'a_limentador"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:24
+#: data/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "_Atura l'escaneig"
 
-#: ../data/simple-scan.ui.h:25
+#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
 msgid "Text"
 msgstr "Text"
 
-#: ../data/simple-scan.ui.h:26
+#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
 msgid "Photo"
 msgstr "Foto"
 
 #. Menu item to reorder pages
-#. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1183 ../src/ui.vala:1841
+#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr "Reordena les pàgines"
 
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: data/simple-scan.ui:367
 msgid "_Email"
 msgstr "_Envia per correu"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: data/simple-scan.ui:430
 msgid "_Page"
 msgstr "_Pàgina"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: data/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "Gira a l'_esquerra"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: data/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "Gira a la _dreta"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: data/simple-scan.ui:460
 msgid "_Crop"
 msgstr "_Escapçament"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: data/simple-scan.ui:470
 msgid "_None"
 msgstr "_Cap"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: data/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: data/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: data/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: data/simple-scan.ui:514
 msgid "_Letter"
 msgstr "_Carta EUA"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: data/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "Le_gal EUA"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: data/simple-scan.ui:536
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: data/simple-scan.ui:547
 msgid "_Custom"
 msgstr "_Personalitzat"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: data/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr "_Gira l'escapçament"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: data/simple-scan.ui:578
 msgid "Move Left"
-msgstr ""
+msgstr "Mou a l'esquerra"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: data/simple-scan.ui:587
 msgid "Move Right"
-msgstr ""
+msgstr "Mou a la dreta"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: data/simple-scan.ui:624
 msgid "_Help"
 msgstr "A_juda"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: data/simple-scan.ui:632
 msgid "_Contents"
 msgstr "C_ontingut"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: data/simple-scan.ui:674 data/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "Comença un document nou"
 
-#: ../data/simple-scan.ui.h:67
+#: data/simple-scan.ui:675
 msgid "New"
 msgstr "Nou"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: data/simple-scan.ui:689 data/simple-scan.ui:836
 msgid "Scan a single page from the scanner"
 msgstr "Escaneja una sola pàgina de l'escàner"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: data/simple-scan.ui:691 data/simple-scan.ui:837
 msgid "Scan"
 msgstr "Escaneja"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: data/simple-scan.ui:707 data/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "Desa el document en un fitxer"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1842
+#: data/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "Desa"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: data/simple-scan.ui:724 data/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "Atura l'escaneig actual"
 
-#: ../data/simple-scan.ui.h:77
+#: data/simple-scan.ui:725 data/simple-scan.ui:825
 msgid "Stop"
 msgstr "Atura"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: data/simple-scan.ui:749 data/simple-scan.ui:936
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Gireu la pàgina cap a l'esquerra (en sentit antihorari)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: data/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "Gira a l'esquerra"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: data/simple-scan.ui:764 data/simple-scan.ui:914
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Gireu la pàgina cap a la dreta (en sentit horari)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: data/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "Gira a la dreta"
 
-#: ../data/simple-scan.ui.h:86
+#: data/simple-scan.ui:779 data/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "Escapça la pàgina seleccionada"
 
-#: ../data/simple-scan.ui.h:87
+#: data/simple-scan.ui:781
 msgid "Crop"
 msgstr "Escapça"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1849
+#: data/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "Preferències"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: data/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "Font d'_escaneig:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: data/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "_Resolució de text:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: data/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "_Resolució fotogràfica:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: data/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "Cara a escanejar:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: data/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "Mida de la pàgina:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: data/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "Brillantor:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: data/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "Contrast:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: data/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "Qualitat:"
 
-#: ../data/simple-scan.desktop.in.h:2
+#: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
-msgstr ""
+msgstr "Escanejador de documents"
 
-#: ../data/simple-scan.desktop.in.h:3
+#: data/simple-scan.desktop.in:5
 msgid "Scan Documents"
 msgstr "Escanegeu documents"
 
-#: ../data/simple-scan.desktop.in.h:4
+#: data/simple-scan.desktop.in:6
 msgid "scan;scanner;flatbed;adf;"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Device to scan from"
-msgstr "Dispositiu d'escaneig"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "SANE device to acquire images from."
-msgstr "Dispositiu SANE per a l'adquisició d'imatges."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "Type of document being scanned"
-msgstr "Tipus de document a escanejar"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
-msgid ""
-"Type of document being scanned. This setting decides on the scan resolution, "
-"colors and post-processing."
-msgstr ""
-"El tipus de document que s'està escanejant. Aquest paràmetre decideix la "
-"resolució d'escaneig, els colors i el processament posterior."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
-msgid "Width of paper in tenths of a mm"
-msgstr "Amplada del paper en dècimes de mm"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-"L'amplada del paper en dècimes de mm (o 0 per la detecció automàtica del "
-"paper)"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
-msgid "Height of paper in tenths of a mm"
-msgstr "Alçada del paper en dècimes parts d'un mm"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-"L'alçada del paper en dècimes de mm (o 0 per la detecció automàtica del "
-"paper)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "Brightness of scan"
-msgstr "Brillantor de l'escaneig"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "The brightness adjustment from -100 to 100 (0 being none)."
-msgstr "L'ajustament de la brillantor, de -100 a 100 (on 0 significa cap)"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid "Contrast of scan"
-msgstr "Contrast de l'escaneig"
+msgstr "escanejar;escàner;pla;adf;"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "The contrast adjustment from -100 to 100 (0 being none)."
-msgstr "L'ajustament del contrast, de -100 a 100 (on 0 significa cap)"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid "Resolution for text scans"
-msgstr "Resolució per l'escaneig de text"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
-msgid "The resolution in dots-per-inch to use when scanning text."
-msgstr "La resolució en punts per polzada quan s'escanegi text."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
-msgid "Resolution for photo scans"
-msgstr "Resolució per l'escaneig de fotos"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr "La resolució en punts per polzada quan s'escanegin fotos."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
-msgid "Page side to scan"
-msgstr "Cara de la pàgina a escanejar"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
-msgid "The page side to scan."
-msgstr "La cara de la pàgina a escanejar."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
-msgid "Directory to save files to"
-msgstr "Directori on desar els fitxers"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
-msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
+#: data/simple-scan.desktop.in:8
+msgid "scanner"
 msgstr ""
-"El directori on desar els fitxers. Per defecte serà el directori de "
-"documents si no es defineix."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
-msgid "Quality value to use for JPEG compression"
-msgstr "Valor de la qualitat a utilitzar per la compressió JPEG"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Quality value to use for JPEG compression."
-msgstr "Valor de la qualitat a utilitzar per la compressió JPEG."
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+#: data/simple-scan.appdata.xml.in:8
 msgid ""
 "A really easy way to scan both documents and photos. You can crop out the "
 "bad parts of a photo and rotate it if it is the wrong way round. You can "
 "print your scans, export them to pdf, or save them in a range of image "
 "formats."
 msgstr ""
+"Una manera realment senzilla d'escanejar tant documents com fotos. Podeu "
+"retallar les parts dolentes d'una foto o rotar-la si està en la posició "
+"incorrecta.  Podeu imprimir els vostres escanejos, exportar-los a pdf, o "
+"desar-los en diversos formats d'imatge."
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+#: data/simple-scan.appdata.xml.in:13
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
+"El Simple Scan fa servir l'entorn SANE per donar suport a la major part dels "
+"escàners existents."
 
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr "No hi ha cap escàner disponible. Si us plau, connecteu-ne un."
 
-#. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "No s'ha pogut connectar a l'escàner"
 
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "No s'ha pogut iniciar l'escaneig"
 
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1236 src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr "S'ha produït un error en comunicar-se amb l'escàner"
 
-#. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "Mostra la versió de llançament"
 
-#. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr "Mostra els missatges de depuració"
 
-#: ../src/simple-scan.vala:26
+#: src/simple-scan.vala:26
 msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr ""
 "Arregla els fitxers PDF generats amb versions anteriors de l'Escaneig senzill"
 
-#. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:391
+#: src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Ha fallat l'escaneig"
 
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DISPOSITIU...] - Utilitat d'escaneig"
 
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Executeu «%s --help» per veure la llista completa d'opcions disponibles de "
 "la línia d'ordres."
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:318 src/ui.vala:1602 src/ui.vala:1887
 msgid "_Close"
 msgstr "_Tanca"
 
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:327
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Cal un usuari i contrasenya per a accedir a «%s»"
 
-#. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:375
 msgid "No scanners detected"
 msgstr "No s'ha detectat cap escàner"
 
-#. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:377
 msgid "Please check your scanner is connected and powered on"
 msgstr "Comproveu que l'escàner està connectat i engegat"
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:382
 msgid "Additional software needed"
-msgstr ""
+msgstr "Cal un programari addicional"
 
-#. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:384
 msgid "You need to install driver software for your scanner."
-msgstr ""
+msgstr "Heu d'instal·lar un programari controlador per al vostre escàner."
 
-#. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:506 src/ui.vala:1843
 msgid "Save As..."
 msgstr "Anomena i desa..."
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:509 src/ui.vala:675
 msgid "_Cancel"
 msgstr "_Cancel·la"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:510 src/ui.vala:676
 msgid "_Save"
 msgstr "De_sa"
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "Document escanejat.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:521
 msgid "Image Files"
 msgstr "Fitxers d'imatge"
 
-#. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:527
 msgid "All Files"
 msgstr "Tots els fitxers"
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (document multipàgina)."
 
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (comprimit)"
 
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (sense pèrdua)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:557
 msgid "File format:"
-msgstr ""
+msgstr "Format del fitxer:"
 
-#. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:650
 msgid "Failed to save file"
 msgstr "No s'ha pogut desar el fitxer"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:673
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Si no ho deseu, els canvis es perdran per sempre més."
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:708
+#: src/ui.vala:708
 msgid "Save current document?"
 msgstr "Voleu desar el document actual?"
 
-#. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:710
 msgid "Discard Changes"
 msgstr "Descarta els canvis"
 
-#. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "No s'ha pogut desar la imatge per previsualitzar-la"
 
-#. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "No s'ha pogut obrir l'aplicació de previsualització d'imatges"
 
-#. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1206
 msgid "Combine sides"
-msgstr ""
+msgstr "Combina els costats"
 
-#. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1216
 msgid "Combine sides (reverse)"
-msgstr ""
+msgstr "Combina els costats (inrevès)"
 
-#. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1226
 msgid "Reverse"
-msgstr ""
+msgstr "Reverteix"
 
-#. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1236
 msgid "Keep unchanged"
-msgstr ""
+msgstr "Mantingues sense canvi"
 
-#. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "No s'ha pogut obrir el fitxer d'ajuda"
 
-#. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1472
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -638,17 +512,15 @@ msgstr ""
 "GPL)\n"
 "juntament amb aquest programa. Si no, mireu <http://www.gnu.org/licenses/>."
 
-#. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "Quant a l'escaneig senzill"
 
-#. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "Eina senzilla d'escaneig de documents"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -660,192 +532,176 @@ msgstr ""
 "  Sergi https://launchpad.net/~scaparrosj\n"
 "  Siegfried Gevatter https://launchpad.net/~rainct\n"
 "  SiscoGarcia https://launchpad.net/~sisco\n"
+"  Walter Garcia-Fontes https://launchpad.net/~walter-garcia\n"
 "  pancake https://launchpad.net/~pancake"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "Voleu desar el document abans de sortir?"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "Surt sense desar"
 
-#. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
-msgstr ""
+msgstr "Sembla que teniu un escàner Brother"
 
-#. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1581
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
 msgstr ""
+"Hi ha controladors disponibles a la <a "
+"href=\"http://support.brother.com\">pàgina web de Brother</a>."
 
-#. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
-msgstr ""
+msgstr "Sembla que teniu un escàner Samsung."
 
-#. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1587
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
 msgstr ""
+"Hi ha controladors disponibles a la <a "
+"href=\"http://samsung.com/support\">pàgina web de Samsung</a>."
 
-#. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1591
 msgid "You appear to have an HP scanner."
-msgstr ""
+msgstr "Sembla que teniu un escàner HP."
 
-#. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
-msgstr ""
+msgstr "Sembla que teniu un escàner Epson."
 
-#. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1598
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
 msgstr ""
+"Hi ha controladors disponibles a la <a "
+"href=\"http://samsung.com/support\">pàgina web d'Epson</a>."
 
-#. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1602
 msgid "Install drivers"
-msgstr ""
+msgstr "Instal·la els controladors"
 
-#. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
-msgstr ""
+msgstr "Un cop instal·lat haureu de reiniciar el Simple Scan."
 
-#. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1645
 msgid "Installing drivers..."
-msgstr ""
+msgstr "S'estan instal·lant els controladors..."
 
-#. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1653
 msgid "Drivers installed successfully!"
-msgstr ""
+msgstr "La instal·lació dels controladors ha estat reeixida!"
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
-msgstr ""
+msgstr "Ha fallat la instal·lació dels controladorse (codi d'error %d)."
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1669
 msgid "Failed to install drivers."
-msgstr ""
+msgstr "No s'han pogut instal·lar els controladors."
 
-#. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1676
 #, c-format
 msgid "You need to install the %s package(s)."
-msgstr ""
+msgstr "Heu d'instal·lar el(s) paquet(s) %s."
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d ppp (predeterminat)"
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d ppp (esborrany)"
 
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d ppp (alta resolució)"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/ui.vala:1793
 #, c-format
 msgid "%d dpi"
 msgstr "%d ppp"
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1835
 msgid "New Document"
 msgstr "Document nou"
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1840
 msgid "Document"
 msgstr "Document"
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1844
 msgid "Email..."
 msgstr "Envia per correu electrònic..."
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1845
 msgid "Print..."
 msgstr "Imprimeix..."
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1853
 msgid "Help"
 msgstr "Ajuda"
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1854
 msgid "About"
-msgstr ""
+msgstr "Quant a"
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1855
 msgid "Quit"
-msgstr ""
+msgstr "Surt"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "Canvia l'e_scàner"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1891
 msgid "_Install Drivers"
-msgstr ""
+msgstr "_Instal·la els controladors"
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1897
 msgid "Automatic"
 msgstr "Automàtic"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1947
 msgid "Darker"
 msgstr "Més fosc"
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1949
 msgid "Lighter"
 msgstr "Més clar"
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:1957
 msgid "Less"
 msgstr "Menys"
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:1959
 msgid "More"
 msgstr "Més"
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:1967
 msgid "Minimum"
 msgstr "Mínim"
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:1969
 msgid "Maximum"
 msgstr "Màxim"
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2008
 msgid "Saving document..."
 msgstr "S'està desant el document..."
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "S'està desant la pàgina %d de %d"
@@ -889,12 +745,27 @@ msgstr "S'està desant la pàgina %d de %d"
 #~ msgid "Files missing"
 #~ msgstr "Manquen fitxers"
 
+#~ msgid "Height of paper in tenths of a mm"
+#~ msgstr "Alçada del paper en dècimes parts d'un mm"
+
 #~ msgid "Height of scanned image in pixels"
 #~ msgstr "Alçada de la imatge escanejada en píxels"
 
+#~ msgid "Resolution for photo scans"
+#~ msgstr "Resolució per l'escaneig de fotos"
+
+#~ msgid "Device to scan from"
+#~ msgstr "Dispositiu d'escaneig"
+
 #~ msgid "Direction of scan"
 #~ msgstr "Direcció de l'escaneig"
 
+#~ msgid "Page side to scan"
+#~ msgstr "Cara de la pàgina a escanejar"
+
+#~ msgid "Directory to save files to"
+#~ msgstr "Directori on desar els fitxers"
+
 #~ msgid ""
 #~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
 #~ msgstr ""
@@ -902,6 +773,13 @@ msgstr "S'està desant la pàgina %d de %d"
 #~ "(ambdós), «front» (frontal) o «back» (dorsal)"
 
 #~ msgid ""
+#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr ""
+#~ "L'alçada del paper en dècimes de mm (o 0 per la detecció automàtica del "
+#~ "paper)."
+
+#~ msgid ""
 #~ "The direction of the scanner across the scanned page. It can be one of the "
 #~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
 #~ msgstr ""
@@ -920,6 +798,12 @@ msgstr "S'està desant la pàgina %d de %d"
 #~ "L'alçada de la imatge escanejada en píxels. Aquest valor s'ha actualitzat al "
 #~ "que tenia l'última pàgina escanejada."
 
+#~ msgid "SANE device to acquire images from."
+#~ msgstr "Dispositiu SANE per a l'adquisició d'imatges."
+
+#~ msgid "Resolution for text scans"
+#~ msgstr "Resolució per l'escaneig de text"
+
 #~ msgid "The resolution in dots-per-inch of the previously scanned image."
 #~ msgstr ""
 #~ "La resolució en punts per polzada de la imatge prèviament escanejada."
@@ -928,6 +812,22 @@ msgstr "S'està desant la pàgina %d de %d"
 #~ msgstr "Resolució de l'última imatge escanejada"
 
 #~ msgid ""
+#~ "The directory to save files to. Defaults to the documents directory if unset."
+#~ msgstr ""
+#~ "El directori on desar els fitxers. Per defecte serà el directori de "
+#~ "documents si no es defineix."
+
+#~ msgid ""
+#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr ""
+#~ "L'amplada del paper en dècimes de mm (o 0 per la detecció automàtica del "
+#~ "paper)"
+
+#~ msgid "Type of document being scanned"
+#~ msgstr "Tipus de document a escanejar"
+
+#~ msgid ""
 #~ "Type of document being scanned. 'text' for text documents, 'photo' for "
 #~ "photos. This setting decides on the scan resolution, colors and post-"
 #~ "processing."
@@ -949,9 +849,18 @@ msgstr "S'està desant la pàgina %d de %d"
 #~ "L'amplada de la imatge escanejada en píxels. Aquest valor s'ha actualitzat "
 #~ "al que tenia l'última pàgina escanejada."
 
+#~ msgid "The resolution in dots-per-inch to use when scanning text."
+#~ msgstr "La resolució en punts per polzada quan s'escanegi text."
+
+#~ msgid "The resolution in dots-per-inch to use when scanning photos."
+#~ msgstr "La resolució en punts per polzada quan s'escanegin fotos."
+
 #~ msgid "Width of scanned image in pixels"
 #~ msgstr "Amplada de la imatge escanejada en píxels"
 
+#~ msgid "Width of paper in tenths of a mm"
+#~ msgstr "Amplada del paper en dècimes de mm"
+
 #~ msgid "Select File _Type"
 #~ msgstr "Seleccioneu el _tipus de fitxer"
 
@@ -974,5 +883,33 @@ msgstr "S'està desant la pàgina %d de %d"
 #~ msgid "Scanned Document"
 #~ msgstr "Document escanejat"
 
+#~ msgid "The page side to scan."
+#~ msgstr "La cara de la pàgina a escanejar."
+
+#~ msgid ""
+#~ "Type of document being scanned. This setting decides on the scan resolution, "
+#~ "colors and post-processing."
+#~ msgstr ""
+#~ "El tipus de document que s'està escanejant. Aquest paràmetre decideix la "
+#~ "resolució d'escaneig, els colors i el processament posterior."
+
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "La direcció de l'escànner a través de la pàgina escanejada."
+
+#~ msgid "Quality value to use for JPEG compression."
+#~ msgstr "Valor de la qualitat a utilitzar per la compressió JPEG."
+
+#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
+#~ msgstr "L'ajustament del contrast, de -100 a 100 (on 0 significa cap)"
+
+#~ msgid "Contrast of scan"
+#~ msgstr "Contrast de l'escaneig"
+
+#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
+#~ msgstr "L'ajustament de la brillantor, de -100 a 100 (on 0 significa cap)"
+
+#~ msgid "Brightness of scan"
+#~ msgstr "Brillantor de l'escaneig"
+
+#~ msgid "Quality value to use for JPEG compression"
+#~ msgstr "Valor de la qualitat a utilitzar per la compressió JPEG"
diff --git a/po/ca@valencia.gmo b/po/ca@valencia.gmo
new file mode 100644
index 0000000..4373648
--- /dev/null
+++ b/po/ca@valencia.gmo
diff --git a/po/ca@valencia.po b/po/ca@valencia.po
index 1e6df84..59c22de 100644
--- a/po/ca@valencia.po
+++ b/po/ca@valencia.po
@@ -7,407 +7,309 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-06 14:16+1200\n"
+"POT-Creation-Date: 2016-07-29 12:47+1200\n"
 "PO-Revision-Date: 2012-04-17 06:12+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Catalan (Valencian) <ca@valencia@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-04-14 05:40+0000\n"
-"X-Generator: Launchpad (build 17990)\n"
+"X-Launchpad-Export-Date: 2016-07-30 05:46+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 
 #. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:2
+#: data/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_Autoritza"
 
 #. Label beside username entry
-#: ../data/simple-scan.ui.h:4
+#: data/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "_Nom d'usuari del recurs:"
 
 #. Label beside password entry
-#: ../data/simple-scan.ui.h:6
+#: data/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Contrasenya:"
 
 #. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:8
+#: data/simple-scan.ui:188
 msgid "Front and Back"
 msgstr "Ambdues cares"
 
 #. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:10
+#: data/simple-scan.ui:192
 msgid "Front"
 msgstr "Anvers de la pàgina"
 
 #. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:12
+#: data/simple-scan.ui:196
 msgid "Back"
 msgstr "Revers de la pàgina"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
-#: ../data/appdata/simple-scan.appdata.xml.in.h:1
+#: data/simple-scan.ui:225 data/simple-scan.ui:809
+#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr "Escaneig senzill"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:16
+#: data/simple-scan.ui:241
 msgid "_Document"
 msgstr "_Document"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:18
+#: data/simple-scan.ui:260
 msgid "Sc_an"
 msgstr "Esc_aneja"
 
+#. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:20
+#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
 msgid "Single _Page"
 msgstr "Pàgina _individual"
 
+#. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:22
+#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr "Totes les pàgines de l'a_limentador"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:24
+#: data/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "_Atura l'escaneig"
 
-#: ../data/simple-scan.ui.h:25
+#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
 msgid "Text"
 msgstr "Text"
 
-#: ../data/simple-scan.ui.h:26
+#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
 msgid "Photo"
 msgstr "Foto"
 
 #. Menu item to reorder pages
-#. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1183 ../src/ui.vala:1841
+#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr ""
 
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: data/simple-scan.ui:367
 msgid "_Email"
 msgstr "_Envia per correu"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: data/simple-scan.ui:430
 msgid "_Page"
 msgstr "_Pàgina"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: data/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "Gira a l'_esquerra"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: data/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "Gira a la _dreta"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: data/simple-scan.ui:460
 msgid "_Crop"
 msgstr "_Escapçament"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: data/simple-scan.ui:470
 msgid "_None"
 msgstr "_Cap"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: data/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: data/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: data/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: data/simple-scan.ui:514
 msgid "_Letter"
 msgstr "_Carta EUA"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: data/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "Le_gal EUA"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: data/simple-scan.ui:536
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: data/simple-scan.ui:547
 msgid "_Custom"
 msgstr "_Personalitzat"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: data/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr "_Gira l'escapçament"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: data/simple-scan.ui:578
 msgid "Move Left"
 msgstr "Mou a l'esquerra"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: data/simple-scan.ui:587
 msgid "Move Right"
 msgstr "Mou a la dreta"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: data/simple-scan.ui:624
 msgid "_Help"
 msgstr "A_juda"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: data/simple-scan.ui:632
 msgid "_Contents"
 msgstr "C_ontingut"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: data/simple-scan.ui:674 data/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "Comença un document nou"
 
-#: ../data/simple-scan.ui.h:67
+#: data/simple-scan.ui:675
 msgid "New"
 msgstr "Nou"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: data/simple-scan.ui:689 data/simple-scan.ui:836
 msgid "Scan a single page from the scanner"
 msgstr "Escaneja una sola pàgina de l'escàner"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: data/simple-scan.ui:691 data/simple-scan.ui:837
 msgid "Scan"
 msgstr "Escaneja"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: data/simple-scan.ui:707 data/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "Guarda el document en un fitxer"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1842
+#: data/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "Guarda"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: data/simple-scan.ui:724 data/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "Para l'escaneig actual"
 
-#: ../data/simple-scan.ui.h:77
+#: data/simple-scan.ui:725 data/simple-scan.ui:825
 msgid "Stop"
 msgstr "Para"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: data/simple-scan.ui:749 data/simple-scan.ui:936
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Gireu la pàgina cap a l'esquerra (en sentit antihorari)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: data/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "Gira a l'esquerra"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: data/simple-scan.ui:764 data/simple-scan.ui:914
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Gireu la pàgina cap a la dreta (en sentit horari)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: data/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "Gira a la dreta"
 
-#: ../data/simple-scan.ui.h:86
+#: data/simple-scan.ui:779 data/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "Escapça la pàgina seleccionada"
 
-#: ../data/simple-scan.ui.h:87
+#: data/simple-scan.ui:781
 msgid "Crop"
 msgstr "Escapça"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1849
+#: data/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "Preferències"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: data/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "Font d'_escaneig:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: data/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "_Resolució de text:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: data/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "_Resolució fotogràfica:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: data/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "Cara a escanejar:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: data/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "Mida de la pàgina:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: data/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "Brillantor:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: data/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "Contrast:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: data/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "Qualitat:"
 
-#: ../data/simple-scan.desktop.in.h:2
+#: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:3
+#: data/simple-scan.desktop.in:5
 msgid "Scan Documents"
 msgstr "Escanegeu documents"
 
-#: ../data/simple-scan.desktop.in.h:4
+#: data/simple-scan.desktop.in:6
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Device to scan from"
-msgstr "Dispositiu d'escaneig"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "SANE device to acquire images from."
-msgstr "Dispositiu SANE per a l'adquisició d'imatges."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "Type of document being scanned"
-msgstr "Tipus de document a escanejar"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
-msgid ""
-"Type of document being scanned. This setting decides on the scan resolution, "
-"colors and post-processing."
+#: data/simple-scan.desktop.in:8
+msgid "scanner"
 msgstr ""
-"El tipus de document que s'està escanejant. Este paràmetre decideix la "
-"resolució d'escaneig, els colors i el processament posterior."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
-msgid "Width of paper in tenths of a mm"
-msgstr "Amplada del paper en dècimes de mm"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-"L'amplada del paper en dècimes de mm (o 0 per la detecció automàtica del "
-"paper)"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
-msgid "Height of paper in tenths of a mm"
-msgstr "Alçada del paper en dècimes parts d'un mm"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-"L'alçada del paper en dècimes de mm (o 0 per la detecció automàtica del "
-"paper)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "Brightness of scan"
-msgstr "Brillantor de l'escaneig"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "The brightness adjustment from -100 to 100 (0 being none)."
-msgstr "L'ajustament de la brillantor, de -100 a 100 (on 0 significa cap)"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid "Contrast of scan"
-msgstr "Contrast de l'escaneig"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "The contrast adjustment from -100 to 100 (0 being none)."
-msgstr "L'ajustament del contrast, de -100 a 100 (on 0 significa cap)"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid "Resolution for text scans"
-msgstr "Resolució per l'escaneig de text"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
-msgid "The resolution in dots-per-inch to use when scanning text."
-msgstr "La resolució en punts per polzada quan s'escanegi text."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
-msgid "Resolution for photo scans"
-msgstr "Resolució per l'escaneig de fotos"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr "La resolució en punts per polzada quan s'escanegin fotos."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
-msgid "Page side to scan"
-msgstr "Cara de la pàgina a escanejar"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
-msgid "The page side to scan."
-msgstr "La cara de la pàgina a escanejar."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
-msgid "Directory to save files to"
-msgstr "Directori on guardar els fitxers"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
-msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
-msgstr ""
-"El directori on guardar els fitxers. Per defecte serà el directori de "
-"documents si no es defineix."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
-msgid "Quality value to use for JPEG compression"
-msgstr "Valor de la qualitat a utilitzar per la compressió JPEG"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Quality value to use for JPEG compression."
-msgstr "Valor de la qualitat a utilitzar per la compressió JPEG."
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+#: data/simple-scan.appdata.xml.in:8
 msgid ""
 "A really easy way to scan both documents and photos. You can crop out the "
 "bad parts of a photo and rotate it if it is the wrong way round. You can "
@@ -415,199 +317,165 @@ msgid ""
 "formats."
 msgstr ""
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+#: data/simple-scan.appdata.xml.in:13
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr "No hi ha cap escàner disponible. Per favor, connecteu-ne un."
 
-#. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "No s'ha pogut connectar a l'escàner"
 
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "No s'ha pogut iniciar l'escaneig"
 
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1236 src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr "S'ha produït un error en comunicar-s'amb l'escàner"
 
-#. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "Mostra la versió de llançament"
 
-#. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr "Mostra els missatges de depuració"
 
-#: ../src/simple-scan.vala:26
+#: src/simple-scan.vala:26
 msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr ""
 "Arregla els fitxers PDF generats amb versions anteriors de l'Escaneig senzill"
 
-#. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:391
+#: src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Ha fallat l'escaneig"
 
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DISPOSITIU...] - Utilitat d'escaneig"
 
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Executeu «%s --help» per veure la llista completa d'opcions disponibles de "
 "la línia d'ordes."
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:318 src/ui.vala:1602 src/ui.vala:1887
 msgid "_Close"
 msgstr "_Tanca"
 
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:327
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Cal un usuari i contrasenya per a accedir a «%s»"
 
-#. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:375
 msgid "No scanners detected"
 msgstr "No s'ha detectat cap escàner"
 
-#. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:377
 msgid "Please check your scanner is connected and powered on"
 msgstr "Comproveu que l'escàner està connectat i engegat"
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:382
 msgid "Additional software needed"
 msgstr ""
 
-#. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr ""
 
-#. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:506 src/ui.vala:1843
 msgid "Save As..."
 msgstr "Anomena i guarda..."
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:509 src/ui.vala:675
 msgid "_Cancel"
 msgstr "_Cancel·la"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:510 src/ui.vala:676
 msgid "_Save"
 msgstr "Al_ça"
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "Document escanejat.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:521
 msgid "Image Files"
 msgstr "Fitxers d'imatge"
 
-#. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:527
 msgid "All Files"
 msgstr "Tots els fitxers"
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (document multipàgina)."
 
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (comprimit)"
 
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (sense pèrdua)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:557
 msgid "File format:"
 msgstr ""
 
-#. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:650
 msgid "Failed to save file"
 msgstr "No s'ha pogut guardar el fitxer"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:673
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Si no ho guardeu, els canvis es perdran per sempre més."
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:708
+#: src/ui.vala:708
 msgid "Save current document?"
 msgstr "Voleu guardar el document actual?"
 
-#. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:710
 msgid "Discard Changes"
 msgstr "Descarta els canvis"
 
-#. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "No s'ha pogut guardar la imatge per previsualitzar-la"
 
-#. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "No s'ha pogut obrir l'aplicació de previsualització d'imatges"
 
-#. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1206
 msgid "Combine sides"
 msgstr ""
 
-#. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr ""
 
-#. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1226
 msgid "Reverse"
 msgstr ""
 
-#. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr ""
 
-#. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "No s'ha pogut obrir el fitxer d'ajuda"
 
-#. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1472
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -638,207 +506,182 @@ msgstr ""
 "GPL)\n"
 "juntament amb este programa. Si no, mireu <http://www.gnu.org/licenses/>."
 
-#. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "Quant a l'escaneig senzill"
 
-#. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "Eina senzilla d'escaneig de documents"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  David Planella https://launchpad.net/~dpm\n"
 "  Joan Duran https://launchpad.net/~jodufi"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "Voleu guardar el document abans d'eixir?"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "Ix sense guardar"
 
-#. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
-#. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1581
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
 msgstr ""
 
-#. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
-#. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1587
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
 msgstr ""
 
-#. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr ""
 
-#. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
-#. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1598
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
 msgstr ""
 
-#. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1602
 msgid "Install drivers"
 msgstr ""
 
-#. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
-#. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr ""
 
-#. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr ""
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr ""
 
-#. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1676
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr ""
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d ppp (predeterminat)"
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d ppp (esborrany)"
 
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d ppp (alta resolució)"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/ui.vala:1793
 #, c-format
 msgid "%d dpi"
 msgstr "%d ppp"
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1835
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1840
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1844
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1845
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1853
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1854
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1855
 msgid "Quit"
 msgstr ""
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "Canvia l'e_scàner"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr ""
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1897
 msgid "Automatic"
 msgstr "Automàtic"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1947
 msgid "Darker"
 msgstr "Més fosc"
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1949
 msgid "Lighter"
 msgstr "Més clar"
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:1957
 msgid "Less"
 msgstr "Menys"
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:1959
 msgid "More"
 msgstr "Més"
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:1967
 msgid "Minimum"
 msgstr "Mínim"
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:1969
 msgid "Maximum"
 msgstr "Màxim"
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2008
 msgid "Saving document..."
 msgstr "S'està guardant el document..."
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "S'està guardant la pàgina %d de %d"
@@ -846,15 +689,33 @@ msgstr "S'està guardant la pàgina %d de %d"
 #~ msgid "4&#xD7;6"
 #~ msgstr "4&#xD7;6"
 
+#~ msgid "Device to scan from"
+#~ msgstr "Dispositiu d'escaneig"
+
 #~ msgid "Direction of scan"
 #~ msgstr "Direcció de l'escaneig"
 
+#~ msgid "Height of paper in tenths of a mm"
+#~ msgstr "Alçada del paper en dècimes parts d'un mm"
+
 #~ msgid "Height of scanned image in pixels"
 #~ msgstr "Alçada de la imatge escanejada en píxels"
 
+#~ msgid "Page side to scan"
+#~ msgstr "Cara de la pàgina a escanejar"
+
+#~ msgid "Resolution for photo scans"
+#~ msgstr "Resolució per l'escaneig de fotos"
+
+#~ msgid "Resolution for text scans"
+#~ msgstr "Resolució per l'escaneig de text"
+
 #~ msgid "Resolution of last scanned image"
 #~ msgstr "Resolució de l'última imatge escanejada"
 
+#~ msgid "SANE device to acquire images from."
+#~ msgstr "Dispositiu SANE per a l'adquisició d'imatges."
+
 #~ msgid "TRUE if the application window is maximized"
 #~ msgstr "TRUE (cert) si la finestra de l'aplicació està maximitzada"
 
@@ -868,6 +729,13 @@ msgstr "S'està guardant la pàgina %d de %d"
 #~ "esquerra)."
 
 #~ msgid ""
+#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr ""
+#~ "L'alçada del paper en dècimes de mm (o 0 per la detecció automàtica del "
+#~ "paper)."
+
+#~ msgid ""
 #~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
 #~ msgstr ""
 #~ "El costat de la pàgina a escanejar. Pot ser un dels següents: «both» "
@@ -877,6 +745,25 @@ msgstr "S'està guardant la pàgina %d de %d"
 #~ msgstr ""
 #~ "La resolució en punts per polzada de la imatge prèviament escanejada."
 
+#~ msgid "The resolution in dots-per-inch to use when scanning photos."
+#~ msgstr "La resolució en punts per polzada quan s'escanegin fotos."
+
+#~ msgid "The resolution in dots-per-inch to use when scanning text."
+#~ msgstr "La resolució en punts per polzada quan s'escanegi text."
+
+#~ msgid ""
+#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr ""
+#~ "L'amplada del paper en dècimes de mm (o 0 per la detecció automàtica del "
+#~ "paper)"
+
+#~ msgid "Type of document being scanned"
+#~ msgstr "Tipus de document a escanejar"
+
+#~ msgid "Width of paper in tenths of a mm"
+#~ msgstr "Amplada del paper en dècimes de mm"
+
 #~ msgid "Width of scanned image in pixels"
 #~ msgstr "Amplada de la imatge escanejada en píxels"
 
@@ -925,6 +812,16 @@ msgstr "S'està guardant la pàgina %d de %d"
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "La direcció de l'escànner a través de la pàgina escanejada."
 
+#~ msgid "The page side to scan."
+#~ msgstr "La cara de la pàgina a escanejar."
+
+#~ msgid ""
+#~ "Type of document being scanned. This setting decides on the scan resolution, "
+#~ "colors and post-processing."
+#~ msgstr ""
+#~ "El tipus de document que s'està escanejant. Este paràmetre decideix la "
+#~ "resolució d'escaneig, els colors i el processament posterior."
+
 #, c-format
 #~ msgid ""
 #~ "GTK+ Options:\n"
@@ -956,6 +853,24 @@ msgstr "S'està guardant la pàgina %d de %d"
 #~ "fotos. Aquest paràmetre decideix la resolució de l'escaneig, els colors i el "
 #~ "postprocessament."
 
+#~ msgid "Brightness of scan"
+#~ msgstr "Brillantor de l'escaneig"
+
+#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
+#~ msgstr "L'ajustament de la brillantor, de -100 a 100 (on 0 significa cap)"
+
+#~ msgid "Contrast of scan"
+#~ msgstr "Contrast de l'escaneig"
+
+#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
+#~ msgstr "L'ajustament del contrast, de -100 a 100 (on 0 significa cap)"
+
+#~ msgid "Quality value to use for JPEG compression"
+#~ msgstr "Valor de la qualitat a utilitzar per la compressió JPEG"
+
+#~ msgid "Quality value to use for JPEG compression."
+#~ msgstr "Valor de la qualitat a utilitzar per la compressió JPEG."
+
 #~ msgid ""
 #~ "The height of scanned image in pixels. This value is updated to what the "
 #~ "last scanned page was."
@@ -969,3 +884,12 @@ msgstr "S'està guardant la pàgina %d de %d"
 #~ msgstr ""
 #~ "L'amplada de la imatge escanejada en píxels. Aquest valor s'ha actualitzat "
 #~ "al que tenia l'última pàgina escanejada."
+
+#~ msgid "Directory to save files to"
+#~ msgstr "Directori on guardar els fitxers"
+
+#~ msgid ""
+#~ "The directory to save files to. Defaults to the documents directory if unset."
+#~ msgstr ""
+#~ "El directori on guardar els fitxers. Per defecte serà el directori de "
+#~ "documents si no es defineix."
diff --git a/po/ce.gmo b/po/ce.gmo
new file mode 100644
index 0000000..3cda6cd
--- /dev/null
+++ b/po/ce.gmo
diff --git a/po/ce.po b/po/ce.po
index 0e822d2..aa1d33b 100644
--- a/po/ce.po
+++ b/po/ce.po
@@ -7,399 +7,309 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-06 14:16+1200\n"
+"POT-Creation-Date: 2016-07-29 12:47+1200\n"
 "PO-Revision-Date: 2014-08-12 08:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Chechen <ce@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-04-14 05:39+0000\n"
-"X-Generator: Launchpad (build 17990)\n"
+"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 
 #. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:2
+#: data/simple-scan.ui:24
 msgid "_Authorize"
 msgstr ""
 
 #. Label beside username entry
-#: ../data/simple-scan.ui.h:4
+#: data/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr ""
 
 #. Label beside password entry
-#: ../data/simple-scan.ui.h:6
+#: data/simple-scan.ui:117
 msgid "_Password:"
 msgstr ""
 
 #. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:8
+#: data/simple-scan.ui:188
 msgid "Front and Back"
 msgstr ""
 
 #. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:10
+#: data/simple-scan.ui:192
 msgid "Front"
 msgstr ""
 
 #. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:12
+#: data/simple-scan.ui:196
 msgid "Back"
 msgstr ""
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
-#: ../data/appdata/simple-scan.appdata.xml.in.h:1
+#: data/simple-scan.ui:225 data/simple-scan.ui:809
+#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr ""
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:16
+#: data/simple-scan.ui:241
 msgid "_Document"
 msgstr ""
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:18
+#: data/simple-scan.ui:260
 msgid "Sc_an"
 msgstr ""
 
+#. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:20
+#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
 msgid "Single _Page"
 msgstr ""
 
+#. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:22
+#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr ""
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:24
+#: data/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:25
+#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
 msgid "Text"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:26
+#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
 msgid "Photo"
 msgstr ""
 
 #. Menu item to reorder pages
-#. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1183 ../src/ui.vala:1841
+#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr ""
 
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: data/simple-scan.ui:367
 msgid "_Email"
 msgstr ""
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: data/simple-scan.ui:430
 msgid "_Page"
 msgstr ""
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: data/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr ""
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: data/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr ""
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: data/simple-scan.ui:460
 msgid "_Crop"
 msgstr ""
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: data/simple-scan.ui:470
 msgid "_None"
 msgstr ""
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: data/simple-scan.ui:481
 msgid "A_4"
 msgstr ""
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: data/simple-scan.ui:492
 msgid "A_5"
 msgstr ""
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: data/simple-scan.ui:503
 msgid "A_6"
 msgstr ""
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: data/simple-scan.ui:514
 msgid "_Letter"
 msgstr ""
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: data/simple-scan.ui:525
 msgid "Le_gal"
 msgstr ""
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: data/simple-scan.ui:536
 msgid "4×6"
 msgstr ""
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: data/simple-scan.ui:547
 msgid "_Custom"
 msgstr ""
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: data/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr ""
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: data/simple-scan.ui:578
 msgid "Move Left"
 msgstr ""
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: data/simple-scan.ui:587
 msgid "Move Right"
 msgstr ""
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: data/simple-scan.ui:624
 msgid "_Help"
 msgstr ""
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: data/simple-scan.ui:632
 msgid "_Contents"
 msgstr ""
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: data/simple-scan.ui:674 data/simple-scan.ui:885
 msgid "Start a new document"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:67
+#: data/simple-scan.ui:675
 msgid "New"
 msgstr ""
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: data/simple-scan.ui:689 data/simple-scan.ui:836
 msgid "Scan a single page from the scanner"
 msgstr ""
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: data/simple-scan.ui:691 data/simple-scan.ui:837
 msgid "Scan"
 msgstr ""
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: data/simple-scan.ui:707 data/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1842
+#: data/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr ""
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: data/simple-scan.ui:724 data/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:77
+#: data/simple-scan.ui:725 data/simple-scan.ui:825
 msgid "Stop"
 msgstr ""
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: data/simple-scan.ui:749 data/simple-scan.ui:936
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr ""
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: data/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr ""
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: data/simple-scan.ui:764 data/simple-scan.ui:914
 msgid "Rotate the page to the right (clockwise)"
 msgstr ""
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: data/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:86
+#: data/simple-scan.ui:779 data/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:87
+#: data/simple-scan.ui:781
 msgid "Crop"
 msgstr ""
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1849
+#: data/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: data/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: data/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: data/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr ""
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: data/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr ""
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: data/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr ""
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: data/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: data/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: data/simple-scan.ui:1260
 msgid "Quality:"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:2
+#: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:3
+#: data/simple-scan.desktop.in:5
 msgid "Scan Documents"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:4
+#: data/simple-scan.desktop.in:6
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Device to scan from"
+#: data/simple-scan.desktop.in:8
+msgid "scanner"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "SANE device to acquire images from."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "Type of document being scanned"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
-msgid ""
-"Type of document being scanned. This setting decides on the scan resolution, "
-"colors and post-processing."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
-msgid "Width of paper in tenths of a mm"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
-msgid "Height of paper in tenths of a mm"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "Brightness of scan"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "The brightness adjustment from -100 to 100 (0 being none)."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid "Contrast of scan"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "The contrast adjustment from -100 to 100 (0 being none)."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid "Resolution for text scans"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
-msgid "The resolution in dots-per-inch to use when scanning text."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
-msgid "Resolution for photo scans"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
-msgid "Page side to scan"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
-msgid "The page side to scan."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
-msgid "Directory to save files to"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
-msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
-msgid "Quality value to use for JPEG compression"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Quality value to use for JPEG compression."
-msgstr ""
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+#: data/simple-scan.appdata.xml.in:8
 msgid ""
 "A really easy way to scan both documents and photos. You can crop out the "
 "bad parts of a photo and rotate it if it is the wrong way round. You can "
@@ -407,196 +317,162 @@ msgid ""
 "formats."
 msgstr ""
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+#: data/simple-scan.appdata.xml.in:13
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr ""
 
-#. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr ""
 
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr ""
 
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1236 src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr ""
 
-#. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr ""
 
-#. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr ""
 
-#: ../src/simple-scan.vala:26
+#: src/simple-scan.vala:26
 msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr ""
 
-#. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:391
+#: src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr ""
 
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:318 src/ui.vala:1602 src/ui.vala:1887
 msgid "_Close"
 msgstr ""
 
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:327
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr ""
 
-#. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:375
 msgid "No scanners detected"
 msgstr ""
 
-#. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:377
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:382
 msgid "Additional software needed"
 msgstr ""
 
-#. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr ""
 
-#. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:506 src/ui.vala:1843
 msgid "Save As..."
 msgstr ""
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:509 src/ui.vala:675
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:510 src/ui.vala:676
 msgid "_Save"
 msgstr ""
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr ""
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:521
 msgid "Image Files"
 msgstr ""
 
-#. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:527
 msgid "All Files"
 msgstr ""
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr ""
 
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr ""
 
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr ""
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:557
 msgid "File format:"
 msgstr ""
 
-#. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:650
 msgid "Failed to save file"
 msgstr ""
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:673
 msgid "If you don't save, changes will be permanently lost."
 msgstr ""
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:708
+#: src/ui.vala:708
 msgid "Save current document?"
 msgstr ""
 
-#. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:710
 msgid "Discard Changes"
 msgstr ""
 
-#. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr ""
 
-#. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr ""
 
-#. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1206
 msgid "Combine sides"
 msgstr ""
 
-#. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr ""
 
-#. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1226
 msgid "Reverse"
 msgstr ""
 
-#. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr ""
 
-#. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr ""
 
-#. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1472
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -612,204 +488,179 @@ msgid ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
 
-#. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr ""
 
-#. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr ""
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr ""
 
-#. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
-#. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1581
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
 msgstr ""
 
-#. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
-#. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1587
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
 msgstr ""
 
-#. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr ""
 
-#. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
-#. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1598
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
 msgstr ""
 
-#. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1602
 msgid "Install drivers"
 msgstr ""
 
-#. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
-#. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr ""
 
-#. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr ""
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr ""
 
-#. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1676
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr ""
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/ui.vala:1793
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1835
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1840
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1844
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1845
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1853
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1854
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1855
 msgid "Quit"
 msgstr ""
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr ""
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr ""
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1897
 msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1947
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1949
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:1957
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:1959
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:1967
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:1969
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2008
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/cs.gmo b/po/cs.gmo
new file mode 100644
index 0000000..94d2151
--- /dev/null
+++ b/po/cs.gmo
diff --git a/po/cs.po b/po/cs.po
index 642bf2d..9021bce 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,405 +7,309 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-06 14:16+1200\n"
+"POT-Creation-Date: 2016-07-29 12:47+1200\n"
 "PO-Revision-Date: 2013-12-18 12:25+0000\n"
 "Last-Translator: Tadeáš Pařík <tadeas.parik@gmail.com>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-04-14 05:39+0000\n"
-"X-Generator: Launchpad (build 17990)\n"
+"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 
 #. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:2
+#: data/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_Autorizovat"
 
 #. Label beside username entry
-#: ../data/simple-scan.ui.h:4
+#: data/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "_Vlastní pojmenování zdroje:"
 
 #. Label beside password entry
-#: ../data/simple-scan.ui.h:6
+#: data/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Heslo:"
 
 #. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:8
+#: data/simple-scan.ui:188
 msgid "Front and Back"
 msgstr "Přední a zadní"
 
 #. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:10
+#: data/simple-scan.ui:192
 msgid "Front"
 msgstr "Přední"
 
 #. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:12
+#: data/simple-scan.ui:196
 msgid "Back"
 msgstr "Zadní"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
-#: ../data/appdata/simple-scan.appdata.xml.in.h:1
+#: data/simple-scan.ui:225 data/simple-scan.ui:809
+#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr "Jednoduché skenování"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:16
+#: data/simple-scan.ui:241
 msgid "_Document"
 msgstr "_Dokument"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:18
+#: data/simple-scan.ui:260
 msgid "Sc_an"
 msgstr "Sk_enovat"
 
+#. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:20
+#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
 msgid "Single _Page"
 msgstr "Jedna _stránka"
 
+#. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:22
+#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr "Všechny stránky z _podavače"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:24
+#: data/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "_Zastavit skenování"
 
-#: ../data/simple-scan.ui.h:25
+#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
 msgid "Text"
 msgstr "Text"
 
-#: ../data/simple-scan.ui.h:26
+#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
 msgid "Photo"
 msgstr "Fotografie"
 
 #. Menu item to reorder pages
-#. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1183 ../src/ui.vala:1841
+#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr "Přeskupit stránky"
 
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: data/simple-scan.ui:367
 msgid "_Email"
 msgstr "_E-mail"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: data/simple-scan.ui:430
 msgid "_Page"
 msgstr "_Stránka"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: data/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "Otočit do_leva"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: data/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "Otočit dop_rava"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: data/simple-scan.ui:460
 msgid "_Crop"
 msgstr "_Oříznout"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: data/simple-scan.ui:470
 msgid "_None"
 msgstr "Žád_né"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: data/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: data/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: data/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: data/simple-scan.ui:514
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: data/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: data/simple-scan.ui:536
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: data/simple-scan.ui:547
 msgid "_Custom"
 msgstr "_Vlastní"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: data/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr "_Otočit ořez"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: data/simple-scan.ui:578
 msgid "Move Left"
 msgstr "Posunout doleva"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: data/simple-scan.ui:587
 msgid "Move Right"
 msgstr "Posunout doprava"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: data/simple-scan.ui:624
 msgid "_Help"
 msgstr "_Nápověda"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: data/simple-scan.ui:632
 msgid "_Contents"
 msgstr "_Obsah"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: data/simple-scan.ui:674 data/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "Vytvořit nový dokument"
 
-#: ../data/simple-scan.ui.h:67
+#: data/simple-scan.ui:675
 msgid "New"
 msgstr "Nový"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: data/simple-scan.ui:689 data/simple-scan.ui:836
 msgid "Scan a single page from the scanner"
 msgstr "Naskenovat jednu stránku ze skeneru"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: data/simple-scan.ui:691 data/simple-scan.ui:837
 msgid "Scan"
 msgstr "Skenovat"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: data/simple-scan.ui:707 data/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "Uložit dokument do souboru"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1842
+#: data/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "Uložit"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: data/simple-scan.ui:724 data/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "Zastavit probíhající skenování"
 
-#: ../data/simple-scan.ui.h:77
+#: data/simple-scan.ui:725 data/simple-scan.ui:825
 msgid "Stop"
 msgstr "Zastavit"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: data/simple-scan.ui:749 data/simple-scan.ui:936
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Otočit stránku doleva (proti směru hodinových ručiček)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: data/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "Otočit doleva"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: data/simple-scan.ui:764 data/simple-scan.ui:914
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Otočit stránku doprava (po směru hodinových ručiček)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: data/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "Otočit doprava"
 
-#: ../data/simple-scan.ui.h:86
+#: data/simple-scan.ui:779 data/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "Oříznout vybranou stránku"
 
-#: ../data/simple-scan.ui.h:87
+#: data/simple-scan.ui:781
 msgid "Crop"
 msgstr "Oříznout"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1849
+#: data/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "Předvolby"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: data/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "_Zdroj skenování:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: data/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "_Rozlišení textu:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: data/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "_Rozlišení fotografie:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: data/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "Skenovat stranu:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: data/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "Velikost stránky:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: data/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "Jas:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: data/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "Kontrast:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: data/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "Kvalita:"
 
-#: ../data/simple-scan.desktop.in.h:2
+#: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr "Skener dokumentu"
 
-#: ../data/simple-scan.desktop.in.h:3
+#: data/simple-scan.desktop.in:5
 msgid "Scan Documents"
 msgstr "Naskenovat dokumenty"
 
-#: ../data/simple-scan.desktop.in.h:4
+#: data/simple-scan.desktop.in:6
 msgid "scan;scanner;flatbed;adf;"
 msgstr "scan;scanner;flatbed;adf;"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Device to scan from"
-msgstr "Zařízení určené ke skenování"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "SANE device to acquire images from."
-msgstr "Zařízení SANE pro načítání obrázků."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "Type of document being scanned"
-msgstr "Typ skenovaného dokumentu"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
-msgid ""
-"Type of document being scanned. This setting decides on the scan resolution, "
-"colors and post-processing."
+#: data/simple-scan.desktop.in:8
+msgid "scanner"
 msgstr ""
-"Typ skenovaného dokumentu. Toto nastavení rozhoduje o rozlišení skenování, "
-"barvách a následném zpracování."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
-msgid "Width of paper in tenths of a mm"
-msgstr "Šířka papíru v desetinách milimetru"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-"Šířka papíru v desetinách milimetru (nebo 0 pro automatické zjištění papíru)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
-msgid "Height of paper in tenths of a mm"
-msgstr "Výška papíru v desetinách milimetru"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-"Výška papíru v desetinách milimetru (nebo 0 pro automatické zjištění papíru)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "Brightness of scan"
-msgstr "Jas skenu"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "The brightness adjustment from -100 to 100 (0 being none)."
-msgstr "Nastavení jasu od -100 do 100 (0 žádná hodnota)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid "Contrast of scan"
-msgstr "Kontrast skenu"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "The contrast adjustment from -100 to 100 (0 being none)."
-msgstr "Nastavení kontrastu od -100 do 100 (0 žádná hodnota)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid "Resolution for text scans"
-msgstr "Rozlišení pro skenování textu"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
-msgid "The resolution in dots-per-inch to use when scanning text."
-msgstr "Rozlišení v bodech na palec použité při skenování textu."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
-msgid "Resolution for photo scans"
-msgstr "Rozlišení pro skenování fotografií"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr "Rozlišení v bodech na palec použité při skenování fotografií."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
-msgid "Page side to scan"
-msgstr "Strana stránky ke skenování"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
-msgid "The page side to scan."
-msgstr "Strana stránky ke skenování."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
-msgid "Directory to save files to"
-msgstr "Adresář pro ukládání souborů"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
-msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
-msgstr ""
-"Adresář pro ukládání souborů. Standardně se ukládají do adresáře Dokumenty, "
-"pokud není nastaveno."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
-msgid "Quality value to use for JPEG compression"
-msgstr "Hodnota kvality u JPEG komprese"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Quality value to use for JPEG compression."
-msgstr "Hodnota kvality u JPEG komprese."
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+#: data/simple-scan.appdata.xml.in:8
 msgid ""
 "A really easy way to scan both documents and photos. You can crop out the "
 "bad parts of a photo and rotate it if it is the wrong way round. You can "
@@ -417,200 +321,166 @@ msgstr ""
 "stupňů! Až budete hotovy, materiál si nechtě vytisknout, převést do pdf, "
 "nebo uložit v rozmanité škále formátů."
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+#: data/simple-scan.appdata.xml.in:13
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 "Simple Scan používá SANE framework, aby pokryl co největší množství scannerů."
 
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Není k dispozici žádný skener. Připojte prosím zařízení."
 
-#. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "Nelze navázat spojení se skenerem"
 
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "Nelze zahájit skenování"
 
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1236 src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr "Při komunikaci se skenerem došlo k chybě"
 
-#. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "Zobrazit verzi vydání"
 
-#. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr "Vypisovat debugovací zprávy"
 
-#: ../src/simple-scan.vala:26
+#: src/simple-scan.vala:26
 msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr ""
 "Oprava PDF souborů generovaných se starší verzí nástroje Jednoduché skenování"
 
-#. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:391
+#: src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Skenování selhalo"
 
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[ZAŘÍZENÍ...] - Nástroj pro skenování"
 
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Spustit příkaz „%s --help“ k zobrazení úplného seznamu dostupných přepínačů "
 "příkazové řádky."
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:318 src/ui.vala:1602 src/ui.vala:1887
 msgid "_Close"
 msgstr "Z_avřít"
 
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:327
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Pro přístup k '%s' je vyžadováno uživatelské jméno a heslo"
 
-#. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:375
 msgid "No scanners detected"
 msgstr "Nenalezen žádný skener"
 
-#. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:377
 msgid "Please check your scanner is connected and powered on"
 msgstr "Zkontrolujte prosím, že je váš skener připojen a zapnut"
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:382
 msgid "Additional software needed"
 msgstr "Jsou potřeba ovladače scaneru"
 
-#. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr "Jsou potřeba ovladače scaneru"
 
-#. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:506 src/ui.vala:1843
 msgid "Save As..."
 msgstr "Uložit jako..."
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:509 src/ui.vala:675
 msgid "_Cancel"
 msgstr "_Zrušit"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:510 src/ui.vala:676
 msgid "_Save"
 msgstr "_Uložit"
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "Naskenovaný dokument.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:521
 msgid "Image Files"
 msgstr "Soubory obrázků"
 
-#. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:527
 msgid "All Files"
 msgstr "Všechny soubory"
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (vícestránkový dokument)"
 
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (komprimovaný)"
 
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (bezeztrátový)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:557
 msgid "File format:"
 msgstr "Typ souboru:"
 
-#. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:650
 msgid "Failed to save file"
 msgstr "Uložení souboru selhalo"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:673
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Pokud neuložíte, změny budou nenávratně ztraceny."
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:708
+#: src/ui.vala:708
 msgid "Save current document?"
 msgstr "Uložit stávající dokument?"
 
-#. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:710
 msgid "Discard Changes"
 msgstr "Zahodit změny"
 
-#. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "Nezdařilo se uložit obrázek pro náhled"
 
-#. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "Nelze otevřít aplikaci s náhledem obrázku"
 
-#. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1206
 msgid "Combine sides"
 msgstr "Kombinovat strany"
 
-#. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr "Kombinovat strany (obráceně)"
 
-#. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1226
 msgid "Reverse"
 msgstr "Obrátit"
 
-#. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr "Zachovat beze změň"
 
-#. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "Nelze otevřít soubor s nápovědou"
 
-#. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1472
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -639,24 +509,21 @@ msgstr ""
 "programem.\n"
 "Pokud ne, přečtěte si ji na stránce <http://www.gnu.org/licenses/>."
 
-#. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "O aplikaci Jednoduché skenování"
 
-#. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "Jednoduchý nástroj pro skenování dokumentů"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Adrian Guniš https://launchpad.net/~andygun\n"
 "  Jan Hrdina https://launchpad.net/~jan-hrdina\n"
 "  Martin Šácha https://launchpad.net/~sachy\n"
-"  Marv-CZ https://launchpad.net/~marek-manet\n"
 "  Matiseli https://launchpad.net/~sisolpes\n"
 "  Ondra Kadlec https://launchpad.net/~o-kadlec\n"
 "  Petr R. https://launchpad.net/~ateps-r\n"
@@ -667,23 +534,19 @@ msgstr ""
 "  Zdeněk Kopš https://launchpad.net/~zdenekkops\n"
 "  la_serpe https://launchpad.net/~tom-mil"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "Uložit dokument před ukončením?"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "Ukončit bez uložení"
 
-#. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr "Vypadá to, že máte scaner Brother"
 
-#. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1581
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
@@ -691,13 +554,11 @@ msgstr ""
 "Ovladače jsou dostupné na <a href=\"http://support.brother.com\">webu "
 "výrobce</a>."
 
-#. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr "Vypadá to, že máte scaner Samsung"
 
-#. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1587
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
@@ -705,18 +566,15 @@ msgstr ""
 "Ovladače jsou dostupné na <a href=\"http://samsung.com/support\">webu "
 "výrobce</a>."
 
-#. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr "Vypadá to, že máte scaner HP."
 
-#. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr "Vypadá to, že máte scaner Epson."
 
-#. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1598
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
@@ -724,139 +582,125 @@ msgstr ""
 "Ovladače jsou dostupné na <a href=\"http://support.epson.com\">webu "
 "výrobce</a>."
 
-#. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1602
 msgid "Install drivers"
 msgstr "Instalace ovladačů"
 
-#. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "Po instlaci je potřeba restartovat Simple Scan"
 
-#. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr "Instalace ovladačů..."
 
-#. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr "Instalace ovladačů byla úspěšná!"
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Instalace ovladačů skončila chybou %d"
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr "Instalace ovladačů se nezdařila."
 
-#. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1676
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr "Je potřeba nainstalovat balík %s."
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (výchozí)"
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (náčrt)"
 
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (vysoké rozlišení)"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/ui.vala:1793
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1835
 msgid "New Document"
 msgstr "Nový dokument"
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1840
 msgid "Document"
 msgstr "Dokument"
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1844
 msgid "Email..."
 msgstr "Email..."
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1845
 msgid "Print..."
 msgstr "Tisk…"
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1853
 msgid "Help"
 msgstr "Nápověda"
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1854
 msgid "About"
 msgstr "O aplikaci"
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1855
 msgid "Quit"
 msgstr "Ukončit"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "Změnit _skener"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr "_Instalovat ovladače"
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1897
 msgid "Automatic"
 msgstr "Automaticky"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1947
 msgid "Darker"
 msgstr "Tmavší"
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1949
 msgid "Lighter"
 msgstr "Světlejší"
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:1957
 msgid "Less"
 msgstr "Méně"
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:1959
 msgid "More"
 msgstr "Více"
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:1967
 msgid "Minimum"
 msgstr "Minimum"
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:1969
 msgid "Maximum"
 msgstr "Maximum"
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2008
 msgid "Saving document..."
 msgstr "Ukládání dokumentu..."
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Ukládání strany %d z %d"
@@ -876,6 +720,9 @@ msgstr "Ukládání strany %d z %d"
 #~ msgid "Direction of scan"
 #~ msgstr "Směr skenování"
 
+#~ msgid "Resolution for photo scans"
+#~ msgstr "Rozlišení pro skenování fotografií"
+
 #~ msgid "Window height in pixels"
 #~ msgstr "Výška okna v pixelech"
 
@@ -891,9 +738,21 @@ msgstr "Ukládání strany %d z %d"
 #~ msgid "TRUE if the application window is maximized"
 #~ msgstr "Nastavit na hodnotu PRAVDA, pokud má být okno maximalizované"
 
+#~ msgid "Device to scan from"
+#~ msgstr "Zařízení určené ke skenování"
+
+#~ msgid "SANE device to acquire images from."
+#~ msgstr "Zařízení SANE pro načítání obrázků."
+
+#~ msgid "Resolution for text scans"
+#~ msgstr "Rozlišení pro skenování textu"
+
 #~ msgid "Resolution of last scanned image"
 #~ msgstr "Rozlišení posledního skenovaného obrázku"
 
+#~ msgid "Directory to save files to"
+#~ msgstr "Adresář pro ukládání souborů"
+
 #~ msgid ""
 #~ "The direction of the scanner across the scanned page. It can be one of the "
 #~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
@@ -912,6 +771,15 @@ msgstr "Ukládání strany %d z %d"
 #~ msgstr "Rozlišení posledně skenovaného obrázku v bodech na palec."
 
 #~ msgid ""
+#~ "The directory to save files to. Defaults to the documents directory if unset."
+#~ msgstr ""
+#~ "Adresář pro ukládání souborů. Standardně se ukládají do adresáře Dokumenty, "
+#~ "pokud není nastaveno."
+
+#~ msgid "Type of document being scanned"
+#~ msgstr "Typ skenovaného dokumentu"
+
+#~ msgid ""
 #~ "Type of document being scanned. 'text' for text documents, 'photo' for "
 #~ "photos. This setting decides on the scan resolution, colors and post-"
 #~ "processing."
@@ -927,6 +795,12 @@ msgstr "Ukládání strany %d z %d"
 #~ "Šířka skenovaného obrázku v pixelech. Tato hodnota je přizpůsobena posledně "
 #~ "skenované stránce."
 
+#~ msgid "The resolution in dots-per-inch to use when scanning text."
+#~ msgstr "Rozlišení v bodech na palec použité při skenování textu."
+
+#~ msgid "The resolution in dots-per-inch to use when scanning photos."
+#~ msgstr "Rozlišení v bodech na palec použité při skenování fotografií."
+
 #, c-format
 #~ msgid ""
 #~ "Help Options:\n"
@@ -982,5 +856,54 @@ msgstr "Ukládání strany %d z %d"
 #~ "Strana stránky ke skenování. Může to být jedna z následujících hodnot: "
 #~ "„both“ (obě), „front“ (přední), „back“ (zadní)"
 
+#~ msgid ""
+#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr ""
+#~ "Výška papíru v desetinách milimetru (nebo 0 pro automatické zjištění papíru)."
+
+#~ msgid "Height of paper in tenths of a mm"
+#~ msgstr "Výška papíru v desetinách milimetru"
+
+#~ msgid "Page side to scan"
+#~ msgstr "Strana stránky ke skenování"
+
+#~ msgid ""
+#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr ""
+#~ "Šířka papíru v desetinách milimetru (nebo 0 pro automatické zjištění papíru)."
+
+#~ msgid "Width of paper in tenths of a mm"
+#~ msgstr "Šířka papíru v desetinách milimetru"
+
+#~ msgid "The page side to scan."
+#~ msgstr "Strana stránky ke skenování."
+
+#~ msgid ""
+#~ "Type of document being scanned. This setting decides on the scan resolution, "
+#~ "colors and post-processing."
+#~ msgstr ""
+#~ "Typ skenovaného dokumentu. Toto nastavení rozhoduje o rozlišení skenování, "
+#~ "barvách a následném zpracování."
+
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "Směr skenování stránky."
+
+#~ msgid "Contrast of scan"
+#~ msgstr "Kontrast skenu"
+
+#~ msgid "Brightness of scan"
+#~ msgstr "Jas skenu"
+
+#~ msgid "Quality value to use for JPEG compression."
+#~ msgstr "Hodnota kvality u JPEG komprese."
+
+#~ msgid "Quality value to use for JPEG compression"
+#~ msgstr "Hodnota kvality u JPEG komprese"
+
+#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
+#~ msgstr "Nastavení kontrastu od -100 do 100 (0 žádná hodnota)."
+
+#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
+#~ msgstr "Nastavení jasu od -100 do 100 (0 žádná hodnota)."
diff --git a/po/da.gmo b/po/da.gmo
new file mode 100644
index 0000000..b4f8b0f
--- /dev/null
+++ b/po/da.gmo
diff --git a/po/da.po b/po/da.po
index 61db69e..b23c443 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,406 +7,309 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-06 14:16+1200\n"
+"POT-Creation-Date: 2016-07-29 12:47+1200\n"
 "PO-Revision-Date: 2012-10-10 12:13+0000\n"
 "Last-Translator: AJenbo <anders@jenbo.dk>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-04-14 05:39+0000\n"
-"X-Generator: Launchpad (build 17990)\n"
+"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 
 #. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:2
+#: data/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_Autorisér"
 
 #. Label beside username entry
-#: ../data/simple-scan.ui.h:4
+#: data/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "Br_ugernavn for ressource:"
 
 #. Label beside password entry
-#: ../data/simple-scan.ui.h:6
+#: data/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Adgangskode:"
 
 #. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:8
+#: data/simple-scan.ui:188
 msgid "Front and Back"
 msgstr "For- og bagside"
 
 #. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:10
+#: data/simple-scan.ui:192
 msgid "Front"
 msgstr "Forside"
 
 #. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:12
+#: data/simple-scan.ui:196
 msgid "Back"
 msgstr "Bagside"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
-#: ../data/appdata/simple-scan.appdata.xml.in.h:1
+#: data/simple-scan.ui:225 data/simple-scan.ui:809
+#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr "Simpel skanning"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:16
+#: data/simple-scan.ui:241
 msgid "_Document"
 msgstr "_Dokument"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:18
+#: data/simple-scan.ui:260
 msgid "Sc_an"
 msgstr "Sk_an"
 
+#. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:20
+#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
 msgid "Single _Page"
 msgstr "_Enkelt side"
 
+#. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:22
+#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr "Alle sider fra _arkføderen"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:24
+#: data/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "_Stop skanning"
 
-#: ../data/simple-scan.ui.h:25
+#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
 msgid "Text"
 msgstr "Tekst"
 
-#: ../data/simple-scan.ui.h:26
+#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
 msgid "Photo"
 msgstr "Billede"
 
 #. Menu item to reorder pages
-#. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1183 ../src/ui.vala:1841
+#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr "Sortér sider påny"
 
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: data/simple-scan.ui:367
 msgid "_Email"
 msgstr "_Send med e-post"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: data/simple-scan.ui:430
 msgid "_Page"
 msgstr "_Side"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: data/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "Rotér mod _venstre"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: data/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "Rotér mod _højre"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: data/simple-scan.ui:460
 msgid "_Crop"
 msgstr "_Beskær"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: data/simple-scan.ui:470
 msgid "_None"
 msgstr "_Ingen"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: data/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: data/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: data/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: data/simple-scan.ui:514
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: data/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: data/simple-scan.ui:536
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: data/simple-scan.ui:547
 msgid "_Custom"
 msgstr "_Brugertilpasset"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: data/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr "_Rotér beskæring"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: data/simple-scan.ui:578
 msgid "Move Left"
 msgstr "Flyt til venstre"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: data/simple-scan.ui:587
 msgid "Move Right"
 msgstr "Flyt til højre"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: data/simple-scan.ui:624
 msgid "_Help"
 msgstr "_Hjælp"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: data/simple-scan.ui:632
 msgid "_Contents"
 msgstr "_Indhold"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: data/simple-scan.ui:674 data/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "Start et nyt dokument"
 
-#: ../data/simple-scan.ui.h:67
+#: data/simple-scan.ui:675
 msgid "New"
 msgstr "Nyt"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: data/simple-scan.ui:689 data/simple-scan.ui:836
 msgid "Scan a single page from the scanner"
 msgstr "Skan en enkelt side fra skanneren"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: data/simple-scan.ui:691 data/simple-scan.ui:837
 msgid "Scan"
 msgstr "Skan"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: data/simple-scan.ui:707 data/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "Gem dokument som en fil"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1842
+#: data/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "Gem"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: data/simple-scan.ui:724 data/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "Stop den igangværende skanning"
 
-#: ../data/simple-scan.ui.h:77
+#: data/simple-scan.ui:725 data/simple-scan.ui:825
 msgid "Stop"
 msgstr "Stop"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: data/simple-scan.ui:749 data/simple-scan.ui:936
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Rotér siden mod venstre (mod uret)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: data/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "Rotér mod venstre"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: data/simple-scan.ui:764 data/simple-scan.ui:914
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Rotér siden mod højre (med uret)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: data/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "Rotér mod højre"
 
-#: ../data/simple-scan.ui.h:86
+#: data/simple-scan.ui:779 data/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "Beskær den markerede side"
 
-#: ../data/simple-scan.ui.h:87
+#: data/simple-scan.ui:781
 msgid "Crop"
 msgstr "Beskær"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1849
+#: data/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "Indstillinger"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: data/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "Skanner_kilde:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: data/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "_Tekstopløsning:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: data/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "_Billedopløsning:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: data/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "Skan side:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: data/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "Sidestørrelse:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: data/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "Lysstyrke:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: data/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "Kontrast:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: data/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "Kvalitet:"
 
-#: ../data/simple-scan.desktop.in.h:2
+#: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr "Dokumentskanner"
 
-#: ../data/simple-scan.desktop.in.h:3
+#: data/simple-scan.desktop.in:5
 msgid "Scan Documents"
 msgstr "Skan dokumenter"
 
-#: ../data/simple-scan.desktop.in.h:4
+#: data/simple-scan.desktop.in:6
 msgid "scan;scanner;flatbed;adf;"
 msgstr "scan;scanner;flatbed;adf;skan;skanner;"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Device to scan from"
-msgstr "Enhed at skanne fra"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "SANE device to acquire images from."
-msgstr "SANE-enhed at erhverve billeder fra."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "Type of document being scanned"
-msgstr "Type af dokument der bliver skannet"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
-msgid ""
-"Type of document being scanned. This setting decides on the scan resolution, "
-"colors and post-processing."
-msgstr ""
-"Hvilken slags dokument der skal skannes. Denne indstilling bestemmer "
-"opløsningen, farver og efterbehandling."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
-msgid "Width of paper in tenths of a mm"
-msgstr "Bredde af papir i tiendedele millimeter"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-"Bredde af papir i tiendedele millimeter (eller 0 for automatisk "
-"papirstørelse)"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
-msgid "Height of paper in tenths of a mm"
-msgstr "Højde af papir i tiendedele millimeter"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-"Højde af papir tiendedele millimeter (eller 0 for automatisk papirstørelse)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "Brightness of scan"
-msgstr "Lysstyrke for skanning"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "The brightness adjustment from -100 to 100 (0 being none)."
-msgstr "Lysstyrkejusteringen mellem -100 og 100 (hvor 0 betyder ingen)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid "Contrast of scan"
-msgstr "Kontrast for skanning"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "The contrast adjustment from -100 to 100 (0 being none)."
-msgstr "Kontrastjusteringen mellem -100 og 100 (hvor 0 betyder ingen)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid "Resolution for text scans"
-msgstr "Opløsning for tekstskan"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
-msgid "The resolution in dots-per-inch to use when scanning text."
+#: data/simple-scan.desktop.in:8
+msgid "scanner"
 msgstr ""
-"Opløsningen i punkter per tomme, der skal bruges når der skannes tekst."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
-msgid "Resolution for photo scans"
-msgstr "Opløsning for billedskan"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr ""
-"Opløsningen i punkter per tomme, der skal bruges når der skannes foto."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
-msgid "Page side to scan"
-msgstr "Papirside der skal skannes"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
-msgid "The page side to scan."
-msgstr "Hvilken side af papiret der skal skannes."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
-msgid "Directory to save files to"
-msgstr "Mappe til at gemme filer i"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
-msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
-msgstr "Mappen til at gemme filer i. Som standard bruges dokumentmappen."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
-msgid "Quality value to use for JPEG compression"
-msgstr "Kvalitetsværdi der bruges til JPEG-komprimering"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Quality value to use for JPEG compression."
-msgstr "Kvalitetsværdi der bruges til JPEG-komprimering."
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+#: data/simple-scan.appdata.xml.in:8
 msgid ""
 "A really easy way to scan both documents and photos. You can crop out the "
 "bad parts of a photo and rotate it if it is the wrong way round. You can "
@@ -418,198 +321,166 @@ msgstr ""
 "kan udskrive dine skanninger, eksportere dem til pdf eller gemme dem i en "
 "række billedformater."
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+#: data/simple-scan.appdata.xml.in:13
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
+"Simpel skanning bruger SANE-rammeværket for at understøtte flest mulige "
+"skannere."
 
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Ingen skanner tilgængelig. Tilslut en skanner."
 
-#. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "Kunne ikke forbinde til sḱanner"
 
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "Kunne ikke starte skanning"
 
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1236 src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr "Fejl under kommunikation med skanner."
 
-#. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "Vis versionsnummer"
 
-#. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr "Skriv fejlsøgningsbeskeder"
 
-#: ../src/simple-scan.vala:26
+#: src/simple-scan.vala:26
 msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr "Ret PDF-filer oprettet med ældre versioner af Simple Scan"
 
-#. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:391
+#: src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Skanning mislykkedes"
 
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[ENHED...] - Skanningsredskab"
 
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Udfør \"%s --help\" for at se den fulde liste af tilgængelige "
 "kommandolinjetilvalg."
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:318 src/ui.vala:1602 src/ui.vala:1887
 msgid "_Close"
 msgstr "_Luk"
 
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:327
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Brugernavn og adgangskode er krævet for at tilgå \"%s\""
 
-#. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:375
 msgid "No scanners detected"
 msgstr "Ingen skannere fundet"
 
-#. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:377
 msgid "Please check your scanner is connected and powered on"
 msgstr "Kontrollér venligst at skanneren er tændt og sluttet til"
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:382
 msgid "Additional software needed"
 msgstr "Yderligere software påkrævet"
 
-#. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr "Det er nødvendigt at installere en driver til din skanner."
 
-#. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:506 src/ui.vala:1843
 msgid "Save As..."
 msgstr "Gem som..."
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:509 src/ui.vala:675
 msgid "_Cancel"
 msgstr "_Annullér"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:510 src/ui.vala:676
 msgid "_Save"
 msgstr "_Gem"
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "Skannet dokument.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:521
 msgid "Image Files"
 msgstr "Billedfiler"
 
-#. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:527
 msgid "All Files"
 msgstr "Alle filer"
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (flersidet dokument)"
 
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (komprimeret)"
 
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (tabsfri)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:557
 msgid "File format:"
 msgstr "Filformat:"
 
-#. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:650
 msgid "Failed to save file"
 msgstr "Kunne ikke gemme fil"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:673
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Hvis du ikke gemmer, vil ændringer gå permanent tabt."
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:708
+#: src/ui.vala:708
 msgid "Save current document?"
 msgstr "Gem nuværende dokument?"
 
-#. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:710
 msgid "Discard Changes"
 msgstr "Kassér ændringer"
 
-#. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "Kan ikke gemme billede for forhåndsvisning"
 
-#. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "Kunne ikke åbne programmet til forhåndsvisning af billeder"
 
-#. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1206
 msgid "Combine sides"
 msgstr "Kombinér sider"
 
-#. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr "Kombinér sider (omvendt)"
 
-#. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1226
 msgid "Reverse"
 msgstr "Omvendt"
 
-#. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr "Bevar uændret"
 
-#. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "Kan ikke åbne hjælpefil"
 
-#. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1472
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -637,17 +508,15 @@ msgstr ""
 "Du burde have modtaget en kopi af GNU General Public License\n"
 "sammen med dette program. Hvis ikke, se <http://www.gnu.org/licenses/>."
 
-#. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "Om Simpel skanning"
 
-#. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "Simpelt dokumentskanningsværktøj"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -663,23 +532,19 @@ msgstr ""
 "  TLE https://launchpad.net/~k-nielsen81\n"
 "  Torben Gundtofte-Bruun https://launchpad.net/~torbengb"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "Gem dokumentet før der afsluttes?"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "Afslut uden at gemme"
 
-#. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr "Du ser ud til at have en Brother skanner."
 
-#. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1581
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
@@ -687,13 +552,11 @@ msgstr ""
 "Der er drivere er tilgængelige til denne på <a "
 "href=\"http://support.brother.com\">Brothers webside</a>."
 
-#. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr "Du ser ud til at have en Samsung-skanner."
 
-#. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1587
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
@@ -701,156 +564,139 @@ msgstr ""
 "Drivere til dette er tilgængelige på <a "
 "href=\"http://samsung.com/support\">Samsungs hjemmeside</a>."
 
-#. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr "Du ser ud til at have en HP-skanner"
 
-#. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr "Du ser ud til at have en Epson-skanner"
 
-#. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1598
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
 msgstr ""
 
-#. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1602
 msgid "Install drivers"
 msgstr "Installér drivere"
 
-#. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "Når de er installeret, så skal du genstarte Simpel skanning."
 
-#. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr "Installerer drivere..."
 
-#. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr "Driver installeret korrekt!"
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Installation af drivere mislykkedes (fejlkode %d)."
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr "Installation af drivere mislykkedes."
 
-#. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1676
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr "Det er nødvendigt at installere pakken eller pakkerne %s."
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (standard)"
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (udkast)"
 
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (høj opløsning)"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/ui.vala:1793
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1835
 msgid "New Document"
 msgstr "Nyt dokument"
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1840
 msgid "Document"
 msgstr "Dokument"
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1844
 msgid "Email..."
 msgstr "E-post..."
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1845
 msgid "Print..."
 msgstr "Udskriv..."
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1853
 msgid "Help"
 msgstr "Hjælp"
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1854
 msgid "About"
 msgstr "Om"
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1855
 msgid "Quit"
 msgstr "Afslut"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "Skift _skanner"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr "_Installér drivere"
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1897
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1947
 msgid "Darker"
 msgstr "Mørkere"
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1949
 msgid "Lighter"
 msgstr "Lysere"
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:1957
 msgid "Less"
 msgstr "Mindre"
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:1959
 msgid "More"
 msgstr "Mere"
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:1967
 msgid "Minimum"
 msgstr "Minimum"
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:1969
 msgid "Maximum"
 msgstr "Maksimum"
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2008
 msgid "Saving document..."
 msgstr "Gemmer dokument ..."
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Gemmer side %d ud af %d"
@@ -867,6 +713,9 @@ msgstr "Gemmer side %d ud af %d"
 #~ msgid "Select File _Type"
 #~ msgstr "Vælg fil_type"
 
+#~ msgid "Device to scan from"
+#~ msgstr "Enhed at skanne fra"
+
 #~ msgid "Direction of scan"
 #~ msgstr "Skanneretning"
 
@@ -891,10 +740,29 @@ msgstr "Gemmer side %d ud af %d"
 #~ "Højden af skannede billede i pixel. Denne værdi opdateres svarende til "
 #~ "sidste skannede side."
 
+#~ msgid "SANE device to acquire images from."
+#~ msgstr "SANE-enhed at erhverve billeder fra."
+
+#~ msgid "Resolution for text scans"
+#~ msgstr "Opløsning for tekstskan"
+
+#~ msgid "Resolution for photo scans"
+#~ msgstr "Opløsning for billedskan"
+
 #~ msgid "Resolution of last scanned image"
 #~ msgstr "Opløsningen af det sidste billede der blev skannet"
 
 #~ msgid ""
+#~ "The directory to save files to. Defaults to the documents directory if unset."
+#~ msgstr "Mappen til at gemme filer i. Som standard bruges dokumentmappen."
+
+#~ msgid "Directory to save files to"
+#~ msgstr "Mappe til at gemme filer i"
+
+#~ msgid "Type of document being scanned"
+#~ msgstr "Type af dokument der bliver skannet"
+
+#~ msgid ""
 #~ "Type of document being scanned. 'text' for text documents, 'photo' for "
 #~ "photos. This setting decides on the scan resolution, colors and post-"
 #~ "processing."
@@ -913,6 +781,14 @@ msgstr "Gemmer side %d ud af %d"
 #~ msgid "The resolution in dots-per-inch of the previously scanned image."
 #~ msgstr "Opløsningen i punkter per tomme, på det forrige skannede billede."
 
+#~ msgid "The resolution in dots-per-inch to use when scanning text."
+#~ msgstr ""
+#~ "Opløsningen i punkter per tomme, der skal bruges når der skannes tekst."
+
+#~ msgid "The resolution in dots-per-inch to use when scanning photos."
+#~ msgstr ""
+#~ "Opløsningen i punkter per tomme, der skal bruges når der skannes foto."
+
 #~ msgid "Width of scanned image in pixels"
 #~ msgstr "Bredde af skannet billede i pixel"
 
@@ -970,11 +846,61 @@ msgstr "Gemmer side %d ud af %d"
 #~ msgstr ""
 #~ "Papirside der skal skannes. Den kan være følgende: 'both' 'front' 'back'"
 
+#~ msgid "Page side to scan"
+#~ msgstr "Papirside der skal skannes"
+
+#~ msgid ""
+#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr ""
+#~ "Højde af papir tiendedele millimeter (eller 0 for automatisk papirstørelse)."
+
+#~ msgid "Height of paper in tenths of a mm"
+#~ msgstr "Højde af papir i tiendedele millimeter"
+
+#~ msgid ""
+#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr ""
+#~ "Bredde af papir i tiendedele millimeter (eller 0 for automatisk "
+#~ "papirstørelse)"
+
+#~ msgid "Width of paper in tenths of a mm"
+#~ msgstr "Bredde af papir i tiendedele millimeter"
+
 #~ msgid "Window height in pixels"
 #~ msgstr "Vindueshøjde i pixel"
 
 #~ msgid "Window width in pixels"
 #~ msgstr "Vinduesbredde i pixel"
 
+#~ msgid "The page side to scan."
+#~ msgstr "Hvilken side af papiret der skal skannes."
+
+#~ msgid ""
+#~ "Type of document being scanned. This setting decides on the scan resolution, "
+#~ "colors and post-processing."
+#~ msgstr ""
+#~ "Hvilken slags dokument der skal skannes. Denne indstilling bestemmer "
+#~ "opløsningen, farver og efterbehandling."
+
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "Skannerens retning hen over siden."
+
+#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
+#~ msgstr "Kontrastjusteringen mellem -100 og 100 (hvor 0 betyder ingen)."
+
+#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
+#~ msgstr "Lysstyrkejusteringen mellem -100 og 100 (hvor 0 betyder ingen)."
+
+#~ msgid "Quality value to use for JPEG compression."
+#~ msgstr "Kvalitetsværdi der bruges til JPEG-komprimering."
+
+#~ msgid "Quality value to use for JPEG compression"
+#~ msgstr "Kvalitetsværdi der bruges til JPEG-komprimering"
+
+#~ msgid "Brightness of scan"
+#~ msgstr "Lysstyrke for skanning"
+
+#~ msgid "Contrast of scan"
+#~ msgstr "Kontrast for skanning"
diff --git a/po/de.gmo b/po/de.gmo
new file mode 100644
index 0000000..d89ab67
--- /dev/null
+++ b/po/de.gmo
diff --git a/po/de.po b/po/de.po
index e929949..1028e67 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,405 +7,309 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-06 14:16+1200\n"
+"POT-Creation-Date: 2016-07-29 12:47+1200\n"
 "PO-Revision-Date: 2015-01-16 18:30+0000\n"
-"Last-Translator: Tobias Bannert <Unknown>\n"
+"Last-Translator: Tobias Bannert <tobannert@gmail.com>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-04-14 05:39+0000\n"
-"X-Generator: Launchpad (build 17990)\n"
+"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 
 #. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:2
+#: data/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_Legitimieren"
 
 #. Label beside username entry
-#: ../data/simple-scan.ui.h:4
+#: data/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "_Benutzername für Quelle:"
 
 #. Label beside password entry
-#: ../data/simple-scan.ui.h:6
+#: data/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Passwort:"
 
 #. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:8
+#: data/simple-scan.ui:188
 msgid "Front and Back"
 msgstr "Vorder- und Rückseite"
 
 #. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:10
+#: data/simple-scan.ui:192
 msgid "Front"
 msgstr "Vorderseite"
 
 #. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:12
+#: data/simple-scan.ui:196
 msgid "Back"
 msgstr "Rückseite"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
-#: ../data/appdata/simple-scan.appdata.xml.in.h:1
+#: data/simple-scan.ui:225 data/simple-scan.ui:809
+#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr "Simple Scan"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:16
+#: data/simple-scan.ui:241
 msgid "_Document"
 msgstr "_Dokument"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:18
+#: data/simple-scan.ui:260
 msgid "Sc_an"
 msgstr "Sc_annen"
 
+#. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:20
+#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
 msgid "Single _Page"
 msgstr "_Einzelne Seite"
 
+#. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:22
+#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr "Alle Seiten aus dem _Papiereinzug"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:24
+#: data/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "_Scanvorgang anhalten"
 
-#: ../data/simple-scan.ui.h:25
+#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
 msgid "Text"
 msgstr "Text"
 
-#: ../data/simple-scan.ui.h:26
+#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
 msgid "Photo"
 msgstr "Foto"
 
 #. Menu item to reorder pages
-#. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1183 ../src/ui.vala:1841
+#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr "Seiten umsortieren"
 
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: data/simple-scan.ui:367
 msgid "_Email"
 msgstr "_E-Mail"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: data/simple-scan.ui:430
 msgid "_Page"
 msgstr "_Seite"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: data/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "_Links herum drehen"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: data/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "_Rechts herum drehen"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: data/simple-scan.ui:460
 msgid "_Crop"
 msgstr "_Zuschneiden"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: data/simple-scan.ui:470
 msgid "_None"
 msgstr "_Nicht zuschneiden"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: data/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: data/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: data/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: data/simple-scan.ui:514
 msgid "_Letter"
 msgstr "US _Letter"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: data/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "US _Legal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: data/simple-scan.ui:536
 msgid "4×6"
 msgstr "4×6 Zoll"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: data/simple-scan.ui:547
 msgid "_Custom"
 msgstr "_Benutzerdefiniert"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: data/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr "Zuschneideauswahl _drehen"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: data/simple-scan.ui:578
 msgid "Move Left"
 msgstr "Nach links schieben"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: data/simple-scan.ui:587
 msgid "Move Right"
 msgstr "Nach rechts schieben"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: data/simple-scan.ui:624
 msgid "_Help"
 msgstr "_Hilfe"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: data/simple-scan.ui:632
 msgid "_Contents"
 msgstr "I_nhalt"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: data/simple-scan.ui:674 data/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "Neues Dokument erstellen"
 
-#: ../data/simple-scan.ui.h:67
+#: data/simple-scan.ui:675
 msgid "New"
 msgstr "Neu"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: data/simple-scan.ui:689 data/simple-scan.ui:836
 msgid "Scan a single page from the scanner"
 msgstr "Eine einzelne Seite vom Scanner einscannen"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: data/simple-scan.ui:691 data/simple-scan.ui:837
 msgid "Scan"
 msgstr "Scannen"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: data/simple-scan.ui:707 data/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "Als Datei speichern"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1842
+#: data/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "Speichern"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: data/simple-scan.ui:724 data/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "Aktuellen Scanvorgang unterbrechen"
 
-#: ../data/simple-scan.ui.h:77
+#: data/simple-scan.ui:725 data/simple-scan.ui:825
 msgid "Stop"
 msgstr "Anhalten"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: data/simple-scan.ui:749 data/simple-scan.ui:936
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Die Seite links herum drehen (Gegen den Uhrzeigersinn)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: data/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "Links herum drehen"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: data/simple-scan.ui:764 data/simple-scan.ui:914
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Die Seite rechts herum drehen (Im Uhrzeigersinn)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: data/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "Rechts herum drehen"
 
-#: ../data/simple-scan.ui.h:86
+#: data/simple-scan.ui:779 data/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "Die gewählte Seite zurechtschneiden"
 
-#: ../data/simple-scan.ui.h:87
+#: data/simple-scan.ui:781
 msgid "Crop"
 msgstr "Zuschneiden"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1849
+#: data/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "Einstellungen"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: data/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "Scan-_Quelle:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: data/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "_Textauflösung:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: data/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "_Fotoauflösung:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: data/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "Zu scannende Seite:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: data/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "Seitengröße:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: data/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "Helligkeit:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: data/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "Kontrast:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: data/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "Qualität:"
 
-#: ../data/simple-scan.desktop.in.h:2
+#: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr "Dokument-Scanner"
 
-#: ../data/simple-scan.desktop.in.h:3
+#: data/simple-scan.desktop.in:5
 msgid "Scan Documents"
 msgstr "Dokumente scannen"
 
-#: ../data/simple-scan.desktop.in.h:4
+#: data/simple-scan.desktop.in:6
 msgid "scan;scanner;flatbed;adf;"
 msgstr "scan;einlesen;scanner;Flachbrett;flatbed;AVW;Vorlagenwechsler;adf;"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Device to scan from"
-msgstr "Scangerät"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "SANE device to acquire images from."
-msgstr "SANE-Gerät, von dem Bilder angefordert werden."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "Type of document being scanned"
-msgstr "Typ des zu scannenden Dokuments"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
-msgid ""
-"Type of document being scanned. This setting decides on the scan resolution, "
-"colors and post-processing."
+#: data/simple-scan.desktop.in:8
+msgid "scanner"
 msgstr ""
-"Typ des zu scannenden Dokuments. Diese Einstellung entscheidet über die "
-"Auflösung, Farben und Nachbearbeitung."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
-msgid "Width of paper in tenths of a mm"
-msgstr "Seitenbreite in Zehntelmillimetern"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-"Seitenbreite in Zehntelmillimetern (oder 0 für automatische Papiererkennung)"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
-msgid "Height of paper in tenths of a mm"
-msgstr "Papierhöhe in Zehntelmillimetern"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-"Papierhöhe in Zehntelmillimetern (oder 0 für automatische Papiererkennung)"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "Brightness of scan"
-msgstr "Helligkeit des Scans"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "The brightness adjustment from -100 to 100 (0 being none)."
-msgstr "Helligkeitseinstellung von -100 bis 100 (0 keine)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid "Contrast of scan"
-msgstr "Kontrast des Scans"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "The contrast adjustment from -100 to 100 (0 being none)."
-msgstr "Kontrasteinstellung von -100 bis 100 (0 keine)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid "Resolution for text scans"
-msgstr "Auflösung von Text-Scans"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
-msgid "The resolution in dots-per-inch to use when scanning text."
-msgstr "Die für Text zu verwendende Auflösung in DPI (Punkte pro Zoll)"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
-msgid "Resolution for photo scans"
-msgstr "Auflösung von Foto-Scans"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr "Die für Fotos zu verwendende Auflösung in DPI (Punkte pro Zoll)"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
-msgid "Page side to scan"
-msgstr "Zu scannende Seite des Blattes"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
-msgid "The page side to scan."
-msgstr "Die zu scannende Seite."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
-msgid "Directory to save files to"
-msgstr "Verzeichnis, in dem die Dateien gespeichert werden"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
-msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
-msgstr ""
-"Das Verzeichnis, in dem die Dateien gespeichert werden. Vorgabe ist der "
-"»Dokumente«-Ordner, wenn nichts eingestellt ist."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
-msgid "Quality value to use for JPEG compression"
-msgstr "Qualitätswert für die JPEG-Komprimierung"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Quality value to use for JPEG compression."
-msgstr "Qualitätswert, der für die JPEG-Komprimierung verwendet werden soll."
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+#: data/simple-scan.appdata.xml.in:8
 msgid ""
 "A really easy way to scan both documents and photos. You can crop out the "
 "bad parts of a photo and rotate it if it is the wrong way round. You can "
@@ -418,205 +322,171 @@ msgstr ""
 "Dokument exportiert oder in einer Anzahl verschiedener Bildformate "
 "gespeichert werden."
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+#: data/simple-scan.appdata.xml.in:13
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 "Simple Scan verwendet das SANE-Programmiergerüst für die Unterstützung der "
 "meisten verfügbaren Scanner."
 
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Keine Scanner verfügbar. Bitte schließen Sie einen Scanner an."
 
-#. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "Verbindung zum Scanner konnte nicht hergestellt werden"
 
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "Scanvorgang konnte nicht gestartet werden"
 
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1236 src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr "Fehler bei der Kommunikation mit dem Scanner"
 
-#. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "Versionsinformation anzeigen"
 
-#. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr "Fehlerdiagnosemeldungen anzeigen"
 
-#: ../src/simple-scan.vala:26
+#: src/simple-scan.vala:26
 msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr ""
 "Repariere PDF-Dateien, die mit einer älteren Version von Simpe Scan erstellt "
 "wurden"
 
-#. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:391
+#: src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Scannen fehlgeschlagen"
 
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[GERÄT …] - Scan-Werkzeug"
 
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Rufen Sie »%s --help« auf, um eine vollständige Liste der verfügbaren "
 "Befehlszeileoptionen zu erhalten."
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:318 src/ui.vala:1602 src/ui.vala:1887
 msgid "_Close"
 msgstr "S_chließen"
 
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:327
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr ""
 "Für den Zugriff auf »%s« werden ein Benutzername und ein Passwort benötigt"
 
-#. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:375
 msgid "No scanners detected"
 msgstr "Kein Scanner gefunden"
 
-#. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:377
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 "Bitte überprüfen Sie, ob Ihr Scanner angeschlossen und eingeschaltet ist"
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:382
 msgid "Additional software needed"
 msgstr "Zusätzliche Software wird benötigt"
 
-#. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr "Sie müssen die Treibersoftware für Ihren Scanner installieren"
 
-#. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:506 src/ui.vala:1843
 msgid "Save As..."
 msgstr "Speichern unter …"
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:509 src/ui.vala:675
 msgid "_Cancel"
 msgstr "Abbre_chen"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:510 src/ui.vala:676
 msgid "_Save"
 msgstr "_Speichern"
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "Gescanntes Dokument.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:521
 msgid "Image Files"
 msgstr "Bilddateien"
 
-#. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:527
 msgid "All Files"
 msgstr "Alle Dateitypen"
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (Mehrseitiges Dokument)"
 
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (Verlustbehaftet)"
 
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (Verlustfrei)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:557
 msgid "File format:"
 msgstr "Dateiformat:"
 
-#. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:650
 msgid "Failed to save file"
 msgstr "Datei konnte nicht gespeichert werden"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:673
 msgid "If you don't save, changes will be permanently lost."
 msgstr ""
 "Wenn Sie nicht speichern, werden die Änderungen unwiderruflich verworfen."
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:708
+#: src/ui.vala:708
 msgid "Save current document?"
 msgstr "Aktuelles Dokument speichern?"
 
-#. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:710
 msgid "Discard Changes"
 msgstr "Änderungen verwerfen"
 
-#. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "Vorschaubild kann nicht gespeichert werden"
 
-#. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "Bildvorschauanwendung konnte nicht gestartet werden"
 
-#. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1206
 msgid "Combine sides"
 msgstr "Seiten zusammenfügen"
 
-#. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr "Seiten zusammenfügen (umgekehrte Reihenfolge)"
 
-#. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1226
 msgid "Reverse"
 msgstr "Vertauschen"
 
-#. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr "Unverändert lassen"
 
-#. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "Die Hilfedatei konnte nicht geöffnet werden"
 
-#. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1472
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -649,17 +519,15 @@ msgstr ""
 "ist, finden Sie diese im Internet unter\n"
 "<http://www.gnu.org/licenses/>."
 
-#. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "Über Simple Scan"
 
-#. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "Einfaches Werkzeug zum Scannen von Dokumenten"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -702,27 +570,22 @@ msgstr ""
 "  Webschiff https://launchpad.net/~webschiff\n"
 "  William Glover https://launchpad.net/~williamglover\n"
 "  schuko24 https://launchpad.net/~gerd-saenger\n"
-"  simon danner https://launchpad.net/~simondanner\n"
 "  staedtler-przyborski https://launchpad.net/~staedtler-przyborski\n"
 "  tlue https://launchpad.net/~tlueber"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "Dokument vor dem Beenden speichern?"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "Beenden ohne zu speichern"
 
-#. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr "Scheinbar ist ein Brother Scanner angeschlossen."
 
-#. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1581
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
@@ -730,13 +593,11 @@ msgstr ""
 "Treiber hierfür sind verfügbar auf der <a "
 "href=\"http://support.brother.com\">Brother Webseite</a>."
 
-#. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr "Scheinbar ist ein Samsung Scanner angeschlossen."
 
-#. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1587
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
@@ -744,18 +605,15 @@ msgstr ""
 "Treiber hierfür sind verfügbar auf der <a "
 "href=\"http://samsung.com/support\">Samsung Webseite</a>."
 
-#. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr "Scheinbar ist ein HP Scanner angeschlossen."
 
-#. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr "Scheinbar ist ein Epson Scanner angeschlossen."
 
-#. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1598
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
@@ -763,139 +621,125 @@ msgstr ""
 "Treiber hierfür sind auf der <a href=\"http://support.epson.com\">Epson "
 "Webseite</a> verfügbar."
 
-#. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1602
 msgid "Install drivers"
 msgstr "Treiber installieren"
 
-#. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "Nach der Installation müssen Simple Scan erneut starten."
 
-#. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr "Treiber werden installiert…"
 
-#. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr "Treiber wurden erfolgreich installiert!"
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Treiberinstallation fehlgeschlagen (Fehlernummer %d)."
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr "Treiberinstallation fehlgeschlagen."
 
-#. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1676
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr "Sie müssen %s Paket(e) installieren."
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (Vorgabe)"
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (Entwurf)"
 
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (Hohe Auflösung)"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/ui.vala:1793
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1835
 msgid "New Document"
 msgstr "Neues Dokument"
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1840
 msgid "Document"
 msgstr "Dokument"
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1844
 msgid "Email..."
 msgstr "E-Mail …"
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1845
 msgid "Print..."
 msgstr "Drucken …"
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1853
 msgid "Help"
 msgstr "Hilfe"
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1854
 msgid "About"
 msgstr "Über"
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1855
 msgid "Quit"
 msgstr "Beenden"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "_Scanner wechseln"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr "_Treiber installieren"
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1897
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1947
 msgid "Darker"
 msgstr "Dunkler"
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1949
 msgid "Lighter"
 msgstr "Heller"
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:1957
 msgid "Less"
 msgstr "Weniger"
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:1959
 msgid "More"
 msgstr "Mehr"
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:1967
 msgid "Minimum"
 msgstr "Niedrig"
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:1969
 msgid "Maximum"
 msgstr "Hoch"
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2008
 msgid "Saving document..."
 msgstr "Dokument wird gespeichert …"
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Seite %d von %d wird gespeichert"
@@ -943,12 +787,27 @@ msgstr "Seite %d von %d wird gespeichert"
 #~ msgid "Height of scanned image in pixels"
 #~ msgstr "Höhe des gescannten Bilds in Pixel"
 
+#~ msgid "Device to scan from"
+#~ msgstr "Scangerät"
+
+#~ msgid "SANE device to acquire images from."
+#~ msgstr "SANE-Gerät, von dem Bilder angefordert werden."
+
 #~ msgid "Direction of scan"
 #~ msgstr "Scanverzeichnis"
 
+#~ msgid "Resolution for text scans"
+#~ msgstr "Auflösung von Text-Scans"
+
+#~ msgid "Resolution for photo scans"
+#~ msgstr "Auflösung von Foto-Scans"
+
 #~ msgid "Resolution of last scanned image"
 #~ msgstr "Auflösung des zuletzt gescannten Bildes"
 
+#~ msgid "Directory to save files to"
+#~ msgstr "Verzeichnis, in dem die Dateien gespeichert werden"
+
 #~ msgid ""
 #~ "The direction of the scanner across the scanned page. It can be one of the "
 #~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
@@ -957,6 +816,9 @@ msgstr "Seite %d von %d wird gespeichert"
 #~ "folgenden sein: »Oben nach Unten«, »Unten nach Oben«, »Links nach Rechts« "
 #~ "oder »Rechts nach Links«"
 
+#~ msgid "Type of document being scanned"
+#~ msgstr "Typ des zu scannenden Dokuments"
+
 #~ msgid ""
 #~ "The width of scanned image in pixels. This value is updated to what the last "
 #~ "scanned page was."
@@ -978,6 +840,12 @@ msgstr "Seite %d von %d wird gespeichert"
 #~ msgstr ""
 #~ "Die Auflösung in DPI (Punkte pro Zoll) des zuletzt eingescannten Bildes."
 
+#~ msgid "The resolution in dots-per-inch to use when scanning text."
+#~ msgstr "Die für Text zu verwendende Auflösung in DPI (Punkte pro Zoll)"
+
+#~ msgid "The resolution in dots-per-inch to use when scanning photos."
+#~ msgstr "Die für Fotos zu verwendende Auflösung in DPI (Punkte pro Zoll)"
+
 #~ msgid "Width of scanned image in pixels"
 #~ msgstr "Breite des gescannten Bilds in Pixel"
 
@@ -1005,6 +873,27 @@ msgstr "Seite %d von %d wird gespeichert"
 #~ "Verwendung:\n"
 #~ "  %s [GERÄT...] - Scanwerkzeug"
 
+#~ msgid "Page side to scan"
+#~ msgstr "Zu scannende Seite des Blattes"
+
+#~ msgid ""
+#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr ""
+#~ "Papierhöhe in Zehntelmillimetern (oder 0 für automatische Papiererkennung)"
+
+#~ msgid "Height of paper in tenths of a mm"
+#~ msgstr "Papierhöhe in Zehntelmillimetern"
+
+#~ msgid ""
+#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr ""
+#~ "Seitenbreite in Zehntelmillimetern (oder 0 für automatische Papiererkennung)"
+
+#~ msgid "Width of paper in tenths of a mm"
+#~ msgstr "Seitenbreite in Zehntelmillimetern"
+
 #~ msgid ""
 #~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
 #~ msgstr ""
@@ -1020,8 +909,42 @@ msgstr "Seite %d von %d wird gespeichert"
 #~ "Fotos. Die Einstellungen bestimmen die Scan-Auflösung, -Farbe und -"
 #~ "Nachbearbeitung."
 
+#~ msgid ""
+#~ "Type of document being scanned. This setting decides on the scan resolution, "
+#~ "colors and post-processing."
+#~ msgstr ""
+#~ "Typ des zu scannenden Dokuments. Diese Einstellung entscheidet über die "
+#~ "Auflösung, Farben und Nachbearbeitung."
+
+#~ msgid "The page side to scan."
+#~ msgstr "Die zu scannende Seite."
+
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "Die Richtung des Scanners über die gescannte Seite."
 
+#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
+#~ msgstr "Kontrasteinstellung von -100 bis 100 (0 keine)."
+
+#~ msgid "Contrast of scan"
+#~ msgstr "Kontrast des Scans"
+
+#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
+#~ msgstr "Helligkeitseinstellung von -100 bis 100 (0 keine)."
+
+#~ msgid "Brightness of scan"
+#~ msgstr "Helligkeit des Scans"
+
+#~ msgid "Quality value to use for JPEG compression."
+#~ msgstr "Qualitätswert, der für die JPEG-Komprimierung verwendet werden soll."
+
+#~ msgid "Quality value to use for JPEG compression"
+#~ msgstr "Qualitätswert für die JPEG-Komprimierung"
+
+#~ msgid ""
+#~ "The directory to save files to. Defaults to the documents directory if unset."
+#~ msgstr ""
+#~ "Das Verzeichnis, in dem die Dateien gespeichert werden. Vorgabe ist der "
+#~ "»Dokumente«-Ordner, wenn nichts eingestellt ist."
+
 #~ msgid "Select File _Type"
 #~ msgstr "_Dateityp auswählen"
diff --git a/po/el.gmo b/po/el.gmo
new file mode 100644
index 0000000..2f46043
--- /dev/null
+++ b/po/el.gmo
diff --git a/po/el.po b/po/el.po
index 0d1d0c9..46ae902 100644
--- a/po/el.po
+++ b/po/el.po
@@ -7,410 +7,309 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-06 14:16+1200\n"
+"POT-Creation-Date: 2016-07-29 12:47+1200\n"
 "PO-Revision-Date: 2013-07-03 07:45+0000\n"
 "Last-Translator: John Pag <ioanpagges@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-04-14 05:39+0000\n"
-"X-Generator: Launchpad (build 17990)\n"
+"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 
 #. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:2
+#: data/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_Εξουσιοδότηση"
 
 #. Label beside username entry
-#: ../data/simple-scan.ui.h:4
+#: data/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "Όνομα _χρήστη για πόρο:"
 
 #. Label beside password entry
-#: ../data/simple-scan.ui.h:6
+#: data/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Κωδικός:"
 
 #. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:8
+#: data/simple-scan.ui:188
 msgid "Front and Back"
 msgstr "Πρόσοψη και πίσω όψη"
 
 #. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:10
+#: data/simple-scan.ui:192
 msgid "Front"
 msgstr "Πρόσοψη"
 
 #. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:12
+#: data/simple-scan.ui:196
 msgid "Back"
 msgstr "Πίσω όψη"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
-#: ../data/appdata/simple-scan.appdata.xml.in.h:1
+#: data/simple-scan.ui:225 data/simple-scan.ui:809
+#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr "Σάρωση"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:16
+#: data/simple-scan.ui:241
 msgid "_Document"
 msgstr "_Έγγραφο"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:18
+#: data/simple-scan.ui:260
 msgid "Sc_an"
 msgstr "_Σάρωση"
 
+#. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:20
+#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
 msgid "Single _Page"
 msgstr "Μια_σελίδα"
 
+#. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:22
+#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr "Όλες τις σελίδες από την _τροφοδοσία"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:24
+#: data/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "_Διακοπή σάρωσης"
 
-#: ../data/simple-scan.ui.h:25
+#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
 msgid "Text"
 msgstr "ΚΕΙΜΕΝΟ"
 
-#: ../data/simple-scan.ui.h:26
+#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
 msgid "Photo"
 msgstr "Φωτογραφία"
 
 #. Menu item to reorder pages
-#. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1183 ../src/ui.vala:1841
+#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr "Επαναδιάταξη σελίδων"
 
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: data/simple-scan.ui:367
 msgid "_Email"
 msgstr "_Email"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: data/simple-scan.ui:430
 msgid "_Page"
 msgstr "_Σελίδα"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: data/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "Περιστροφή _αριστερά"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: data/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "Περιστροφή _δεξιά"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: data/simple-scan.ui:460
 msgid "_Crop"
 msgstr "_Περικοπή"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: data/simple-scan.ui:470
 msgid "_None"
 msgstr "_Κανένα"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: data/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: data/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: data/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: data/simple-scan.ui:514
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: data/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: data/simple-scan.ui:536
 msgid "4×6"
 msgstr "4×6 ίντσες"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: data/simple-scan.ui:547
 msgid "_Custom"
 msgstr "_Προσαρμοσμένο"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: data/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr "_Περιστροφή περικοπής"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: data/simple-scan.ui:578
 msgid "Move Left"
 msgstr "Μετακίνηση αριστερά"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: data/simple-scan.ui:587
 msgid "Move Right"
 msgstr "Μετακίνηση δεξιά"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: data/simple-scan.ui:624
 msgid "_Help"
 msgstr "_Βοήθεια"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: data/simple-scan.ui:632
 msgid "_Contents"
 msgstr "_Περιεχόμενα"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: data/simple-scan.ui:674 data/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "Δημιουργία νέου εγγράφου"
 
-#: ../data/simple-scan.ui.h:67
+#: data/simple-scan.ui:675
 msgid "New"
 msgstr "Νέο"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: data/simple-scan.ui:689 data/simple-scan.ui:836
 msgid "Scan a single page from the scanner"
 msgstr "Σάρωση μίας σελίδας από τον σαρωτή"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: data/simple-scan.ui:691 data/simple-scan.ui:837
 msgid "Scan"
 msgstr "Σάρωση"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: data/simple-scan.ui:707 data/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "Αποθήκευση εγγράφου σε αρχείο"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1842
+#: data/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "Αποθήκευση"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: data/simple-scan.ui:724 data/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "Διακοπή τρέχουσας σάρωσης"
 
-#: ../data/simple-scan.ui.h:77
+#: data/simple-scan.ui:725 data/simple-scan.ui:825
 msgid "Stop"
 msgstr "Διακοπή"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: data/simple-scan.ui:749 data/simple-scan.ui:936
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Περιστροφή της σελίδας αριστερά"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: data/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "Περιστροφή αριστερά"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: data/simple-scan.ui:764 data/simple-scan.ui:914
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Περιστροφή της σελίδας δεξιά"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: data/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "Περιστροφή δεξιά"
 
-#: ../data/simple-scan.ui.h:86
+#: data/simple-scan.ui:779 data/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "Περικοπή της επιλεγμένης σελίδας"
 
-#: ../data/simple-scan.ui.h:87
+#: data/simple-scan.ui:781
 msgid "Crop"
 msgstr "Περικοπή"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1849
+#: data/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "Προτιμήσεις"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: data/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "_Πηγή σάρωσης:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: data/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "Ανάλυση _κειμένου:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: data/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "Ανάλυση _φωτογραφίας:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: data/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "Πλευρά σάρωσης"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: data/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "Μέγεθος σελίδας:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: data/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "Φωτεινότητα:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: data/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "Αντίθεση:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: data/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "Ποιότητα:"
 
-#: ../data/simple-scan.desktop.in.h:2
+#: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr "Σαρωτής εγγράφων"
 
-#: ../data/simple-scan.desktop.in.h:3
+#: data/simple-scan.desktop.in:5
 msgid "Scan Documents"
 msgstr "Σάρωση εγγράφων"
 
-#: ../data/simple-scan.desktop.in.h:4
+#: data/simple-scan.desktop.in:6
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Device to scan from"
-msgstr "Συσκευή που χρησιμοποιείται για σάρωση"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "SANE device to acquire images from."
-msgstr "Συσκευή SANE που χρησιμοποιείται για την λήψη εικόνων."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "Type of document being scanned"
-msgstr "Ο τύπος του εγγράφου που σαρώνεται"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
-msgid ""
-"Type of document being scanned. This setting decides on the scan resolution, "
-"colors and post-processing."
-msgstr ""
-"Ο τύπος του έγγραφου που σαρώνεται.  Αυτή η ρύθμιση καθορίζει την ανάλυση, "
-"το χρώμα και την μετα-επεξεργασία της σάρωσης."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
-msgid "Width of paper in tenths of a mm"
-msgstr "Πλάτος του χαρτιού σε δέκατα του χιλιοστού (mm)"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
+#: data/simple-scan.desktop.in:8
+msgid "scanner"
 msgstr ""
-"Πλάτος του χαρτιού σε δέκατα του χιλιοστού (mm) (ή 0 για την αυτόματη "
-"ανίχνευση χαρτιού)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
-msgid "Height of paper in tenths of a mm"
-msgstr "Ύψος σελίδας σε δέκατα του χιλιοστού (mm)"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-"Ύψος του χαρτιού σε δέκατα του χιλιοστού (mm) (ή 0 για την αυτόματη "
-"ανίχνευση χαρτιού)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "Brightness of scan"
-msgstr "Φωτεινότητα σάρωσης"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "The brightness adjustment from -100 to 100 (0 being none)."
-msgstr "Προσαρμογή της φωτεινότητας από -100 έως 100 (0 χωρίς προσαρμογή)"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid "Contrast of scan"
-msgstr "Αντίθεση σάρωσης"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "The contrast adjustment from -100 to 100 (0 being none)."
-msgstr "Προσαρμογή της αντίθεσης από -100 έως 100 (0 χωρίς προσαρμογή)"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid "Resolution for text scans"
-msgstr "Ανάλυση για σάρωση κειμένου"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
-msgid "The resolution in dots-per-inch to use when scanning text."
-msgstr ""
-"Η ανάλυση σε κουκκίδες ανά ίντσα που θα χρησιμοποιηθεί στην σάρωση κειμένων."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
-msgid "Resolution for photo scans"
-msgstr "Ανάλυση για σάρωση φωτογραφιών"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr ""
-"Η ανάλυση σε κουκκίδες ανά ίντσα που θα χρησιμοποιηθεί στην σάρωση "
-"φωτογραφιών."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
-msgid "Page side to scan"
-msgstr "Πλευρά σελίδας για σάρωση"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
-msgid "The page side to scan."
-msgstr "Η πλευρά της σελίδας για σάρωση."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
-msgid "Directory to save files to"
-msgstr "Κατάλογος στον οποίο θα αποθηκευτούν τα αρχεία"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
-msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
-msgstr ""
-"Ο κατάλογος στον οποίο θα αποθηκευτούν τα αρχεία. Αν δεν ορισθεί, προεπιλογή "
-"είναι ο κατάλογος εγγράφων."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
-msgid "Quality value to use for JPEG compression"
-msgstr "Τιμή της ποιότητας που θα χρησιμοποιηθεί για τη συμπίεση JPEG"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Quality value to use for JPEG compression."
-msgstr "Τιμή της ποιότητας που θα χρησιμοποιηθεί για τη συμπίεση JPEG."
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+#: data/simple-scan.appdata.xml.in:8
 msgid ""
 "A really easy way to scan both documents and photos. You can crop out the "
 "bad parts of a photo and rotate it if it is the wrong way round. You can "
@@ -418,202 +317,168 @@ msgid ""
 "formats."
 msgstr ""
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+#: data/simple-scan.appdata.xml.in:13
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Δεν υπάρχουν διαθέσιμοι σαρωτές. Παρακαλούμε συνδέστε ένα σαρωτή."
 
-#. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "Αδύνατη η σύνδεση με τον σαρωτή"
 
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "Αδύνατη η εκκίνηση της σάρωσης"
 
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1236 src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr "Σφάλμα κατά την επικοινωνία με τον σαρωτή"
 
-#. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "Προβολή αριθμού έκδοσης"
 
-#. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr "Εμφάνιση μηνυμάτων εντοπισμού σφαλμάτων"
 
-#: ../src/simple-scan.vala:26
+#: src/simple-scan.vala:26
 msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr ""
 "Διόρθωση αρχείων PDF που δημιουργήθηκαν με παλαιότερες εκδόσεις του "
 "λογισμικού Simple Scan"
 
-#. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:391
+#: src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Η σάρωση απέτυχε"
 
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[ΣΥΣΚΕΥΗ…] - Εφαρμογή σάρωσης"
 
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Εκτελέστε «%s --help» για να δείτε την πλήρη λίστα των διαθέσιμων επιλογών "
 "εντολής γραμμής."
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:318 src/ui.vala:1602 src/ui.vala:1887
 msgid "_Close"
 msgstr "_Κλείσιμο"
 
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:327
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Απαιτείται όνομα χρήστη και κωδικός για την πρόσβαση στο '%s'"
 
-#. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:375
 msgid "No scanners detected"
 msgstr "Δεν ανιχνεύθηκαν σαρωτές"
 
-#. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:377
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 "Παρακαλούμε βεβαιωθείτε ότι ο σαρωτής σας είναι συνδεδεμένος και σε "
 "λειτουργία"
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:382
 msgid "Additional software needed"
 msgstr ""
 
-#. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr ""
 
-#. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:506 src/ui.vala:1843
 msgid "Save As..."
 msgstr "Αποθήκευση ως..."
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:509 src/ui.vala:675
 msgid "_Cancel"
 msgstr "_Ακύρωση"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:510 src/ui.vala:676
 msgid "_Save"
 msgstr "Απο_θήκευση"
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "Σαρωμένο.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:521
 msgid "Image Files"
 msgstr "Αρχεία εικόνων"
 
-#. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:527
 msgid "All Files"
 msgstr "Όλα τα αρχεία"
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (έγγραφο πολλαπλών σελίδων)"
 
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (συμπιεσμένο)"
 
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (δίχως συμπίεση)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:557
 msgid "File format:"
 msgstr ""
 
-#. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:650
 msgid "Failed to save file"
 msgstr "Αποτυχία αποθήκευσης του αρχείου"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:673
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Αν δεν αποθηκεύσετε, οι αλλαγές θα χαθούν μόνιμα."
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:708
+#: src/ui.vala:708
 msgid "Save current document?"
 msgstr "Αποθήκευση του τρέχοντος εγγράφου;"
 
-#. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:710
 msgid "Discard Changes"
 msgstr "Απόρριψη αλλαγών"
 
-#. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "Αδυναμία αποθήκευσης σελίδας για προεπισκόπηση"
 
-#. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "Αδύνατο το άνοιγμα της εφαρμογής προβολής εικόνων"
 
-#. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1206
 msgid "Combine sides"
 msgstr ""
 
-#. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr ""
 
-#. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1226
 msgid "Reverse"
 msgstr ""
 
-#. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr "Διατήρηση αμετάβλητων"
 
-#. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "Αδύνατο το άνοιγμα του αρχείου βοήθειας"
 
-#. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1472
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -644,17 +509,15 @@ msgstr ""
 "GNU (GNU General Public License) μαζί με αυτό το πρόγραμμα. Εάν όχι, δείτε "
 "εδώ: <http://www.gnu.org/licenses/>."
 
-#. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "Περί Σάρωσης"
 
-#. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "Απλό εργαλείο σάρωσης εγγράφων"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -674,190 +537,167 @@ msgstr ""
 "  tomash.ghz https://launchpad.net/~ghz-tomash\n"
 "  trix https://launchpad.net/~panelc"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "Αποθήκευση του εγγράφου πριν την έξοδο;"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "Έξοδος χωρίς Αποθήκευση"
 
-#. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
-#. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1581
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
 msgstr ""
 
-#. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
-#. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1587
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
 msgstr ""
 
-#. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr ""
 
-#. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
-#. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1598
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
 msgstr ""
 
-#. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1602
 msgid "Install drivers"
 msgstr ""
 
-#. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
-#. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr ""
 
-#. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr ""
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr ""
 
-#. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1676
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr ""
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (προεπιλογή)"
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (πρόχειρο)"
 
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (υψηλή ανάλυση)"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/ui.vala:1793
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1835
 msgid "New Document"
 msgstr "Νέο έγγραφο"
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1840
 msgid "Document"
 msgstr "Έγγραφο"
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1844
 msgid "Email..."
 msgstr "Ηλεκτρονική αλληλογραφία..."
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1845
 msgid "Print..."
 msgstr "Εκτύπωση..."
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1853
 msgid "Help"
 msgstr "Βοήθεια"
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1854
 msgid "About"
 msgstr "Περί"
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1855
 msgid "Quit"
 msgstr "'Εξοδος"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "Αλλαγή _σαρωτή"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr ""
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1897
 msgid "Automatic"
 msgstr "Αυτόματο"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1947
 msgid "Darker"
 msgstr "Σκοτεινότερο"
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1949
 msgid "Lighter"
 msgstr "Φωτεινότερο"
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:1957
 msgid "Less"
 msgstr "Λιγότερο"
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:1959
 msgid "More"
 msgstr "Περισσότερο"
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:1967
 msgid "Minimum"
 msgstr "Ελάχιστο"
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:1969
 msgid "Maximum"
 msgstr "Μέγιστο"
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2008
 msgid "Saving document..."
 msgstr "Αποθήκευση εγγράφου..."
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Αποθήκευση σελίδας %d από %d"
@@ -874,9 +714,18 @@ msgstr "Αποθήκευση σελίδας %d από %d"
 #~ msgid "Direction of scan"
 #~ msgstr "Κατεύθυνση σάρωσης"
 
+#~ msgid "Resolution for text scans"
+#~ msgstr "Ανάλυση για σάρωση κειμένου"
+
+#~ msgid "Resolution for photo scans"
+#~ msgstr "Ανάλυση για σάρωση φωτογραφιών"
+
 #~ msgid "Resolution of last scanned image"
 #~ msgstr "Ανάλυση τελευταίας σαρωμένης εικόνας"
 
+#~ msgid "Type of document being scanned"
+#~ msgstr "Ο τύπος του εγγράφου που σαρώνεται"
+
 #~ msgid ""
 #~ "Type of document being scanned. 'text' for text documents, 'photo' for "
 #~ "photos. This setting decides on the scan resolution, colors and post-"
@@ -903,6 +752,15 @@ msgstr "Αποθήκευση σελίδας %d από %d"
 #~ "Το ύψος της σαρωμένης εικόνας σε εικονοστοιχεία. Η τιμή αυτή ενημερώνεται με "
 #~ "το ύψος της τελευταίας σαρωμένης σελίδας."
 
+#~ msgid "The resolution in dots-per-inch to use when scanning text."
+#~ msgstr ""
+#~ "Η ανάλυση σε κουκκίδες ανά ίντσα που θα χρησιμοποιηθεί στην σάρωση κειμένων."
+
+#~ msgid "The resolution in dots-per-inch to use when scanning photos."
+#~ msgstr ""
+#~ "Η ανάλυση σε κουκκίδες ανά ίντσα που θα χρησιμοποιηθεί στην σάρωση "
+#~ "φωτογραφιών."
+
 #~ msgid "Width of scanned image in pixels"
 #~ msgstr "Πλάτος της σαρωμένης εικόνας σε εικονοστοιχεία"
 
@@ -951,6 +809,12 @@ msgstr "Αποθήκευση σελίδας %d από %d"
 #~ "(από κάτω προς τα πάνω) 'left-to-right' (από αριστερά προς δεξιά) 'right-to-"
 #~ "left' (από δεξιά προς αριστερά)"
 
+#~ msgid "SANE device to acquire images from."
+#~ msgstr "Συσκευή SANE που χρησιμοποιείται για την λήψη εικόνων."
+
+#~ msgid "Device to scan from"
+#~ msgstr "Συσκευή που χρησιμοποιείται για σάρωση"
+
 #~ msgid "The resolution in dots-per-inch of the previously scanned image."
 #~ msgstr "Η ανάλυση σε κουκκίδες ανά ίντσα της προηγούμενης σαρωμένης εικόνας."
 
@@ -979,5 +843,65 @@ msgstr "Αποθήκευση σελίδας %d από %d"
 #~ msgid "Scanned Document"
 #~ msgstr "Σαρωμένο"
 
+#~ msgid ""
+#~ "The directory to save files to. Defaults to the documents directory if unset."
+#~ msgstr ""
+#~ "Ο κατάλογος στον οποίο θα αποθηκευτούν τα αρχεία. Αν δεν ορισθεί, προεπιλογή "
+#~ "είναι ο κατάλογος εγγράφων."
+
+#~ msgid "Directory to save files to"
+#~ msgstr "Κατάλογος στον οποίο θα αποθηκευτούν τα αρχεία"
+
+#~ msgid "Page side to scan"
+#~ msgstr "Πλευρά σελίδας για σάρωση"
+
+#~ msgid "The page side to scan."
+#~ msgstr "Η πλευρά της σελίδας για σάρωση."
+
+#~ msgid ""
+#~ "Type of document being scanned. This setting decides on the scan resolution, "
+#~ "colors and post-processing."
+#~ msgstr ""
+#~ "Ο τύπος του έγγραφου που σαρώνεται.  Αυτή η ρύθμιση καθορίζει την ανάλυση, "
+#~ "το χρώμα και την μετα-επεξεργασία της σάρωσης."
+
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "Ο προσανατολισμός του σαρωτή  στη σαρωμένη σελίδα"
+
+#~ msgid ""
+#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr ""
+#~ "Πλάτος του χαρτιού σε δέκατα του χιλιοστού (mm) (ή 0 για την αυτόματη "
+#~ "ανίχνευση χαρτιού)."
+
+#~ msgid "Width of paper in tenths of a mm"
+#~ msgstr "Πλάτος του χαρτιού σε δέκατα του χιλιοστού (mm)"
+
+#~ msgid ""
+#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr ""
+#~ "Ύψος του χαρτιού σε δέκατα του χιλιοστού (mm) (ή 0 για την αυτόματη "
+#~ "ανίχνευση χαρτιού)."
+
+#~ msgid "Height of paper in tenths of a mm"
+#~ msgstr "Ύψος σελίδας σε δέκατα του χιλιοστού (mm)"
+
+#~ msgid "Contrast of scan"
+#~ msgstr "Αντίθεση σάρωσης"
+
+#~ msgid "Brightness of scan"
+#~ msgstr "Φωτεινότητα σάρωσης"
+
+#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
+#~ msgstr "Προσαρμογή της αντίθεσης από -100 έως 100 (0 χωρίς προσαρμογή)"
+
+#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
+#~ msgstr "Προσαρμογή της φωτεινότητας από -100 έως 100 (0 χωρίς προσαρμογή)"
+
+#~ msgid "Quality value to use for JPEG compression."
+#~ msgstr "Τιμή της ποιότητας που θα χρησιμοποιηθεί για τη συμπίεση JPEG."
+
+#~ msgid "Quality value to use for JPEG compression"
+#~ msgstr "Τιμή της ποιότητας που θα χρησιμοποιηθεί για τη συμπίεση JPEG"
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@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_GB.gmo b/po/en_GB.gmo
new file mode 100644
index 0000000..5aeac6b
--- /dev/null
+++ b/po/en_GB.gmo
diff --git a/po/en_GB.po b/po/en_GB.po
index 40fbabf..5938be3 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,405 +7,309 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-06 14:16+1200\n"
+"POT-Creation-Date: 2016-07-29 12:47+1200\n"
 "PO-Revision-Date: 2012-07-23 08:58+0000\n"
 "Last-Translator: James Thorrold <jameslin@inbox.com>\n"
 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-04-14 05:40+0000\n"
-"X-Generator: Launchpad (build 17990)\n"
+"X-Launchpad-Export-Date: 2016-07-30 05:46+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 
 #. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:2
+#: data/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_Authorise"
 
 #. Label beside username entry
-#: ../data/simple-scan.ui.h:4
+#: data/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "_Username for resource:"
 
 #. Label beside password entry
-#: ../data/simple-scan.ui.h:6
+#: data/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Password:"
 
 #. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:8
+#: data/simple-scan.ui:188
 msgid "Front and Back"
 msgstr "Front and Back"
 
 #. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:10
+#: data/simple-scan.ui:192
 msgid "Front"
 msgstr "Front"
 
 #. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:12
+#: data/simple-scan.ui:196
 msgid "Back"
 msgstr "Back"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
-#: ../data/appdata/simple-scan.appdata.xml.in.h:1
+#: data/simple-scan.ui:225 data/simple-scan.ui:809
+#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr "Simple Scan"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:16
+#: data/simple-scan.ui:241
 msgid "_Document"
 msgstr "_Document"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:18
+#: data/simple-scan.ui:260
 msgid "Sc_an"
 msgstr "Sc_an"
 
+#. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:20
+#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
 msgid "Single _Page"
 msgstr "Single _Page"
 
+#. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:22
+#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr "All Pages From _Feeder"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:24
+#: data/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "_Stop Scan"
 
-#: ../data/simple-scan.ui.h:25
+#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
 msgid "Text"
 msgstr "Text"
 
-#: ../data/simple-scan.ui.h:26
+#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
 msgid "Photo"
 msgstr "Photo"
 
 #. Menu item to reorder pages
-#. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1183 ../src/ui.vala:1841
+#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr "Reorder Pages"
 
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: data/simple-scan.ui:367
 msgid "_Email"
 msgstr "_E-mail"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: data/simple-scan.ui:430
 msgid "_Page"
 msgstr "_Page"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: data/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "Rotate _Left"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: data/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "Rotate _Right"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: data/simple-scan.ui:460
 msgid "_Crop"
 msgstr "_Crop"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: data/simple-scan.ui:470
 msgid "_None"
 msgstr "_None"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: data/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: data/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: data/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: data/simple-scan.ui:514
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: data/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: data/simple-scan.ui:536
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: data/simple-scan.ui:547
 msgid "_Custom"
 msgstr "_Custom"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: data/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr "_Rotate Crop"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: data/simple-scan.ui:578
 msgid "Move Left"
 msgstr "Move Left"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: data/simple-scan.ui:587
 msgid "Move Right"
 msgstr "Move Right"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: data/simple-scan.ui:624
 msgid "_Help"
 msgstr "_Help"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: data/simple-scan.ui:632
 msgid "_Contents"
 msgstr "_Contents"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: data/simple-scan.ui:674 data/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "Start a new document"
 
-#: ../data/simple-scan.ui.h:67
+#: data/simple-scan.ui:675
 msgid "New"
 msgstr "New"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: data/simple-scan.ui:689 data/simple-scan.ui:836
 msgid "Scan a single page from the scanner"
 msgstr "Scan a single page from the scanner"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: data/simple-scan.ui:691 data/simple-scan.ui:837
 msgid "Scan"
 msgstr "Scan"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: data/simple-scan.ui:707 data/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "Save document to a file"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1842
+#: data/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "Save"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: data/simple-scan.ui:724 data/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "Stop the current scan"
 
-#: ../data/simple-scan.ui.h:77
+#: data/simple-scan.ui:725 data/simple-scan.ui:825
 msgid "Stop"
 msgstr "Stop"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: data/simple-scan.ui:749 data/simple-scan.ui:936
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Rotate the page to the left (anti-clockwise)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: data/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "Rotate Left"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: data/simple-scan.ui:764 data/simple-scan.ui:914
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Rotate the page to the right (clockwise)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: data/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "Rotate Right"
 
-#: ../data/simple-scan.ui.h:86
+#: data/simple-scan.ui:779 data/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "Crop the selected page"
 
-#: ../data/simple-scan.ui.h:87
+#: data/simple-scan.ui:781
 msgid "Crop"
 msgstr "Crop"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1849
+#: data/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "Preferences"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: data/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "Scan S_ource:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: data/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "_Text Resolution:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: data/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "_Photo Resolution:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: data/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "Scan Side:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: data/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "Page Size:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: data/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "Brightness:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: data/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "Contrast:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: data/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "Quality:"
 
-#: ../data/simple-scan.desktop.in.h:2
+#: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr "Document Scanner"
 
-#: ../data/simple-scan.desktop.in.h:3
+#: data/simple-scan.desktop.in:5
 msgid "Scan Documents"
 msgstr "Scan Documents"
 
-#: ../data/simple-scan.desktop.in.h:4
+#: data/simple-scan.desktop.in:6
 msgid "scan;scanner;flatbed;adf;"
 msgstr "scan;scanner;flatbed;adf;"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Device to scan from"
-msgstr "Device to scan from"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "SANE device to acquire images from."
-msgstr "SANE device to acquire images from."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "Type of document being scanned"
-msgstr "Type of document being scanned"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
-msgid ""
-"Type of document being scanned. This setting decides on the scan resolution, "
-"colors and post-processing."
-msgstr ""
-"Type of document being scanned. This setting decides on the scan resolution, "
-"colours and post-processing."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
-msgid "Width of paper in tenths of a mm"
-msgstr "Width of paper (in tenths of a mm)"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
+#: data/simple-scan.desktop.in:8
+msgid "scanner"
 msgstr ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
-msgid "Height of paper in tenths of a mm"
-msgstr "Height of paper (in tenths of a mm)"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "Brightness of scan"
-msgstr "Brightness of scan"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "The brightness adjustment from -100 to 100 (0 being none)."
-msgstr "The brightness adjustment from -100 to 100 (0 being none)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid "Contrast of scan"
-msgstr "Contrast of scan"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "The contrast adjustment from -100 to 100 (0 being none)."
-msgstr "The contrast adjustment from -100 to 100 (0 being none)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid "Resolution for text scans"
-msgstr "Resolution for text scans"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
-msgid "The resolution in dots-per-inch to use when scanning text."
-msgstr "The resolution in dots-per-inch to use when scanning text."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
-msgid "Resolution for photo scans"
-msgstr "Resolution for photo scans"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr "The resolution in dots-per-inch to use when scanning photos."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
-msgid "Page side to scan"
-msgstr "Page side to scan"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
-msgid "The page side to scan."
-msgstr "The page side to scan."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
-msgid "Directory to save files to"
-msgstr "Directory to save files to"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
-msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
-msgstr "The folder where files are saved. Default is the Documents folder."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
-msgid "Quality value to use for JPEG compression"
-msgstr "Quality value to use for JPEG compression"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Quality value to use for JPEG compression."
-msgstr "Quality value to use for JPEG compression."
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+#: data/simple-scan.appdata.xml.in:8
 msgid ""
 "A really easy way to scan both documents and photos. You can crop out the "
 "bad parts of a photo and rotate it if it is the wrong way round. You can "
@@ -417,198 +321,164 @@ msgstr ""
 "print your scans, export them to PDF or save them in a range of image "
 "formats."
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+#: data/simple-scan.appdata.xml.in:13
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 "Simple Scan uses the SANE framework which supports most existing scanners."
 
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr "No scanners available.  Please connect a scanner."
 
-#. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "Unable to connect to scanner"
 
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "Unable to start scan"
 
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1236 src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr "Error communicating with scanner"
 
-#. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "Show release version"
 
-#. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr "Print debugging messages"
 
-#: ../src/simple-scan.vala:26
+#: src/simple-scan.vala:26
 msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr "Fix PDF files generated with older versions of Simple Scan"
 
-#. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:391
+#: src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Failed to scan"
 
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DEVICE...] - Scanning utility"
 
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Run '%s --help' to see a full list of available command line options."
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:318 src/ui.vala:1602 src/ui.vala:1887
 msgid "_Close"
 msgstr "_Close"
 
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:327
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Username and password required to access '%s'"
 
-#. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:375
 msgid "No scanners detected"
 msgstr "No scanners detected"
 
-#. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:377
 msgid "Please check your scanner is connected and powered on"
 msgstr "Please check your scanner is connected and powered on"
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:382
 msgid "Additional software needed"
 msgstr "Additional software needed"
 
-#. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr "You need to install driver software for your scanner."
 
-#. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:506 src/ui.vala:1843
 msgid "Save As..."
 msgstr "Save As..."
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:509 src/ui.vala:675
 msgid "_Cancel"
 msgstr "_Cancel"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:510 src/ui.vala:676
 msgid "_Save"
 msgstr "_Save"
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "Scanned Document.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:521
 msgid "Image Files"
 msgstr "Image Files"
 
-#. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:527
 msgid "All Files"
 msgstr "All Files"
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (multi-page document)"
 
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (compressed)"
 
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (lossless)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:557
 msgid "File format:"
 msgstr "File format:"
 
-#. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:650
 msgid "Failed to save file"
 msgstr "Failed to save file"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:673
 msgid "If you don't save, changes will be permanently lost."
 msgstr "If you don't save, changes will be permanently lost."
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:708
+#: src/ui.vala:708
 msgid "Save current document?"
 msgstr "Save current document?"
 
-#. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:710
 msgid "Discard Changes"
 msgstr "Discard Changes"
 
-#. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "Unable to save image for preview"
 
-#. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "Unable to open image preview application"
 
-#. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1206
 msgid "Combine sides"
 msgstr "Combine sides"
 
-#. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr "Combine sides (reverse)"
 
-#. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1226
 msgid "Reverse"
 msgstr "Reverse"
 
-#. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr "Keep unchanged"
 
-#. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "Unable to open help file"
 
-#. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1472
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -636,17 +506,15 @@ msgstr ""
 "You should have received a copy of the GNU General Public Licence\n"
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 
-#. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "About Simple Scan"
 
-#. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "Simple document scanning tool"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -660,23 +528,19 @@ msgstr ""
 "  Malcolm Parsons https://launchpad.net/~malcolm-parsons\n"
 "  Tomasz Chabowski https://launchpad.net/~tomasz-chabowski-googlemail"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "Save document before quitting?"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "Quit without Saving"
 
-#. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr "You appear to have a Brother scanner."
 
-#. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1581
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
@@ -684,13 +548,11 @@ msgstr ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
 
-#. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr "You appear to have a Samsung scanner."
 
-#. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1587
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
@@ -698,18 +560,15 @@ msgstr ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
 
-#. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr "You appear to have an HP scanner."
 
-#. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr "You appear to have an Epson scanner."
 
-#. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1598
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
@@ -717,139 +576,125 @@ msgstr ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
 
-#. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1602
 msgid "Install drivers"
 msgstr "Install drivers"
 
-#. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "Once installed, you will need to restart Simple Scan."
 
-#. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr "Installing drivers..."
 
-#. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr "Drivers installed successfully!"
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Failed to install drivers (error code %d)."
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr "Failed to install drivers."
 
-#. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1676
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr "You need to install the %s package(s)."
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (default)"
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (draft)"
 
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (high resolution)"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/ui.vala:1793
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1835
 msgid "New Document"
 msgstr "New Document"
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1840
 msgid "Document"
 msgstr "Document"
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1844
 msgid "Email..."
 msgstr "E-mail..."
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1845
 msgid "Print..."
 msgstr "Print..."
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1853
 msgid "Help"
 msgstr "Help"
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1854
 msgid "About"
 msgstr "About"
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1855
 msgid "Quit"
 msgstr "Quit"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "Change _Scanner"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr "_Install Drivers"
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1897
 msgid "Automatic"
 msgstr "Automatic"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1947
 msgid "Darker"
 msgstr "Darker"
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1949
 msgid "Lighter"
 msgstr "Lighter"
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:1957
 msgid "Less"
 msgstr "Less"
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:1959
 msgid "More"
 msgstr "More"
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:1967
 msgid "Minimum"
 msgstr "Minimum"
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:1969
 msgid "Maximum"
 msgstr "Maximum"
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2008
 msgid "Saving document..."
 msgstr "Saving document..."
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Saving page %d out of %d"
@@ -893,9 +738,15 @@ msgstr "Saving page %d out of %d"
 #~ "  --gtk-module=MODULES            Load additional GTK+ modules\n"
 #~ "  --g-fatal-warnings              Make all warnings fatal"
 
+#~ msgid "Device to scan from"
+#~ msgstr "Device to scan from"
+
 #~ msgid "Direction of scan"
 #~ msgstr "Direction of scan"
 
+#~ msgid "Directory to save files to"
+#~ msgstr "Directory to save files to"
+
 #~ msgid ""
 #~ "The direction of the scanner across the scanned page. It can be one of the "
 #~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
@@ -913,10 +764,23 @@ msgstr "Saving page %d out of %d"
 #~ "The height of scanned image in pixels. This value is updated to the height "
 #~ "of the last image scanned."
 
+#~ msgid "SANE device to acquire images from."
+#~ msgstr "SANE device to acquire images from."
+
+#~ msgid "Resolution for text scans"
+#~ msgstr "Resolution for text scans"
+
+#~ msgid "Resolution for photo scans"
+#~ msgstr "Resolution for photo scans"
+
 #~ msgid "Resolution of last scanned image"
 #~ msgstr "Resolution of last scanned image"
 
 #~ msgid ""
+#~ "The directory to save files to. Defaults to the documents directory if unset."
+#~ msgstr "The folder where files are saved. Default is the Documents folder."
+
+#~ msgid ""
 #~ "The width of scanned image in pixels. This value is updated to what the last "
 #~ "scanned page was."
 #~ msgstr ""
@@ -926,6 +790,9 @@ msgstr "Saving page %d out of %d"
 #~ msgid "The resolution in dots-per-inch of the previously scanned image."
 #~ msgstr "The resolution of the last image scanned (in dots-per-inch)."
 
+#~ msgid "Type of document being scanned"
+#~ msgstr "Type of document being scanned"
+
 #~ msgid ""
 #~ "Type of document being scanned. 'text' for text documents, 'photo' for "
 #~ "photos. This setting decides on the scan resolution, colors and post-"
@@ -966,13 +833,70 @@ msgstr "Saving page %d out of %d"
 #~ "  --help-all                      Show all help options\n"
 #~ "  --help-gtk                      Show GTK+ options"
 
+#~ msgid "The resolution in dots-per-inch to use when scanning text."
+#~ msgstr "The resolution in dots-per-inch to use when scanning text."
+
+#~ msgid "The resolution in dots-per-inch to use when scanning photos."
+#~ msgstr "The resolution in dots-per-inch to use when scanning photos."
+
 #~ msgid ""
 #~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
 #~ msgstr ""
 #~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
 
+#~ msgid ""
+#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr ""
+#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+
+#~ msgid "Page side to scan"
+#~ msgstr "Page side to scan"
+
+#~ msgid ""
+#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr ""
+#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+
+#~ msgid "The page side to scan."
+#~ msgstr "The page side to scan."
+
+#~ msgid ""
+#~ "Type of document being scanned. This setting decides on the scan resolution, "
+#~ "colors and post-processing."
+#~ msgstr ""
+#~ "Type of document being scanned. This setting decides on the scan resolution, "
+#~ "colours and post-processing."
+
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "The direction of the scanner across the scanned page."
 
+#~ msgid "Height of paper in tenths of a mm"
+#~ msgstr "Height of paper (in tenths of a mm)"
+
 #~ msgid "Height of scanned image in pixels"
 #~ msgstr "Height of scanned image (in pixels)"
+
+#~ msgid "Width of paper in tenths of a mm"
+#~ msgstr "Width of paper (in tenths of a mm)"
+
+#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
+#~ msgstr "The contrast adjustment from -100 to 100 (0 being none)."
+
+#~ msgid "Contrast of scan"
+#~ msgstr "Contrast of scan"
+
+#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
+#~ msgstr "The brightness adjustment from -100 to 100 (0 being none)."
+
+#~ msgid "Brightness of scan"
+#~ msgstr "Brightness of scan"
+
+#~ msgid "Quality value to use for JPEG compression."
+#~ msgstr "Quality value to use for JPEG compression."
+
+#~ msgid "Quality value to use for JPEG compression"
+#~ msgstr "Quality value to use for JPEG compression"
diff --git a/po/eo.gmo b/po/eo.gmo
new file mode 100644
index 0000000..9a6aee6
--- /dev/null
+++ b/po/eo.gmo
diff --git a/po/eo.po b/po/eo.po
index 4ac3a43..d49c8ef 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -7,406 +7,310 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-06 14:16+1200\n"
+"POT-Creation-Date: 2016-07-29 12:47+1200\n"
 "PO-Revision-Date: 2015-06-06 14:32+0000\n"
 "Last-Translator: Manuel Ortega <manuel@grupolasindias.coop>\n"
 "Language-Team: Esperanto\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-04-14 05:39+0000\n"
-"X-Generator: Launchpad (build 17990)\n"
+"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 "Language: eo\n"
 
 #. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:2
+#: data/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "R_ajtigi"
 
 #. Label beside username entry
-#: ../data/simple-scan.ui.h:4
+#: data/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "Sal_utnomo por risurco:"
 
 #. Label beside password entry
-#: ../data/simple-scan.ui.h:6
+#: data/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Pasvorto:"
 
 #. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:8
+#: data/simple-scan.ui:188
 msgid "Front and Back"
 msgstr "Antaŭo kaj malantaŭo"
 
 #. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:10
+#: data/simple-scan.ui:192
 msgid "Front"
 msgstr "Antaŭo"
 
 #. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:12
+#: data/simple-scan.ui:196
 msgid "Back"
 msgstr "Dorso"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
-#: ../data/appdata/simple-scan.appdata.xml.in.h:1
+#: data/simple-scan.ui:225 data/simple-scan.ui:809
+#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr "Simpla skano"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:16
+#: data/simple-scan.ui:241
 msgid "_Document"
 msgstr "_Dokumento"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:18
+#: data/simple-scan.ui:260
 msgid "Sc_an"
 msgstr "Sk_ani"
 
+#. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:20
+#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
 msgid "Single _Page"
 msgstr "Unuopa _paĝo"
 
+#. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:22
+#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr "Ĉiuj paĝoj el _papero-metilo"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:24
+#: data/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "Haltigi _skani"
 
-#: ../data/simple-scan.ui.h:25
+#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
 msgid "Text"
 msgstr "Teksto"
 
-#: ../data/simple-scan.ui.h:26
+#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
 msgid "Photo"
 msgstr "Foto"
 
 #. Menu item to reorder pages
-#. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1183 ../src/ui.vala:1841
+#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr "Reordigi paĝojn"
 
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: data/simple-scan.ui:367
 msgid "_Email"
 msgstr "R_etpoŝto"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: data/simple-scan.ui:430
 msgid "_Page"
 msgstr "_Paĝo"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: data/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "Turni _maldekstren"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: data/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "Turni _dekstren"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: data/simple-scan.ui:460
 msgid "_Crop"
 msgstr "Stu_ci"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: data/simple-scan.ui:470
 msgid "_None"
 msgstr "_Neniu"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: data/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: data/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: data/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: data/simple-scan.ui:514
 msgid "_Letter"
 msgstr "US _Letter"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: data/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "US Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: data/simple-scan.ui:536
 msgid "4×6"
 msgstr "4 × 6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: data/simple-scan.ui:547
 msgid "_Custom"
 msgstr "_Propre"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: data/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr "_Rotacii la stoco-lokon"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: data/simple-scan.ui:578
 msgid "Move Left"
 msgstr "Movi maldekstren"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: data/simple-scan.ui:587
 msgid "Move Right"
 msgstr "Movi dekstren"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: data/simple-scan.ui:624
 msgid "_Help"
 msgstr "_Helpo"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: data/simple-scan.ui:632
 msgid "_Contents"
 msgstr "_Enhavo"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: data/simple-scan.ui:674 data/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "Komenci novan dokumenton"
 
-#: ../data/simple-scan.ui.h:67
+#: data/simple-scan.ui:675
 msgid "New"
 msgstr "Nova"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: data/simple-scan.ui:689 data/simple-scan.ui:836
 msgid "Scan a single page from the scanner"
 msgstr "Skani unuopan paĝon el la skanilo"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: data/simple-scan.ui:691 data/simple-scan.ui:837
 msgid "Scan"
 msgstr "Skani"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: data/simple-scan.ui:707 data/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "Konservi dokumenton en dosiero"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1842
+#: data/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "Konservi"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: data/simple-scan.ui:724 data/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "Haltigi la aktualan skanon"
 
-#: ../data/simple-scan.ui.h:77
+#: data/simple-scan.ui:725 data/simple-scan.ui:825
 msgid "Stop"
 msgstr "Haltigi"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: data/simple-scan.ui:749 data/simple-scan.ui:936
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Rotacii la paĝon maldekstren (maldekstrume)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: data/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "Turni maldekstren"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: data/simple-scan.ui:764 data/simple-scan.ui:914
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Rotacci la paĝon dekstren (dekstrume)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: data/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "Turni dekstren"
 
-#: ../data/simple-scan.ui.h:86
+#: data/simple-scan.ui:779 data/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "Stuci la elektitan paĝon"
 
-#: ../data/simple-scan.ui.h:87
+#: data/simple-scan.ui:781
 msgid "Crop"
 msgstr "Stuci"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1849
+#: data/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "Agordoj"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: data/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "Skano-f_onto:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: data/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "_Teksta distingivo"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: data/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "_Fotaĵa distingivo:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: data/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "Skano-flanko:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: data/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "Paĝo-grando:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: data/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "Brileco:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: data/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "Kontrasto:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: data/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "Kvalito:"
 
-#: ../data/simple-scan.desktop.in.h:2
+#: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr "Dokumentoskanilo"
 
-#: ../data/simple-scan.desktop.in.h:3
+#: data/simple-scan.desktop.in:5
 msgid "Scan Documents"
 msgstr "Skani dokumentojn"
 
-#: ../data/simple-scan.desktop.in.h:4
+#: data/simple-scan.desktop.in:6
 msgid "scan;scanner;flatbed;adf;"
 msgstr "skani;skanilo;plata;adf;"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Device to scan from"
-msgstr "La aparato el kiu skani"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "SANE device to acquire images from."
-msgstr "SANE aparato de kiu akiri bildojn."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "Type of document being scanned"
-msgstr "Speco de dokumento kiu estas skanata"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
-msgid ""
-"Type of document being scanned. This setting decides on the scan resolution, "
-"colors and post-processing."
+#: data/simple-scan.desktop.in:8
+msgid "scanner"
 msgstr ""
-"La skanota dokumentspeco. Ĉi tiu agordo difinas la skandistingivon, -"
-"kolorojn kaj -posttraktadon."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
-msgid "Width of paper in tenths of a mm"
-msgstr "Larĝo de papero en dekonaj millimetroj"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-"La larĝo de la papero en dekonoj de millimetro (aŭ 0 por aŭtomata detekti)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
-msgid "Height of paper in tenths of a mm"
-msgstr "Alto de Papero en dekonaj millimetroj"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-"La alto de la papero en dekonoj de millimetro (aŭ 0 por aŭtomata detekti)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "Brightness of scan"
-msgstr "Skanbrileco"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "The brightness adjustment from -100 to 100 (0 being none)."
-msgstr "Agordo de la brileco de -100 al 100 (0 egalas al neagordo)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid "Contrast of scan"
-msgstr "Skankontrasto"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "The contrast adjustment from -100 to 100 (0 being none)."
-msgstr "Agordo de kontrasto de -100 al 100 (0 egalas al neagordo)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid "Resolution for text scans"
-msgstr "Distingivo por tekstoskanoj"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
-msgid "The resolution in dots-per-inch to use when scanning text."
-msgstr "La distingvo en punktoj en coloj uzi kiam skanantaj teksto."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
-msgid "Resolution for photo scans"
-msgstr "Distingivo por fotoskanoj"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr "La distingvo en punktoj en coloj uzi kiam skanantaj fotoj."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
-msgid "Page side to scan"
-msgstr "Paĝoflankon skani"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
-msgid "The page side to scan."
-msgstr "La skanota paĝoflanko"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
-msgid "Directory to save files to"
-msgstr "Dosierujo al kiu konservi"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
-msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
-msgstr ""
-"La dosierujo al kiu konservi dosierojn.  La dokumentoj dosierujo estas la "
-"defaŭlto, se malagordi."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
-msgid "Quality value to use for JPEG compression"
-msgstr "Kvalito por JPEG-densigo"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Quality value to use for JPEG compression."
-msgstr "Kvalito por JPEG-densigo"
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+#: data/simple-scan.appdata.xml.in:8
 msgid ""
 "A really easy way to scan both documents and photos. You can crop out the "
 "bad parts of a photo and rotate it if it is the wrong way round. You can "
@@ -414,197 +318,163 @@ msgid ""
 "formats."
 msgstr ""
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+#: data/simple-scan.appdata.xml.in:13
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Neniuj skaniloj disponeblaj.  Bonvolu konekti skanilon."
 
-#. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "Ne povas konekto kun skanilo"
 
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "Ne povas komenci skani"
 
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1236 src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr "Eraro kiam konektanta kun skanilo"
 
-#. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "Montri eldonversion"
 
-#. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr "Presi mesaĝojn pri sencimigo"
 
-#: ../src/simple-scan.vala:26
+#: src/simple-scan.vala:26
 msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr "Ripari PDF-dosierojn generitajn per antaŭaj versioj de Simple Scan"
 
-#. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:391
+#: src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Ne sukcesi skani"
 
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[APARATO...] - Skanutilaĵo"
 
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Lanĉu '%s --help' por vidi plenan liston da disponeblaj komandliniaj opcioj."
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:318 src/ui.vala:1602 src/ui.vala:1887
 msgid "_Close"
 msgstr "_Fermi"
 
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:327
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Salutnomo kaj pasvorto estas necesa aliri '%s'"
 
-#. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:375
 msgid "No scanners detected"
 msgstr "Neniuj skaniloj eltrovis"
 
-#. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:377
 msgid "Please check your scanner is connected and powered on"
 msgstr "Bonvolu kontrolas ke via skanilo estas kenekta kaj kurentŝalta"
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:382
 msgid "Additional software needed"
 msgstr ""
 
-#. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr ""
 
-#. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:506 src/ui.vala:1843
 msgid "Save As..."
 msgstr "Konservi kiel..."
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:509 src/ui.vala:675
 msgid "_Cancel"
 msgstr "_Nuligi"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:510 src/ui.vala:676
 msgid "_Save"
 msgstr "Kon_servi"
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "Skanita Dokumento.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:521
 msgid "Image Files"
 msgstr "Bildo-dosieroj"
 
-#. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:527
 msgid "All Files"
 msgstr "Ĉiuj dosieroj"
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (multpaĝa dokumento)"
 
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (densigita)"
 
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (senperda)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:557
 msgid "File format:"
 msgstr ""
 
-#. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:650
 msgid "Failed to save file"
 msgstr "Ne sukcesis konservi la dosieron"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:673
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Se vi ne konservas, ŝanĝoj estos perditaj permanente."
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:708
+#: src/ui.vala:708
 msgid "Save current document?"
 msgstr "Konservi la nunan dokumenton?"
 
-#. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:710
 msgid "Discard Changes"
 msgstr "Forlasi Ŝanĝojn"
 
-#. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "Ne eblas konservi bildon por antaŭrigardo"
 
-#. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "Ne eblis malfermi bild-dosieron"
 
-#. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1206
 msgid "Combine sides"
 msgstr "Kombini flankojn"
 
-#. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr "Kombini flankojn"
 
-#. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1226
 msgid "Reverse"
 msgstr "Inversigi"
 
-#. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr "Konservi senŝanĝa"
 
-#. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "Ne eblis malfermi help-dosieron"
 
-#. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1472
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -633,17 +503,15 @@ msgstr ""
 "al vi kun ĉi tiu programo; se vi ĝin ne ricevis, turnu vin al "
 "<http://www.gnu.org/licenses/>."
 
-#. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "Pri simpla skani"
 
-#. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "Simpla ilo por skanantaj dokumentoj"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -656,190 +524,167 @@ msgstr ""
 "  Robert Ancell https://launchpad.net/~robert-ancell\n"
 "  Tiffany Antopolski https://launchpad.net/~mimico-tiffany"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "Konservi dokumenton antaŭe ĉesanta?"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "Fini sen konservanta"
 
-#. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
-#. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1581
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
 msgstr ""
 
-#. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
-#. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1587
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
 msgstr ""
 
-#. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr ""
 
-#. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
-#. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1598
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
 msgstr ""
 
-#. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1602
 msgid "Install drivers"
 msgstr ""
 
-#. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
-#. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr ""
 
-#. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr ""
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr ""
 
-#. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1676
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr ""
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d punktoj en colo (defaŭlto)"
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d punktoj en colo (malneto)"
 
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d punktoj en colo (alta distingivo)"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/ui.vala:1793
 #, c-format
 msgid "%d dpi"
 msgstr "%d punktoj en colo"
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1835
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1840
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1844
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1845
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1853
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1854
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1855
 msgid "Quit"
 msgstr ""
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "Ŝanĝi _Skanilo"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr ""
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1897
 msgid "Automatic"
 msgstr "Aŭtomata"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1947
 msgid "Darker"
 msgstr "Pli malhele"
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1949
 msgid "Lighter"
 msgstr "Pli hele"
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:1957
 msgid "Less"
 msgstr "Malpli"
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:1959
 msgid "More"
 msgstr "Pli"
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:1967
 msgid "Minimum"
 msgstr "Minimume"
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:1969
 msgid "Maximum"
 msgstr "Maksimume"
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2008
 msgid "Saving document..."
 msgstr "Konservado de dokumento..."
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Konservado de paĝo %d el %d"
@@ -847,15 +692,36 @@ msgstr "Konservado de paĝo %d el %d"
 #~ msgid "4&#xD7;6"
 #~ msgstr "4&#xD7;6"
 
+#~ msgid "Resolution for photo scans"
+#~ msgstr "Distingivo por fotoskanoj"
+
+#~ msgid "Resolution for text scans"
+#~ msgstr "Distingivo por tekstoskanoj"
+
+#~ msgid "Device to scan from"
+#~ msgstr "La aparato el kiu skani"
+
 #~ msgid "Direction of scan"
 #~ msgstr "Direkto de skani"
 
+#~ msgid "Directory to save files to"
+#~ msgstr "Dosierujo al kiu konservi"
+
+#~ msgid "Height of paper in tenths of a mm"
+#~ msgstr "Alto de Papero en dekonaj millimetroj"
+
 #~ msgid "Height of scanned image in pixels"
 #~ msgstr "Alto de skaninta bildo en rastrumeroj"
 
+#~ msgid "Page side to scan"
+#~ msgstr "Paĝoflankon skani"
+
 #~ msgid "Resolution of last scanned image"
 #~ msgstr "Distingivo de bildon skaninta antaŭe"
 
+#~ msgid "SANE device to acquire images from."
+#~ msgstr "SANE aparato de kiu akiri bildojn."
+
 #~ msgid "TRUE if the application window is maximized"
 #~ msgstr "VERA se la apliko-fenestro estas maksimumigita"
 
@@ -867,6 +733,12 @@ msgstr "Konservado de paĝo %d el %d"
 #~ "malsupren' 'malsupre-supren' 'maldekstre-dekstre' 'dekstre-maldekstren'"
 
 #~ msgid ""
+#~ "The directory to save files to. Defaults to the documents directory if unset."
+#~ msgstr ""
+#~ "La dosierujo al kiu konservi dosierojn.  La dokumentoj dosierujo estas la "
+#~ "defaŭlto, se malagordi."
+
+#~ msgid ""
 #~ "The height of scanned image in pixels. This value is updated to what the "
 #~ "last scanned page was."
 #~ msgstr ""
@@ -874,6 +746,12 @@ msgstr "Konservado de paĝo %d el %d"
 #~ "al tion de la paĝo antaŭa."
 
 #~ msgid ""
+#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr ""
+#~ "La alto de la papero en dekonoj de millimetro (aŭ 0 por aŭtomata detekti)."
+
+#~ msgid ""
 #~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
 #~ msgstr ""
 #~ "La flanko de paĝo skani.  Povas esti unu el ĉi tiuj: 'ambaŭ' 'antaŭa' "
@@ -883,6 +761,12 @@ msgstr "Konservado de paĝo %d el %d"
 #~ msgstr ""
 #~ "La distingivo en punktoj en coloj de la bildo kiu estis skanita antaŭe."
 
+#~ msgid "The resolution in dots-per-inch to use when scanning photos."
+#~ msgstr "La distingvo en punktoj en coloj uzi kiam skanantaj fotoj."
+
+#~ msgid "The resolution in dots-per-inch to use when scanning text."
+#~ msgstr "La distingvo en punktoj en coloj uzi kiam skanantaj teksto."
+
 #~ msgid ""
 #~ "The width of scanned image in pixels. This value is updated to what the last "
 #~ "scanned page was."
@@ -891,6 +775,15 @@ msgstr "Konservado de paĝo %d el %d"
 #~ "ĝisdatigita al tion de la paĝo antaŭa."
 
 #~ msgid ""
+#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr ""
+#~ "La larĝo de la papero en dekonoj de millimetro (aŭ 0 por aŭtomata detekti)."
+
+#~ msgid "Type of document being scanned"
+#~ msgstr "Speco de dokumento kiu estas skanata"
+
+#~ msgid ""
 #~ "Type of document being scanned. 'text' for text documents, 'photo' for "
 #~ "photos. This setting decides on the scan resolution, colors and post-"
 #~ "processing."
@@ -899,6 +792,9 @@ msgstr "Konservado de paĝo %d el %d"
 #~ "por bildoj.  Ĉi tio agordo decidas pri la distingvo, koloroj kaj "
 #~ "posttraktanta."
 
+#~ msgid "Width of paper in tenths of a mm"
+#~ msgstr "Larĝo de papero en dekonaj millimetroj"
+
 #~ msgid "Width of scanned image in pixels"
 #~ msgstr "Larĝo de skaninta bildo en rastrumeroj"
 
@@ -965,5 +861,33 @@ msgstr "Konservado de paĝo %d el %d"
 #~ msgid "Please check your installation"
 #~ msgstr "Bonvolu kontroli vian instalaĵon"
 
+#~ msgid "The page side to scan."
+#~ msgstr "La skanota paĝoflanko"
+
+#~ msgid ""
+#~ "Type of document being scanned. This setting decides on the scan resolution, "
+#~ "colors and post-processing."
+#~ msgstr ""
+#~ "La skanota dokumentspeco. Ĉi tiu agordo difinas la skandistingivon, -"
+#~ "kolorojn kaj -posttraktadon."
+
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "La direkto de la skanilo trans la skanota paĝo"
+
+#~ msgid "Contrast of scan"
+#~ msgstr "Skankontrasto"
+
+#~ msgid "Brightness of scan"
+#~ msgstr "Skanbrileco"
+
+#~ msgid "Quality value to use for JPEG compression."
+#~ msgstr "Kvalito por JPEG-densigo"
+
+#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
+#~ msgstr "Agordo de kontrasto de -100 al 100 (0 egalas al neagordo)."
+
+#~ msgid "Quality value to use for JPEG compression"
+#~ msgstr "Kvalito por JPEG-densigo"
+
+#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
+#~ msgstr "Agordo de la brileco de -100 al 100 (0 egalas al neagordo)."
diff --git a/po/es.gmo b/po/es.gmo
new file mode 100644
index 0000000..4a82379
--- /dev/null
+++ b/po/es.gmo
diff --git a/po/es.po b/po/es.po
index d7be11e..9118ad5 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,406 +7,309 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-06 14:16+1200\n"
+"POT-Creation-Date: 2016-07-29 12:47+1200\n"
 "PO-Revision-Date: 2016-03-25 14:07+0000\n"
 "Last-Translator: Adolfo Jayme <fitoschido@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-04-14 05:40+0000\n"
-"X-Generator: Launchpad (build 17990)\n"
+"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 
 #. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:2
+#: data/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_Autorizar"
 
 #. Label beside username entry
-#: ../data/simple-scan.ui.h:4
+#: data/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "Nombre de _usuario para el recurso:"
 
 #. Label beside password entry
-#: ../data/simple-scan.ui.h:6
+#: data/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Contraseña:"
 
 #. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:8
+#: data/simple-scan.ui:188
 msgid "Front and Back"
 msgstr "Anverso y reverso"
 
 #. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:10
+#: data/simple-scan.ui:192
 msgid "Front"
 msgstr "Anverso"
 
 #. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:12
+#: data/simple-scan.ui:196
 msgid "Back"
 msgstr "Reverso"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
-#: ../data/appdata/simple-scan.appdata.xml.in.h:1
+#: data/simple-scan.ui:225 data/simple-scan.ui:809
+#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr "Simple Scan"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:16
+#: data/simple-scan.ui:241
 msgid "_Document"
 msgstr "_Documento"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:18
+#: data/simple-scan.ui:260
 msgid "Sc_an"
 msgstr "Esc_anear"
 
+#. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:20
+#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
 msgid "Single _Page"
 msgstr "_Una página"
 
+#. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:22
+#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr "Todas las páginas del _alimentador"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:24
+#: data/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "D_etener escaneado"
 
-#: ../data/simple-scan.ui.h:25
+#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
 msgid "Text"
 msgstr "Texto"
 
-#: ../data/simple-scan.ui.h:26
+#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
 msgid "Photo"
 msgstr "Foto"
 
 #. Menu item to reorder pages
-#. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1183 ../src/ui.vala:1841
+#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr "Reordenar las páginas"
 
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: data/simple-scan.ui:367
 msgid "_Email"
 msgstr "_Correo"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: data/simple-scan.ui:430
 msgid "_Page"
 msgstr "_Página"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: data/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "Girar a la i_zquierda"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: data/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "Girar a la _derecha"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: data/simple-scan.ui:460
 msgid "_Crop"
 msgstr "_Recortar"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: data/simple-scan.ui:470
 msgid "_None"
 msgstr "_Ninguno"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: data/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: data/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: data/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: data/simple-scan.ui:514
 msgid "_Letter"
 msgstr "_Carta"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: data/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "_Oficio"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: data/simple-scan.ui:536
 msgid "4×6"
 msgstr "4 × 6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: data/simple-scan.ui:547
 msgid "_Custom"
 msgstr "_Personalizado"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: data/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr "_Girar recorte"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: data/simple-scan.ui:578
 msgid "Move Left"
 msgstr "Mover a la izquierda"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: data/simple-scan.ui:587
 msgid "Move Right"
 msgstr "Mover a la derecha"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: data/simple-scan.ui:624
 msgid "_Help"
 msgstr "Ay_uda"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: data/simple-scan.ui:632
 msgid "_Contents"
 msgstr "_Contenido"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: data/simple-scan.ui:674 data/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "Crear un documento nuevo"
 
-#: ../data/simple-scan.ui.h:67
+#: data/simple-scan.ui:675
 msgid "New"
 msgstr "Nuevo"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: data/simple-scan.ui:689 data/simple-scan.ui:836
 msgid "Scan a single page from the scanner"
 msgstr "Escanear una sola página desde el escáner"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: data/simple-scan.ui:691 data/simple-scan.ui:837
 msgid "Scan"
 msgstr "Escanear"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: data/simple-scan.ui:707 data/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "Guardar documento a un archivo"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1842
+#: data/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "Guardar"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: data/simple-scan.ui:724 data/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "Detiene el escaneado actual"
 
-#: ../data/simple-scan.ui.h:77
+#: data/simple-scan.ui:725 data/simple-scan.ui:825
 msgid "Stop"
 msgstr "Detener"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: data/simple-scan.ui:749 data/simple-scan.ui:936
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Girar la página a la izquierda (contrario a las agujas del reloj)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: data/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "Girar a la izquierda"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: data/simple-scan.ui:764 data/simple-scan.ui:914
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Girar la página a la derecha (sentido de las agujas del reloj)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: data/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "Girar a la derecha"
 
-#: ../data/simple-scan.ui.h:86
+#: data/simple-scan.ui:779 data/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "Recortar la página seleccionada"
 
-#: ../data/simple-scan.ui.h:87
+#: data/simple-scan.ui:781
 msgid "Crop"
 msgstr "Recortar"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1849
+#: data/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "Preferencias"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: data/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "_Origen de escaneo:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: data/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "Resolución de _texto:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: data/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "Resolución de _fotografía:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: data/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "Cara a escanear:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: data/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "Tamaño de página:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: data/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "Brillo:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: data/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "Contraste:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: data/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "Calidad:"
 
-#: ../data/simple-scan.desktop.in.h:2
+#: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr "Escáner de documentos"
 
-#: ../data/simple-scan.desktop.in.h:3
+#: data/simple-scan.desktop.in:5
 msgid "Scan Documents"
 msgstr "Escanear documentos"
 
-#: ../data/simple-scan.desktop.in.h:4
+#: data/simple-scan.desktop.in:6
 msgid "scan;scanner;flatbed;adf;"
 msgstr "escanear;escáner;plano;adf;"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Device to scan from"
-msgstr "Para escanear desde el dispositivo"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "SANE device to acquire images from."
-msgstr "Dispositivo SANE desde donde adquirir las imágenes."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "Type of document being scanned"
-msgstr "Tipo de documento que está siendo escaneado"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
-msgid ""
-"Type of document being scanned. This setting decides on the scan resolution, "
-"colors and post-processing."
+#: data/simple-scan.desktop.in:8
+msgid "scanner"
 msgstr ""
-"Tipo de documento escaneándose. Esta configuración establece la resolución "
-"de escaneo, colores y post-procesamiento."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
-msgid "Width of paper in tenths of a mm"
-msgstr "Anchura del papel en décimas de mm"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-"La anchura del papel en décimas de mm (0 para detección automática del "
-"papel)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
-msgid "Height of paper in tenths of a mm"
-msgstr "Altura del papel en décimas de mm"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-"La altura del papel en décimas de mm (0 para detección automática del papel)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "Brightness of scan"
-msgstr "Brillo de escaneo"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "The brightness adjustment from -100 to 100 (0 being none)."
-msgstr "Ajuste del brillo desde -100 a 100 (siendo 0 sin ajuste)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid "Contrast of scan"
-msgstr "Contraste del escaneo"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "The contrast adjustment from -100 to 100 (0 being none)."
-msgstr "Ajuste de contraste desde -100 a 100 (siendo 0 sin ajuste)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid "Resolution for text scans"
-msgstr "Resolución para los escaneados de texto"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
-msgid "The resolution in dots-per-inch to use when scanning text."
-msgstr "La resolución en puntos por pulgada a usar al escanear texto."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
-msgid "Resolution for photo scans"
-msgstr "Resolución para los escaneados de fotografías"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr "La resolución en puntos por pulgada a usar al escanear fotografías."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
-msgid "Page side to scan"
-msgstr "Cara a escanear de la página"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
-msgid "The page side to scan."
-msgstr "El lado de la página a escanear."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
-msgid "Directory to save files to"
-msgstr "Directorio en el que guardar los archivos"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
-msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
-msgstr ""
-"El directorio en el que se guardarán los archivos. Por defecto será el "
-"directorio de documentos."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
-msgid "Quality value to use for JPEG compression"
-msgstr "Calidad de la compresión de JPEG"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Quality value to use for JPEG compression."
-msgstr "Calidad de la compresión de JPEG."
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+#: data/simple-scan.appdata.xml.in:8
 msgid ""
 "A really easy way to scan both documents and photos. You can crop out the "
 "bad parts of a photo and rotate it if it is the wrong way round. You can "
@@ -418,201 +321,167 @@ msgstr ""
 "imprimir las digitalizaciones, exportarlas a PDF o guardarlas en diversos "
 "formatos de imagen."
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+#: data/simple-scan.appdata.xml.in:13
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 "Simple Scan emplea el marco SANE para compatibilidad con la mayoría de los "
 "escáneres existentes."
 
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr "No hay escáneres disponibles. Conecte un escáner."
 
-#. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "No se pudo conectar al escáner"
 
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "Incapaz de iniciar el escaneo"
 
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1236 src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr "Error al comunicarse con el escáner"
 
-#. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "Mostrar el número de versión"
 
-#. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr "Mostrar mensajes de depuración"
 
-#: ../src/simple-scan.vala:26
+#: src/simple-scan.vala:26
 msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr ""
 "Arreglar archivos PDF generados con versiones anteriores de Simple Scan"
 
-#. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:391
+#: src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Falló al escanear"
 
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DISPOSITIVO…] - Utilidad de escaneo"
 
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Ejecute «%s --help» para ver una lista completa de las opciones de línea de "
 "órdenes disponibles."
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:318 src/ui.vala:1602 src/ui.vala:1887
 msgid "_Close"
 msgstr "_Cerrar"
 
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:327
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Usuario y contraseña necesarios para acceder a «%s»"
 
-#. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:375
 msgid "No scanners detected"
 msgstr "No se detectó ningún escáner"
 
-#. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:377
 msgid "Please check your scanner is connected and powered on"
 msgstr "Compruebe que su escáner está encendido y conectado"
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:382
 msgid "Additional software needed"
 msgstr "Se necesita software adicional"
 
-#. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr "Es necesario instalar controladores para el escáner."
 
-#. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:506 src/ui.vala:1843
 msgid "Save As..."
 msgstr "Guardar como…"
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:509 src/ui.vala:675
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:510 src/ui.vala:676
 msgid "_Save"
 msgstr "_Guardar"
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "Documento escaneado.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:521
 msgid "Image Files"
 msgstr "Archivos de imagen"
 
-#. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:527
 msgid "All Files"
 msgstr "Todos los archivos"
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (documento multipágina)"
 
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (comprimido)"
 
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (sin pérdida)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:557
 msgid "File format:"
 msgstr "Formato de archivo:"
 
-#. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:650
 msgid "Failed to save file"
 msgstr "Falló al guardar el archivo"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:673
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Los cambios se perderán permanentemente si no los guarda."
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:708
+#: src/ui.vala:708
 msgid "Save current document?"
 msgstr "¿Guardar el documento actual?"
 
-#. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:710
 msgid "Discard Changes"
 msgstr "Descartar cambios"
 
-#. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "No se pudo guardar la imagen para previsualización"
 
-#. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "No se puede abrir la aplicación de previsualización de imágenes"
 
-#. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1206
 msgid "Combine sides"
 msgstr "Combinar lados"
 
-#. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr "Combinar lados (invertido)"
 
-#. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1226
 msgid "Reverse"
 msgstr "Invertir"
 
-#. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr "Mantener sin cambios"
 
-#. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "No se pudo abrir el archivo de ayuda"
 
-#. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1472
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -640,17 +509,15 @@ msgstr ""
 "Debe haber recibido una copia de la Licencia Pública General de GNU\n"
 "con este programa. Si no fuera así, vea <http://www.gnu.org/licenses/>."
 
-#. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "Acerca de Simple Scan"
 
-#. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "Herramienta sencilla para escanear documentos"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -664,9 +531,7 @@ msgstr ""
 "  FAMM https://launchpad.net/~famm94-deactivatedaccount\n"
 "  Fco. Javier Serrador https://launchpad.net/~serrador-tecknolabs\n"
 "  Genesis Bustamante https://launchpad.net/~genmarc\n"
-"  Guillermo RP https://launchpad.net/~guille-arp\n"
 "  Jonay https://launchpad.net/~jonay-santana\n"
-"  Jose Luis Tirado https://launchpad.net/~txelu70\n"
 "  Julian Alarcon https://launchpad.net/~alarconj\n"
 "  Martin Albisetti https://launchpad.net/~beuno\n"
 "  Monkey https://launchpad.net/~monkey-libre\n"
@@ -681,23 +546,19 @@ msgstr ""
 "  fosk https://launchpad.net/~oscarrdg\n"
 "  hhlp https://launchpad.net/~hhlp-deactivatedaccount"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "¿Guardar el documento antes de salir?"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "Salir sin guardar"
 
-#. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr "Parece que tiene un escáner Brother."
 
-#. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1581
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
@@ -705,13 +566,11 @@ msgstr ""
 "En el <a href=\"http://support.brother.com\">sitio web de Brother</a> "
 "encontrará controladores."
 
-#. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr "Parece que tiene un escáner Samsung."
 
-#. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1587
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
@@ -719,18 +578,15 @@ msgstr ""
 "En el <a href=\"http://samsung.com/support\">sitio web de Samsung</a> "
 "encontrará controladores."
 
-#. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr "Parece que tiene un escáner HP."
 
-#. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr "Parece que tiene un escáner Epson."
 
-#. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1598
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
@@ -738,139 +594,125 @@ msgstr ""
 "Visite el <a href=\"http://support.epson.com\">sitio web de Epson</a> para "
 "encontrar controladores."
 
-#. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1602
 msgid "Install drivers"
 msgstr "Instalación de controladores"
 
-#. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "Cuando finalice la instalación deberá reiniciar Simple Scan."
 
-#. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr "Instalando los controladores…"
 
-#. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr "Los controladores se instalaron correctamente."
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Falló la instalación de los controladores (cód. de error: %d)"
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr "Falló la instalación de los controladores."
 
-#. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1676
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr "Necesita instalar el paquete %s."
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d ppp (predeterminado)"
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d ppp (borrador)"
 
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d ppp (alta resolución)"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/ui.vala:1793
 #, c-format
 msgid "%d dpi"
 msgstr "%d ppp"
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1835
 msgid "New Document"
 msgstr "Documento nuevo"
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1840
 msgid "Document"
 msgstr "Documento"
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1844
 msgid "Email..."
 msgstr "Correo..."
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1845
 msgid "Print..."
 msgstr "Imprimir…"
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1853
 msgid "Help"
 msgstr "Ayuda"
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1854
 msgid "About"
 msgstr "Acerca de"
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1855
 msgid "Quit"
 msgstr "Salir"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "Cambiar _escáner"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr "_Instalar controladores"
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1897
 msgid "Automatic"
 msgstr "Automático"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1947
 msgid "Darker"
 msgstr "Más oscuro"
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1949
 msgid "Lighter"
 msgstr "Más claro"
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:1957
 msgid "Less"
 msgstr "Menos"
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:1959
 msgid "More"
 msgstr "Más"
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:1967
 msgid "Minimum"
 msgstr "Mínima"
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:1969
 msgid "Maximum"
 msgstr "Máxima"
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2008
 msgid "Saving document..."
 msgstr "Guardando el documento…"
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Guardando la página %d de %d"
@@ -921,6 +763,9 @@ msgstr "Guardando la página %d de %d"
 #~ msgid "Height of scanned image in pixels"
 #~ msgstr "Altura de la imagen escaneada en píxeles"
 
+#~ msgid "Device to scan from"
+#~ msgstr "Para escanear desde el dispositivo"
+
 #~ msgid ""
 #~ "The direction of the scanner across the scanned page. It can be one of the "
 #~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
@@ -929,6 +774,9 @@ msgstr "Guardando la página %d de %d"
 #~ "cualquiera de los siguientes: 'top-to-bottom' 'bottom-to-top' 'left-to-"
 #~ "right' 'right-to-left'"
 
+#~ msgid "Type of document being scanned"
+#~ msgstr "Tipo de documento que está siendo escaneado"
+
 #~ msgid ""
 #~ "The width of scanned image in pixels. This value is updated to what the last "
 #~ "scanned page was."
@@ -943,6 +791,9 @@ msgstr "Guardando la página %d de %d"
 #~ "La altura de la imagen escaneada. Este valor se actualiza con el que tuvo la "
 #~ "última página escaneada"
 
+#~ msgid "SANE device to acquire images from."
+#~ msgstr "Dispositivo SANE desde donde adquirir las imágenes."
+
 #~ msgid "Width of scanned image in pixels"
 #~ msgstr "Anchura de la imagen escaneada"
 
@@ -971,6 +822,9 @@ msgstr "Guardando la página %d de %d"
 #~ msgid "TRUE if the application window is maximized"
 #~ msgstr "VERDADERO si la ventana de la aplicación está maximizada"
 
+#~ msgid "Resolution for text scans"
+#~ msgstr "Resolución para los escaneados de texto"
+
 #~ msgid "Resolution of last scanned image"
 #~ msgstr "Resolución de la última imagen escaneada"
 
@@ -978,6 +832,12 @@ msgstr "Guardando la página %d de %d"
 #~ msgstr ""
 #~ "La resolución en puntos por pulgada de la imagen escaneada anteriormente."
 
+#~ msgid "The resolution in dots-per-inch to use when scanning text."
+#~ msgstr "La resolución en puntos por pulgada a usar al escanear texto."
+
+#~ msgid "The resolution in dots-per-inch to use when scanning photos."
+#~ msgstr "La resolución en puntos por pulgada a usar al escanear fotografías."
+
 #~ msgid "Select File _Type"
 #~ msgstr "Seleccione el _tipo de archivo"
 
@@ -990,14 +850,76 @@ msgstr "Guardando la página %d de %d"
 #~ "«Fotografía» para fotografías. Esta opción determina la resolución, los "
 #~ "colores y el post-procesamiento del escaneado."
 
+#~ msgid "Resolution for photo scans"
+#~ msgstr "Resolución para los escaneados de fotografías"
+
 #~ msgid "Scanned Document"
 #~ msgstr "Documento escaneado"
 
 #~ msgid ""
+#~ "The directory to save files to. Defaults to the documents directory if unset."
+#~ msgstr ""
+#~ "El directorio en el que se guardarán los archivos. Por defecto será el "
+#~ "directorio de documentos."
+
+#~ msgid "Directory to save files to"
+#~ msgstr "Directorio en el que guardar los archivos"
+
+#~ msgid "Page side to scan"
+#~ msgstr "Cara a escanear de la página"
+
+#~ msgid ""
+#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr ""
+#~ "La altura del papel en décimas de mm (0 para detección automática del papel)."
+
+#~ msgid "Height of paper in tenths of a mm"
+#~ msgstr "Altura del papel en décimas de mm"
+
+#~ msgid ""
+#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr ""
+#~ "La anchura del papel en décimas de mm (0 para detección automática del "
+#~ "papel)."
+
+#~ msgid "Width of paper in tenths of a mm"
+#~ msgstr "Anchura del papel en décimas de mm"
+
+#~ msgid ""
 #~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
 #~ msgstr ""
 #~ "La cara a escanear de la página. Puede ser uno de los siguientes: «ambas», "
 #~ "«anverso» o «reverso»."
 
+#~ msgid "The page side to scan."
+#~ msgstr "El lado de la página a escanear."
+
+#~ msgid ""
+#~ "Type of document being scanned. This setting decides on the scan resolution, "
+#~ "colors and post-processing."
+#~ msgstr ""
+#~ "Tipo de documento escaneándose. Esta configuración establece la resolución "
+#~ "de escaneo, colores y post-procesamiento."
+
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "La dirección del escáner a través de la página escaneada."
+
+#~ msgid "Brightness of scan"
+#~ msgstr "Brillo de escaneo"
+
+#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
+#~ msgstr "Ajuste del brillo desde -100 a 100 (siendo 0 sin ajuste)."
+
+#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
+#~ msgstr "Ajuste de contraste desde -100 a 100 (siendo 0 sin ajuste)."
+
+#~ msgid "Quality value to use for JPEG compression."
+#~ msgstr "Calidad de la compresión de JPEG."
+
+#~ msgid "Quality value to use for JPEG compression"
+#~ msgstr "Calidad de la compresión de JPEG"
+
+#~ msgid "Contrast of scan"
+#~ msgstr "Contraste del escaneo"
diff --git a/po/et.gmo b/po/et.gmo
new file mode 100644
index 0000000..628ed14
--- /dev/null
+++ b/po/et.gmo
diff --git a/po/et.po b/po/et.po
index 4464839..3441ab0 100644
--- a/po/et.po
+++ b/po/et.po
@@ -7,402 +7,309 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-06 14:16+1200\n"
+"POT-Creation-Date: 2016-07-29 12:47+1200\n"
 "PO-Revision-Date: 2012-07-23 08:59+0000\n"
 "Last-Translator: mahfiaz <mahfiaz@gmail.com>\n"
 "Language-Team: Estonian <et@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-04-14 05:39+0000\n"
-"X-Generator: Launchpad (build 17990)\n"
+"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 
 #. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:2
+#: data/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_Autoriseeri"
 
 #. Label beside username entry
-#: ../data/simple-scan.ui.h:4
+#: data/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "_Kasutajanimi allika jaoks:"
 
 #. Label beside password entry
-#: ../data/simple-scan.ui.h:6
+#: data/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Parool:"
 
 #. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:8
+#: data/simple-scan.ui:188
 msgid "Front and Back"
 msgstr "Esi- ja tagakülg"
 
 #. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:10
+#: data/simple-scan.ui:192
 msgid "Front"
 msgstr "Esikülg"
 
 #. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:12
+#: data/simple-scan.ui:196
 msgid "Back"
 msgstr "Tagakülg"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
-#: ../data/appdata/simple-scan.appdata.xml.in.h:1
+#: data/simple-scan.ui:225 data/simple-scan.ui:809
+#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr "Lihtne skannija"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:16
+#: data/simple-scan.ui:241
 msgid "_Document"
 msgstr "_Dokument"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:18
+#: data/simple-scan.ui:260
 msgid "Sc_an"
 msgstr "Sk_annimine"
 
+#. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:20
+#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
 msgid "Single _Page"
 msgstr "Üks _lehekülg"
 
+#. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:22
+#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr "Kõik lehed _söötjast"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:24
+#: data/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "_Lõpeta skannimine"
 
-#: ../data/simple-scan.ui.h:25
+#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
 msgid "Text"
 msgstr "Tekst"
 
-#: ../data/simple-scan.ui.h:26
+#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
 msgid "Photo"
 msgstr "Foto"
 
 #. Menu item to reorder pages
-#. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1183 ../src/ui.vala:1841
+#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr ""
 
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: data/simple-scan.ui:367
 msgid "_Email"
 msgstr "_E-post"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: data/simple-scan.ui:430
 msgid "_Page"
 msgstr "_Lehekülg"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: data/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "Pööra _vasakule"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: data/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "Pööra _paremale"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: data/simple-scan.ui:460
 msgid "_Crop"
 msgstr "_Kärbi"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: data/simple-scan.ui:470
 msgid "_None"
 msgstr "_Puudub"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: data/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: data/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: data/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: data/simple-scan.ui:514
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: data/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "US _Legal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: data/simple-scan.ui:536
 msgid "4×6"
 msgstr ""
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: data/simple-scan.ui:547
 msgid "_Custom"
 msgstr "_Kohandatud"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: data/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr "_Pööramisega kärbe"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: data/simple-scan.ui:578
 msgid "Move Left"
 msgstr ""
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: data/simple-scan.ui:587
 msgid "Move Right"
 msgstr ""
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: data/simple-scan.ui:624
 msgid "_Help"
 msgstr "A_bi"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: data/simple-scan.ui:632
 msgid "_Contents"
 msgstr "_Sisu"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: data/simple-scan.ui:674 data/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "Uue dokumendi alustamine"
 
-#: ../data/simple-scan.ui.h:67
+#: data/simple-scan.ui:675
 msgid "New"
 msgstr "Uus"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: data/simple-scan.ui:689 data/simple-scan.ui:836
 msgid "Scan a single page from the scanner"
 msgstr "Ühe lehekülje skannimine skannerist"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: data/simple-scan.ui:691 data/simple-scan.ui:837
 msgid "Scan"
 msgstr "Skanni"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: data/simple-scan.ui:707 data/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "Dokumendi salvestamine faili"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1842
+#: data/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "Salvesta"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: data/simple-scan.ui:724 data/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "Selle skannimise lõpetamine"
 
-#: ../data/simple-scan.ui.h:77
+#: data/simple-scan.ui:725 data/simple-scan.ui:825
 msgid "Stop"
 msgstr "Lõpeta"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: data/simple-scan.ui:749 data/simple-scan.ui:936
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Lehekülje pööramine vasakule (vastupäeva)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: data/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "Vasakule pööramine"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: data/simple-scan.ui:764 data/simple-scan.ui:914
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Lehekülje pööramine paremale (päripäeva)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: data/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "Paremale pööramine"
 
-#: ../data/simple-scan.ui.h:86
+#: data/simple-scan.ui:779 data/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "Valitud lehekülje kärpimine"
 
-#: ../data/simple-scan.ui.h:87
+#: data/simple-scan.ui:781
 msgid "Crop"
 msgstr "Kärbi"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1849
+#: data/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "Eelistused"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: data/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "Skannimise _allikas:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: data/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "_Teksti eraldusvõime:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: data/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "_Foto eraldusvõime:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: data/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "Slaidi skannimine:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: data/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "Lehekülje suurus:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: data/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: data/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: data/simple-scan.ui:1260
 msgid "Quality:"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:2
+#: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:3
+#: data/simple-scan.desktop.in:5
 msgid "Scan Documents"
 msgstr "Dokumentide skannimine"
 
-#: ../data/simple-scan.desktop.in.h:4
+#: data/simple-scan.desktop.in:6
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Device to scan from"
-msgstr "Seade, millest skannida"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "SANE device to acquire images from."
-msgstr "SANE-seade, millest pilte hankida."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "Type of document being scanned"
-msgstr "Skannitava dokumenti tüüp"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
-msgid ""
-"Type of document being scanned. This setting decides on the scan resolution, "
-"colors and post-processing."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
-msgid "Width of paper in tenths of a mm"
-msgstr "Paberi laius kümnendikmillimeetrites"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr "Paberi laius kümnendikmillimeetrites (automaatseks tuvastuseks 0)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
-msgid "Height of paper in tenths of a mm"
-msgstr "Paberi kõrgus kümnendikmillimeetrites"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
+#: data/simple-scan.desktop.in:8
+msgid "scanner"
 msgstr ""
-"Paberi kõrgus kümnendikmillimeetrites (paberi automaatseks tuvastamiseks 0)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "Brightness of scan"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "The brightness adjustment from -100 to 100 (0 being none)."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid "Contrast of scan"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "The contrast adjustment from -100 to 100 (0 being none)."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid "Resolution for text scans"
-msgstr "Tekstiskannide eraldusvõime"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
-msgid "The resolution in dots-per-inch to use when scanning text."
-msgstr "Teksti skannimisel kasutatav lahutus, punktides tolli kohta."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
-msgid "Resolution for photo scans"
-msgstr "Fotoskannide eraldusvõime"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr "Piltide skannimisel kasutatav lahutus, punktides tolli kohta."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
-msgid "Page side to scan"
-msgstr "Skannitav lehe külg"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
-msgid "The page side to scan."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
-msgid "Directory to save files to"
-msgstr "Kataloog, kuhu failid salvestada"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
-msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
-msgstr ""
-"Kataloog, kuhu failid salvestada. Kui määramata, on vaikeväärtus dokumentide "
-"kataloog."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
-msgid "Quality value to use for JPEG compression"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Quality value to use for JPEG compression."
-msgstr ""
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+#: data/simple-scan.appdata.xml.in:8
 msgid ""
 "A really easy way to scan both documents and photos. You can crop out the "
 "bad parts of a photo and rotate it if it is the wrong way round. You can "
@@ -410,196 +317,162 @@ msgid ""
 "formats."
 msgstr ""
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+#: data/simple-scan.appdata.xml.in:13
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Skannereid pole saadaval. Palun ühenda skanner arvutiga."
 
-#. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "Skanneriga ei suudetud ühenduda"
 
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "Skannimist ei suudetud alustada"
 
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1236 src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr "Tõrge skanneriga suhtlemisel"
 
-#. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "Versiooninumbri näitamine"
 
-#. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr "Näita veasilumise sõnumeid"
 
-#: ../src/simple-scan.vala:26
+#: src/simple-scan.vala:26
 msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr ""
 
-#. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:391
+#: src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Skannimine nurjus"
 
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr "Käivita '%s --help', et näha kõiki käsurea valikuid."
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:318 src/ui.vala:1602 src/ui.vala:1887
 msgid "_Close"
 msgstr ""
 
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:327
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "'%s' ligipääsuks on vajalik kasutajanimi ja parool"
 
-#. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:375
 msgid "No scanners detected"
 msgstr "Ühtegi skannerit ei tuvastatud"
 
-#. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:377
 msgid "Please check your scanner is connected and powered on"
 msgstr "Kontrolli, kas skanner on ühendatud ja sisse lülitatud"
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:382
 msgid "Additional software needed"
 msgstr ""
 
-#. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr ""
 
-#. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:506 src/ui.vala:1843
 msgid "Save As..."
 msgstr "Salvesta kui..."
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:509 src/ui.vala:675
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:510 src/ui.vala:676
 msgid "_Save"
 msgstr ""
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "Skannitud dokument.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:521
 msgid "Image Files"
 msgstr "Pildifailid"
 
-#. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:527
 msgid "All Files"
 msgstr "Kõik failid"
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (mitmeleheküljeline dokument)"
 
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (tihendatud)"
 
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (kadudeta)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:557
 msgid "File format:"
 msgstr ""
 
-#. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:650
 msgid "Failed to save file"
 msgstr "Faili salvestamine nurjus"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:673
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Kui sa ei salvesta, lähevad muudatused jäädavalt kaotsi."
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:708
+#: src/ui.vala:708
 msgid "Save current document?"
 msgstr "Kas salvestada see dokument?"
 
-#. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:710
 msgid "Discard Changes"
 msgstr "Tühista muudatused"
 
-#. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "Eelvaate pildi salvestamine ebaõnnestus"
 
-#. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "Pildi eelvaatluse rakendust ei suudetud käivitada"
 
-#. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1206
 msgid "Combine sides"
 msgstr ""
 
-#. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr ""
 
-#. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1226
 msgid "Reverse"
 msgstr ""
 
-#. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr ""
 
-#. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "Abiteabe faili pole võimalik avada"
 
-#. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1472
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -628,17 +501,15 @@ msgstr ""
 "Litsentsist; juhul kui sa seda ei saanud, siis vaata "
 "<http://www.gnu.org/licences/>."
 
-#. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "Lihtsast skannijast lähemalt"
 
-#. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "Lihtne dokumendi skaneerimise tööriist"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -646,190 +517,167 @@ msgstr ""
 "  Madis Veskimeister https://launchpad.net/~avalikarvamus\n"
 "  mahfiaz https://launchpad.net/~mahfiaz"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "Kas salvestada dokument enne väljumist?"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "Välju ilma salvestamata"
 
-#. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
-#. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1581
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
 msgstr ""
 
-#. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
-#. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1587
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
 msgstr ""
 
-#. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr ""
 
-#. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
-#. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1598
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
 msgstr ""
 
-#. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1602
 msgid "Install drivers"
 msgstr ""
 
-#. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
-#. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr ""
 
-#. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr ""
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr ""
 
-#. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1676
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr ""
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (vaikimisi)"
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (mustand)"
 
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (kõrge kvaliteet)"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/ui.vala:1793
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1835
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1840
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1844
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1845
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1853
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1854
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1855
 msgid "Quit"
 msgstr ""
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "_Skanneri vahetamine"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr ""
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1897
 msgid "Automatic"
 msgstr "Automaatne"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1947
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1949
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:1957
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:1959
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:1967
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:1969
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2008
 msgid "Saving document..."
 msgstr "Dokumendi salvestamine..."
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
@@ -843,12 +691,27 @@ msgstr ""
 #~ msgid "TRUE if the application window is maximized"
 #~ msgstr "Tõene, kui rakenduse aken on maksimeeritud"
 
+#~ msgid "Device to scan from"
+#~ msgstr "Seade, millest skannida"
+
+#~ msgid "SANE device to acquire images from."
+#~ msgstr "SANE-seade, millest pilte hankida."
+
 #~ msgid "Direction of scan"
 #~ msgstr "Skannimise suund"
 
+#~ msgid "Resolution for text scans"
+#~ msgstr "Tekstiskannide eraldusvõime"
+
+#~ msgid "Resolution for photo scans"
+#~ msgstr "Fotoskannide eraldusvõime"
+
 #~ msgid "Resolution of last scanned image"
 #~ msgstr "Viimase skannitud pildi eraldusvõime"
 
+#~ msgid "Directory to save files to"
+#~ msgstr "Kataloog, kuhu failid salvestada"
+
 #~ msgid ""
 #~ "The direction of the scanner across the scanned page. It can be one of the "
 #~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
@@ -857,6 +720,9 @@ msgstr ""
 #~ "bottom' (ülalt alla), 'bottom-to-top' (alt üles), 'left-to-right' (vasakult "
 #~ "paremale), 'right-to-left' (paremalt vasakule)."
 
+#~ msgid "Type of document being scanned"
+#~ msgstr "Skannitava dokumenti tüüp"
+
 #~ msgid ""
 #~ "Type of document being scanned. 'text' for text documents, 'photo' for "
 #~ "photos. This setting decides on the scan resolution, colors and post-"
@@ -883,6 +749,18 @@ msgstr ""
 #~ msgid "The resolution in dots-per-inch of the previously scanned image."
 #~ msgstr "Viimati skannitud pildi eraldusvõime, ühik on punkti tolli kohta."
 
+#~ msgid "The resolution in dots-per-inch to use when scanning text."
+#~ msgstr "Teksti skannimisel kasutatav lahutus, punktides tolli kohta."
+
+#~ msgid "The resolution in dots-per-inch to use when scanning photos."
+#~ msgstr "Piltide skannimisel kasutatav lahutus, punktides tolli kohta."
+
+#~ msgid ""
+#~ "The directory to save files to. Defaults to the documents directory if unset."
+#~ msgstr ""
+#~ "Kataloog, kuhu failid salvestada. Kui määramata, on vaikeväärtus dokumentide "
+#~ "kataloog."
+
 #~ msgid "Width of scanned image in pixels"
 #~ msgstr "Skannitud pildi laius pikslites"
 
@@ -948,8 +826,28 @@ msgstr ""
 #~ msgid "Please check your installation"
 #~ msgstr "Palun kontrolli paigaldust"
 
+#~ msgid "Page side to scan"
+#~ msgstr "Skannitav lehe külg"
+
+#~ msgid "Height of paper in tenths of a mm"
+#~ msgstr "Paberi kõrgus kümnendikmillimeetrites"
+
+#~ msgid ""
+#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr ""
+#~ "Paberi kõrgus kümnendikmillimeetrites (paberi automaatseks tuvastamiseks 0)."
+
 #~ msgid ""
 #~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
 #~ msgstr ""
 #~ "Lehe külg, mida skannida. See võib olla üks järgnevaist: 'both', 'front', "
 #~ "'back'."
+
+#~ msgid ""
+#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr "Paberi laius kümnendikmillimeetrites (automaatseks tuvastuseks 0)."
+
+#~ msgid "Width of paper in tenths of a mm"
+#~ msgstr "Paberi laius kümnendikmillimeetrites"
diff --git a/po/eu.gmo b/po/eu.gmo
new file mode 100644
index 0000000..7e4b163
--- /dev/null
+++ b/po/eu.gmo
diff --git a/po/eu.po b/po/eu.po
index 6536318..874948f 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -7,605 +7,478 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-06 14:16+1200\n"
+"POT-Creation-Date: 2016-07-29 12:47+1200\n"
 "PO-Revision-Date: 2016-02-18 19:51+0000\n"
 "Last-Translator: Asier Sarasua Garmendia <Unknown>\n"
 "Language-Team: Basque <eu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-04-14 05:39+0000\n"
-"X-Generator: Launchpad (build 17990)\n"
+"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 
 #. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:2
+#: data/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_Baimendu"
 
 #. Label beside username entry
-#: ../data/simple-scan.ui.h:4
+#: data/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "_Erabiltzaile-izena baliabiderako:"
 
 #. Label beside password entry
-#: ../data/simple-scan.ui.h:6
+#: data/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Pasahitza:"
 
 #. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:8
+#: data/simple-scan.ui:188
 msgid "Front and Back"
 msgstr "Aurrealdea eta atzealdea"
 
 #. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:10
+#: data/simple-scan.ui:192
 msgid "Front"
 msgstr "Aurrealdea"
 
 #. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:12
+#: data/simple-scan.ui:196
 msgid "Back"
 msgstr "Atzealdea"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
-#: ../data/appdata/simple-scan.appdata.xml.in.h:1
+#: data/simple-scan.ui:225 data/simple-scan.ui:809
+#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr "Simple Scan"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:16
+#: data/simple-scan.ui:241
 msgid "_Document"
 msgstr "_Dokumentua"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:18
+#: data/simple-scan.ui:260
 msgid "Sc_an"
 msgstr "Es_kaneatu"
 
+#. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:20
+#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
 msgid "Single _Page"
 msgstr "_Orrialde bakarra"
 
+#. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:22
+#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr "_Elikagailuko orri guztiak"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:24
+#: data/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "_Gelditu eskaneatzea"
 
-#: ../data/simple-scan.ui.h:25
+#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
 msgid "Text"
 msgstr "Testua"
 
-#: ../data/simple-scan.ui.h:26
+#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
 msgid "Photo"
 msgstr "Argazkia"
 
 #. Menu item to reorder pages
-#. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1183 ../src/ui.vala:1841
+#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr "Berrordenatu orrialdeak"
 
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: data/simple-scan.ui:367
 msgid "_Email"
 msgstr "_Posta elektronikoa"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: data/simple-scan.ui:430
 msgid "_Page"
 msgstr "_Orrialdea"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: data/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "Biratu e_zkerrera"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: data/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "Biratu e_skuinera"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: data/simple-scan.ui:460
 msgid "_Crop"
 msgstr "_Moztu"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: data/simple-scan.ui:470
 msgid "_None"
 msgstr "_Bat ere ez"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: data/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: data/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: data/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: data/simple-scan.ui:514
 msgid "_Letter"
 msgstr "AEBetako gutuna"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: data/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "AEBetako le_gala"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: data/simple-scan.ui:536
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: data/simple-scan.ui:547
 msgid "_Custom"
 msgstr "_Pertsonalizatua"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: data/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr "_Biratu mozketa"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: data/simple-scan.ui:578
 msgid "Move Left"
 msgstr "Mugitu ezkerrera"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: data/simple-scan.ui:587
 msgid "Move Right"
 msgstr "Mugitu eskuinera"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: data/simple-scan.ui:624
 msgid "_Help"
 msgstr "_Laguntza"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: data/simple-scan.ui:632
 msgid "_Contents"
 msgstr "_Edukiak"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: data/simple-scan.ui:674 data/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "Hasi dokumentu berria"
 
-#: ../data/simple-scan.ui.h:67
+#: data/simple-scan.ui:675
 msgid "New"
 msgstr "Berria"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: data/simple-scan.ui:689 data/simple-scan.ui:836
 msgid "Scan a single page from the scanner"
 msgstr "Eskaneatu eskanerreko orrialde bakarra"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: data/simple-scan.ui:691 data/simple-scan.ui:837
 msgid "Scan"
 msgstr "Eskaneatu"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: data/simple-scan.ui:707 data/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "Gorde dokumentua fitxategi batean"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1842
+#: data/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "Gorde"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: data/simple-scan.ui:724 data/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "Gelditu uneko eskaneatzea"
 
-#: ../data/simple-scan.ui.h:77
+#: data/simple-scan.ui:725 data/simple-scan.ui:825
 msgid "Stop"
 msgstr "Gelditu"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: data/simple-scan.ui:749 data/simple-scan.ui:936
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Biratu orrialdea ezkerrera (erlojuaren kontrako noranzkoan)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: data/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "Biratu ezkerrera"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: data/simple-scan.ui:764 data/simple-scan.ui:914
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Biratu orrialdea eskuinra (erlojuaren noranzkoan)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: data/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "Biratu eskuinera"
 
-#: ../data/simple-scan.ui.h:86
+#: data/simple-scan.ui:779 data/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "Moztu hautatutako orrialdea"
 
-#: ../data/simple-scan.ui.h:87
+#: data/simple-scan.ui:781
 msgid "Crop"
 msgstr "Moztu"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1849
+#: data/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "Hobespenak"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: data/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "Eskaneatze-_jatorria:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: data/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "_Testu-bereizmena:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: data/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "Ar_gazki-bereizmena:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: data/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "Eskaneatze-aldea:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: data/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "Orrialde-tamaina:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: data/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "Distira:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: data/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "Kontrastea:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: data/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "Kalitatea:"
 
-#: ../data/simple-scan.desktop.in.h:2
+#: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr "Dokumentuen eskanerra"
 
-#: ../data/simple-scan.desktop.in.h:3
+#: data/simple-scan.desktop.in:5
 msgid "Scan Documents"
 msgstr "Eskaneatu dokumentuak"
 
-#: ../data/simple-scan.desktop.in.h:4
+#: data/simple-scan.desktop.in:6
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
+"eskaneatu;eskanerra;eskanerreko_kristala;Dokumentu_elikatze_automatiko;"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Device to scan from"
-msgstr "Eskaneatze-gailua"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "SANE device to acquire images from."
-msgstr "Irudiak eskuratzeko erabiliko den SANE gailua."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "Type of document being scanned"
-msgstr "Eskaneatuko den dokumentu-mota"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
-msgid ""
-"Type of document being scanned. This setting decides on the scan resolution, "
-"colors and post-processing."
-msgstr ""
-"Eskaneatuko den dokumentu-mota. Ezarpen honek eskaneatzearen bereizmena, "
-"koloreak eta posprozesatzea finkatzen du."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
-msgid "Width of paper in tenths of a mm"
-msgstr "Paperaren zabalera mm hamarrenetan"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-"Eskaneatutako paperaren zabalera milimetro hamarrenetan (edo 0 paperaren "
-"detekzio automatikorako)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
-msgid "Height of paper in tenths of a mm"
-msgstr "Paperaren altuera mm hamarrenetan"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-"Eskaneatutako paperaren altuera milimetro hamarrenetan (edo 0 paperaren "
-"detekzio automatikorako)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "Brightness of scan"
-msgstr "Eskanerraren distira"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "The brightness adjustment from -100 to 100 (0 being none)."
-msgstr "Distiraren doiketa, -100etik 100era (0 = distirarik ez)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid "Contrast of scan"
-msgstr "Eskanerraren kontrastea"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "The contrast adjustment from -100 to 100 (0 being none)."
-msgstr "Kontrastearen doiketa, -100etik 100era (0 = kontrasterik ez)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid "Resolution for text scans"
-msgstr "Bereizmena testuen eskaneatzerako"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
-msgid "The resolution in dots-per-inch to use when scanning text."
-msgstr "Testua eskaneatzen erabiliko den bereizmena (puntuak hazbeteko)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
-msgid "Resolution for photo scans"
-msgstr "Bereizmena argazkien eskaneatzerako"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr "Argazkiak eskaneatzen erabiliko den bereizmena (puntuak hazbeteko)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
-msgid "Page side to scan"
-msgstr "Eskaneatuko den aldea"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
-msgid "The page side to scan."
-msgstr "Eskaneatuko den orrialdea."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
-msgid "Directory to save files to"
-msgstr "Fitxategiak gordetzeko direktorioa"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
-msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
+#: data/simple-scan.desktop.in:8
+msgid "scanner"
 msgstr ""
-"Fitxategiak gordeko diren direktorioa. Ez bada ezer ezartzen, balio "
-"lehenetsia dokumentuen direktorioa da."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
-msgid "Quality value to use for JPEG compression"
-msgstr "Kalitatearen balioa, JPEG konpresioan erabiltzeko"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Quality value to use for JPEG compression."
-msgstr "Kalitatearen balioa, JPEG konpresioan erabiltzeko."
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+#: data/simple-scan.appdata.xml.in:8
 msgid ""
 "A really easy way to scan both documents and photos. You can crop out the "
 "bad parts of a photo and rotate it if it is the wrong way round. You can "
 "print your scans, export them to pdf, or save them in a range of image "
 "formats."
 msgstr ""
+"Modu benetan erraza dokumentuak zein argazkiak eskaneatzeko. Argazki baten "
+"parte txarrak ebaki eta"
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+#: data/simple-scan.appdata.xml.in:13
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
+"Simple Scan SANE framework erabiltzen du dauden eskaner gehienei sostengua "
+"emateko."
 
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Ez dago eskanerrik erabilgarri. Mesedez, konektatu eskaner bat."
 
-#. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "Ezin da eskanerrarekin konektatu"
 
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "Ezin da eskanerra abiarazi"
 
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1236 src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr "Errorea eskanerrarekin komunikatzean"
 
-#. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "Erakutsi bertsioa"
 
-#. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr "Inprimatu arazketa-mezuak"
 
-#: ../src/simple-scan.vala:26
+#: src/simple-scan.vala:26
 msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr ""
 "Konpondu Simple Scan-en bertsio zaharragoekin sortutako PDF fitxategiak"
 
-#. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:391
+#: src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Ezin izan da eskaneatu"
 
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DEVICE...] - Eskaneatze-aplikazioa"
 
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr "Exekutatu '%s --help' komando-lerroko aukera guztiak zerrendatzeko."
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:318 src/ui.vala:1602 src/ui.vala:1887
 msgid "_Close"
 msgstr "_Itxi"
 
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:327
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Erabiltzaile-izena eta pasahitza behar dira '%s' atzitzeko"
 
-#. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:375
 msgid "No scanners detected"
 msgstr "Ez da eskanerrik detektatu"
 
-#. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:377
 msgid "Please check your scanner is connected and powered on"
 msgstr "Egiaztatu zure eskanerra konektatuta eta piztuta dagoela"
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:382
 msgid "Additional software needed"
 msgstr "Software gehiago behar da"
 
-#. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:384
 msgid "You need to install driver software for your scanner."
-msgstr ""
+msgstr "Zure eskanerrentzako kontrolatzaile softwarea instalatu behar duzu."
 
-#. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:506 src/ui.vala:1843
 msgid "Save As..."
 msgstr "Gorde honela..."
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:509 src/ui.vala:675
 msgid "_Cancel"
 msgstr "_Utzi"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:510 src/ui.vala:676
 msgid "_Save"
 msgstr "_Gorde"
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "Dokumentu.pdf eskaneatuta"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:521
 msgid "Image Files"
 msgstr "Irudi-fitxategiak"
 
-#. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:527
 msgid "All Files"
 msgstr "Fitxategi guztiak"
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (orrialde anitzeko dokumentua)"
 
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (konprimitua)"
 
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (galerarik gabea)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:557
 msgid "File format:"
 msgstr "Fitxategi-formatua:"
 
-#. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:650
 msgid "Failed to save file"
 msgstr "Ezin izan da fitxategia gorde"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:673
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Gordetzen ez baduzu, aldaketak betiko galduko dira."
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:708
+#: src/ui.vala:708
 msgid "Save current document?"
 msgstr "Gorde uneko dokumentua?"
 
-#. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:710
 msgid "Discard Changes"
 msgstr "Baztertu aldaketak"
 
-#. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "Ezin izan da aurrebistarako irudia gorde"
 
-#. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "Ezin izan da ireki irudiaren aurrebistarako aplikazioa"
 
-#. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1206
 msgid "Combine sides"
 msgstr "Konbinatu aldeak"
 
-#. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr "Konbinatu aldeak (alderantziz)"
 
-#. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1226
 msgid "Reverse"
 msgstr "Alderantziz"
 
-#. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr "Mantendu aldatu gabe"
 
-#. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "Ezin izan da ireki laguntza-fitxategia"
 
-#. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1472
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -633,17 +506,15 @@ msgstr ""
 "You should have received a copy of the GNU General Public License\n"
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 
-#. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "Simple Scan-i buruz"
 
-#. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "Dokumentuak eskaneatzeko tresna sinplea"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -651,197 +522,180 @@ msgstr ""
 "  Asier Sarasua Garmendia https://launchpad.net/~asarasuagarmendia\n"
 "  Ibai Oihanguren Sala https://launchpad.net/~ibai-oihanguren\n"
 "  Iñaki Larrañaga Murgoitio https://launchpad.net/~dooteo-zundan\n"
+"  Jon Intxaurbe https://launchpad.net/~joinzar\n"
 "  Jon Legarrea https://launchpad.net/~jonlegarrea-deactivatedaccount\n"
 "  Kaiet https://launchpad.net/~kaiett\n"
 "  Oier Mees https://launchpad.net/~oier\n"
 "  Robert Ancell https://launchpad.net/~robert-ancell\n"
-"  Xabier Isla Rodriguez https://launchpad.net/~xabier.isla\n"
 "  gorkaazk https://launchpad.net/~gorkaazkarate"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "Gorde dokumentua irten baino lehen?"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "Irten gorde gabe"
 
-#. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
-msgstr ""
+msgstr "Brother eskanerra duzuela ematen du."
 
-#. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1581
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
 msgstr ""
+"Honentzako kontrolatzaileak  <a href=\"http://support.brother.com\">Brother "
+"webgunean</a> erabilgarri daude."
 
-#. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
-msgstr ""
+msgstr "Samsung eskanerra duzuela ematen du."
 
-#. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1587
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
 msgstr ""
+"Honentzako kontrolatzaileak <a href=\"http://samsung.com/support\">Samsung "
+"webgunean</a> erabilgarri daude."
 
-#. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1591
 msgid "You appear to have an HP scanner."
-msgstr ""
+msgstr "HP eskanerra duz uela ematen du."
 
-#. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
-msgstr ""
+msgstr "Epson eskanerra duzuela ematen du."
 
-#. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1598
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
 msgstr ""
+"Honentzako kontrolatzaileak <a href=\"http://support.epson.com\">Epson "
+"webgunean</a> erabilgarri daude."
 
-#. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1602
 msgid "Install drivers"
-msgstr ""
+msgstr "Instalatu kontrolatzaileak"
 
-#. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
-msgstr ""
+msgstr "Behin instalatua Simple Scan berabiarazi behar duzu."
 
-#. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1645
 msgid "Installing drivers..."
-msgstr ""
+msgstr "Kontrolatzaileak instalatzen..."
 
-#. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1653
 msgid "Drivers installed successfully!"
-msgstr ""
+msgstr "Kontrolatzaileak ondo instalatu dira!"
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
-msgstr ""
+msgstr "Ezin izan dira kontrolatzaileak instalatu (%d errore kodea)."
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1669
 msgid "Failed to install drivers."
-msgstr ""
+msgstr "Ezin izan dira kontrolatzaileak instalatu."
 
-#. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1676
 #, c-format
 msgid "You need to install the %s package(s)."
-msgstr ""
+msgstr "%s pakete(ak) instalatu behar duzu (dituzu).."
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (lehenetsia)"
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (zirriborroa)"
 
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (bereizmen altua)"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/ui.vala:1793
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1835
 msgid "New Document"
 msgstr "Dokumentu berria"
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1840
 msgid "Document"
 msgstr "Dokumentua"
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1844
 msgid "Email..."
 msgstr "Bidali postaz..."
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1845
 msgid "Print..."
 msgstr "Inprimatu..."
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1853
 msgid "Help"
 msgstr "Laguntza"
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1854
 msgid "About"
 msgstr "Honi buruz"
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1855
 msgid "Quit"
 msgstr "Irten"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "Aldatu e_skanerra"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1891
 msgid "_Install Drivers"
-msgstr ""
+msgstr "_Instalatu kontrolatzaileak"
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1897
 msgid "Automatic"
 msgstr "Automatikoa"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1947
 msgid "Darker"
 msgstr "Ilunago"
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1949
 msgid "Lighter"
 msgstr "Argiago"
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:1957
 msgid "Less"
 msgstr "Gutxiago"
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:1959
 msgid "More"
 msgstr "Gehiago"
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:1967
 msgid "Minimum"
 msgstr "Minimoa"
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:1969
 msgid "Maximum"
 msgstr "Maximoa"
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2008
 msgid "Saving document..."
 msgstr "Dokumentua gordetzen..."
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "%d orria (%d-etik) gordetzen"
@@ -855,9 +709,18 @@ msgstr "%d orria (%d-etik) gordetzen"
 #~ msgid "Height of scanned image in pixels"
 #~ msgstr "Eskaneatutako irudiaren altuera pixeletan"
 
+#~ msgid "Resolution for text scans"
+#~ msgstr "Bereizmena testuen eskaneatzerako"
+
+#~ msgid "Resolution for photo scans"
+#~ msgstr "Bereizmena argazkien eskaneatzerako"
+
 #~ msgid "Resolution of last scanned image"
 #~ msgstr "Eskaneatutako azken irudiaren bereizmena"
 
+#~ msgid "Directory to save files to"
+#~ msgstr "Fitxategiak gordetzeko direktorioa"
+
 #, c-format
 #~ msgid ""
 #~ "Usage:\n"
@@ -880,12 +743,18 @@ msgstr "%d orria (%d-etik) gordetzen"
 #~ msgid "TRUE if the application window is maximized"
 #~ msgstr "TRUE aplikazio-leihoa maximizatuta badago"
 
+#~ msgid "Device to scan from"
+#~ msgstr "Eskaneatze-gailua"
+
 #~ msgid ""
 #~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
 #~ msgstr ""
 #~ "Eskaneatuko den aldea. Hurrengoetako bat izan daiteke: 'biak' 'aurrealdea' "
 #~ "'atzealdea'"
 
+#~ msgid "Type of document being scanned"
+#~ msgstr "Eskaneatuko den dokumentu-mota"
+
 #~ msgid ""
 #~ "The width of scanned image in pixels. This value is updated to what the last "
 #~ "scanned page was."
@@ -901,6 +770,12 @@ msgstr "%d orria (%d-etik) gordetzen"
 #~ "orrialdearen baliora eguneratzen da."
 
 #~ msgid ""
+#~ "The directory to save files to. Defaults to the documents directory if unset."
+#~ msgstr ""
+#~ "Fitxategiak gordeko diren direktorioa. Ez bada ezer ezartzen, balio "
+#~ "lehenetsia dokumentuen direktorioa da."
+
+#~ msgid ""
 #~ "Type of document being scanned. 'text' for text documents, 'photo' for "
 #~ "photos. This setting decides on the scan resolution, colors and post-"
 #~ "processing."
@@ -924,9 +799,21 @@ msgstr "%d orria (%d-etik) gordetzen"
 #~ msgid "Select File _Type"
 #~ msgstr "Hautatu fit_xategi-mota"
 
+#~ msgid "SANE device to acquire images from."
+#~ msgstr "Irudiak eskuratzeko erabiliko den SANE gailua."
+
 #~ msgid "The resolution in dots-per-inch of the previously scanned image."
 #~ msgstr "Aurretik eskaneatutako irudiaren bereizmena (puntuak hazbeteko)."
 
+#~ msgid "The resolution in dots-per-inch to use when scanning text."
+#~ msgstr "Testua eskaneatzen erabiliko den bereizmena (puntuak hazbeteko)."
+
+#~ msgid "The resolution in dots-per-inch to use when scanning photos."
+#~ msgstr "Argazkiak eskaneatzen erabiliko den bereizmena (puntuak hazbeteko)."
+
+#~ msgid "Page side to scan"
+#~ msgstr "Eskaneatuko den aldea"
+
 #, c-format
 #~ msgid ""
 #~ "GTK+ Options:\n"
@@ -966,5 +853,53 @@ msgstr "%d orria (%d-etik) gordetzen"
 #~ msgid "Direction of scan"
 #~ msgstr "Eskaneatzearen noranzkoa"
 
+#~ msgid ""
+#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr ""
+#~ "Eskaneatutako paperaren altuera milimetro hamarrenetan (edo 0 paperaren "
+#~ "detekzio automatikorako)."
+
+#~ msgid ""
+#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr ""
+#~ "Eskaneatutako paperaren zabalera milimetro hamarrenetan (edo 0 paperaren "
+#~ "detekzio automatikorako)."
+
+#~ msgid "Width of paper in tenths of a mm"
+#~ msgstr "Paperaren zabalera mm hamarrenetan"
+
+#~ msgid "Height of paper in tenths of a mm"
+#~ msgstr "Paperaren altuera mm hamarrenetan"
+
+#~ msgid "The page side to scan."
+#~ msgstr "Eskaneatuko den orrialdea."
+
+#~ msgid ""
+#~ "Type of document being scanned. This setting decides on the scan resolution, "
+#~ "colors and post-processing."
+#~ msgstr ""
+#~ "Eskaneatuko den dokumentu-mota. Ezarpen honek eskaneatzearen bereizmena, "
+#~ "koloreak eta posprozesatzea finkatzen du."
+
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "Eskanerraren zentzua eskaneatutako orrian zehar."
+
+#~ msgid "Contrast of scan"
+#~ msgstr "Eskanerraren kontrastea"
+
+#~ msgid "Brightness of scan"
+#~ msgstr "Eskanerraren distira"
+
+#~ msgid "Quality value to use for JPEG compression."
+#~ msgstr "Kalitatearen balioa, JPEG konpresioan erabiltzeko."
+
+#~ msgid "Quality value to use for JPEG compression"
+#~ msgstr "Kalitatearen balioa, JPEG konpresioan erabiltzeko"
+
+#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
+#~ msgstr "Kontrastearen doiketa, -100etik 100era (0 = kontrasterik ez)."
+
+#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
+#~ msgstr "Distiraren doiketa, -100etik 100era (0 = distirarik ez)."
diff --git a/po/fi.gmo b/po/fi.gmo
new file mode 100644
index 0000000..fcb5b8a
--- /dev/null
+++ b/po/fi.gmo
diff --git a/po/fi.po b/po/fi.po
index 278db8c..0828f46 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,406 +7,309 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-06 14:16+1200\n"
+"POT-Creation-Date: 2016-07-29 12:47+1200\n"
 "PO-Revision-Date: 2013-09-22 12:07+0000\n"
 "Last-Translator: Jiri Grönroos <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-04-14 05:39+0000\n"
-"X-Generator: Launchpad (build 17990)\n"
+"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 
 #. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:2
+#: data/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_Valtuuta"
 
 #. Label beside username entry
-#: ../data/simple-scan.ui.h:4
+#: data/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "Resurssin _käyttäjänimi:"
 
 #. Label beside password entry
-#: ../data/simple-scan.ui.h:6
+#: data/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Salasana:"
 
 #. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:8
+#: data/simple-scan.ui:188
 msgid "Front and Back"
 msgstr "Etu- ja takapuoli"
 
 #. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:10
+#: data/simple-scan.ui:192
 msgid "Front"
 msgstr "Etupuoli"
 
 #. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:12
+#: data/simple-scan.ui:196
 msgid "Back"
 msgstr "Takapuoli"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
-#: ../data/appdata/simple-scan.appdata.xml.in.h:1
+#: data/simple-scan.ui:225 data/simple-scan.ui:809
+#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr "Kuvanluku"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:16
+#: data/simple-scan.ui:241
 msgid "_Document"
 msgstr "_Asiakirja"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:18
+#: data/simple-scan.ui:260
 msgid "Sc_an"
 msgstr "Lue kuv_a"
 
+#. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:20
+#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
 msgid "Single _Page"
 msgstr "Yksi _sivu"
 
+#. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:22
+#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr "Kaikki sivut _laitteelta"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:24
+#: data/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "Py_säytä kuvanluku"
 
-#: ../data/simple-scan.ui.h:25
+#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
 msgid "Text"
 msgstr "Teksti"
 
-#: ../data/simple-scan.ui.h:26
+#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
 msgid "Photo"
 msgstr "Valokuva"
 
 #. Menu item to reorder pages
-#. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1183 ../src/ui.vala:1841
+#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr "Järjestä sivut"
 
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: data/simple-scan.ui:367
 msgid "_Email"
 msgstr "_Sähköposti"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: data/simple-scan.ui:430
 msgid "_Page"
 msgstr "_Sivu"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: data/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "Kierrä _vasemmalle"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: data/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "Kierrä _oikealle"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: data/simple-scan.ui:460
 msgid "_Crop"
 msgstr "_Rajaa"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: data/simple-scan.ui:470
 msgid "_None"
 msgstr "_Ei mitään"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: data/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: data/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: data/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: data/simple-scan.ui:514
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: data/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "US Legal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: data/simple-scan.ui:536
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: data/simple-scan.ui:547
 msgid "_Custom"
 msgstr "_Muu"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: data/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr "Kierr_ä rajausta"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: data/simple-scan.ui:578
 msgid "Move Left"
 msgstr "Siirrä vasemmalle"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: data/simple-scan.ui:587
 msgid "Move Right"
 msgstr "Siirrä oikealle"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: data/simple-scan.ui:624
 msgid "_Help"
 msgstr "O_hje"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: data/simple-scan.ui:632
 msgid "_Contents"
 msgstr "_Sisältö"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: data/simple-scan.ui:674 data/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "Aloita uusi asiakirja"
 
-#: ../data/simple-scan.ui.h:67
+#: data/simple-scan.ui:675
 msgid "New"
 msgstr "Uusi"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: data/simple-scan.ui:689 data/simple-scan.ui:836
 msgid "Scan a single page from the scanner"
 msgstr "Lue yksi sivu kuvanlukijalta"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: data/simple-scan.ui:691 data/simple-scan.ui:837
 msgid "Scan"
 msgstr "Lue"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: data/simple-scan.ui:707 data/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "Tallenna asiakirja tiedostoon"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1842
+#: data/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "Tallenna"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: data/simple-scan.ui:724 data/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "Pysäytä kuvan lukeminen"
 
-#: ../data/simple-scan.ui.h:77
+#: data/simple-scan.ui:725 data/simple-scan.ui:825
 msgid "Stop"
 msgstr "Pysäytä"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: data/simple-scan.ui:749 data/simple-scan.ui:936
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Kierrä sivua vasemmalle (vastapäivään)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: data/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "Kierrä vasemmalle"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: data/simple-scan.ui:764 data/simple-scan.ui:914
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Kierrä sivua oikealle (myötäpäivään)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: data/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "Kierrä oikealle"
 
-#: ../data/simple-scan.ui.h:86
+#: data/simple-scan.ui:779 data/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "Rajaa nykyistä sivua"
 
-#: ../data/simple-scan.ui.h:87
+#: data/simple-scan.ui:781
 msgid "Crop"
 msgstr "Rajaa"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1849
+#: data/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "Asetukset"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: data/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "Lue lähtee_stä:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: data/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "_Tekstin tarkkuus:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: data/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "_Valokuvan tarkkuus:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: data/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "Luettava puoli:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: data/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "Sivun koko:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: data/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "Kirkkaus:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: data/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "Kontrasti:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: data/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "Laatu:"
 
-#: ../data/simple-scan.desktop.in.h:2
+#: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr "Asiakirjojen kuvanlukuohjelma"
 
-#: ../data/simple-scan.desktop.in.h:3
+#: data/simple-scan.desktop.in:5
 msgid "Scan Documents"
 msgstr "Lue asiakirjoja kuvanlukijalta"
 
-#: ../data/simple-scan.desktop.in.h:4
+#: data/simple-scan.desktop.in:6
 msgid "scan;scanner;flatbed;adf;"
 msgstr "kuvanluku;skanneri;scan;scanner;flatbed;adf;"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Device to scan from"
-msgstr "Laite jolta luetaan"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "SANE device to acquire images from."
-msgstr "SANE-laite jolta kuvat luetaan."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "Type of document being scanned"
-msgstr "Luettavan asiakirjan tyyppi"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
-msgid ""
-"Type of document being scanned. This setting decides on the scan resolution, "
-"colors and post-processing."
-msgstr ""
-"Luettavan asiakirjan tyyppi. Tämä asetus määrittää tarkkuuden, värit ja "
-"jälkiprosessoinnin."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
-msgid "Width of paper in tenths of a mm"
-msgstr "Paperin leveys kymmenesosamilleinä"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-"Paperin leveys kymmenesosamilleinä (tai 0 automaattista paperintunnistusta "
-"varten)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
-msgid "Height of paper in tenths of a mm"
-msgstr "Paperin pituus kymmenesosamilleinä"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-"Paperin pituus kymmenesosamilleinä (tai 0 automaattista paperintunnistusta "
-"varten)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "Brightness of scan"
-msgstr "Kuvanluvun kirkkaus"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "The brightness adjustment from -100 to 100 (0 being none)."
-msgstr "Kirkkaussäätö asteikolla -100 - 100 (0 on ei yhtään)"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid "Contrast of scan"
-msgstr "Kuvanluvun kontrasti"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "The contrast adjustment from -100 to 100 (0 being none)."
-msgstr "Kontrastisäätö asteikolla -100 - 100 (0 on ei yhtään)"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid "Resolution for text scans"
-msgstr "Tarkkuus tekstin lukemiseen"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
-msgid "The resolution in dots-per-inch to use when scanning text."
-msgstr "Käytettävä resoluutio pisteinä tuumaa kohti skannattaessa tekstiä."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
-msgid "Resolution for photo scans"
-msgstr "Tarkkuus valokuvien luvulle"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr "Käytettävä resoluutio pisteinä tuumaa kohti skannattaessa kuvia."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
-msgid "Page side to scan"
-msgstr "Skannattava puoli"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
-msgid "The page side to scan."
-msgstr "Skannattavan sivun puoli."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
-msgid "Directory to save files to"
-msgstr "Kansio, johon tiedostot tallennetaan"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
-msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
+#: data/simple-scan.desktop.in:8
+msgid "scanner"
 msgstr ""
-"Kansio, johon tiedostot tallennetaan. Oletusasetus on Asiakirjat-kansio."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
-msgid "Quality value to use for JPEG compression"
-msgstr "JPEG-pakkaukseen käytettävä laatuarvo"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Quality value to use for JPEG compression."
-msgstr "JPEG-pakkaukseen käytettävä laatuarvo."
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+#: data/simple-scan.appdata.xml.in:8
 msgid ""
 "A really easy way to scan both documents and photos. You can crop out the "
 "bad parts of a photo and rotate it if it is the wrong way round. You can "
@@ -417,198 +320,164 @@ msgstr ""
 "osat valokuvista pois tai kääntää niitä. Luettuja kuvia voidaan tulostaa, "
 "viedä PDF-muotoon tai tallentaa eri kuvamuodoissa."
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+#: data/simple-scan.appdata.xml.in:13
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 "Tämä sovellus käyttää SANE-kehystä tukeakseen useimpia olemassa olevia "
 "kuvanlukijoita."
 
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Kuvanlukijoita ei löydy. Yhdistä kuvanlukija."
 
-#. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "Kuvanlukijaan ei voi yhdistää"
 
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "Kuvanluvun käynnistäminen ei onnistu"
 
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1236 src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr "Virhe viestinnässä kuvanlukijan kanssa"
 
-#. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "Näytä julkaisuversio"
 
-#. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr "Tulosta virheenjäljitysviestit"
 
-#: ../src/simple-scan.vala:26
+#: src/simple-scan.vala:26
 msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr "Korjaa vanhemmilla Kuvanlukijan versioilla luodut PDF-tiedostot"
 
-#. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:391
+#: src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Kuvanluku epäonnistui"
 
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[LAITE...] - Skannaus apuohjelma"
 
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr "Näet kaikki komentorivivalitsimet komennolla \"%s --help\""
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:318 src/ui.vala:1602 src/ui.vala:1887
 msgid "_Close"
 msgstr "_Sulje"
 
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:327
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Käyttäjänimi ja salasana vaaditaan laitteelle ”%s” pääsemiseksi"
 
-#. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:375
 msgid "No scanners detected"
 msgstr "Kuvanlukijoita ei havaittu"
 
-#. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:377
 msgid "Please check your scanner is connected and powered on"
 msgstr "Varmista että kuvanlukijasi on yhdistetty ja kytketty päälle"
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:382
 msgid "Additional software needed"
 msgstr "Lisäohjelmistoja vaaditaan"
 
-#. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr "Kuvanlukijaa varten on asennettava erillinen ajuri."
 
-#. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:506 src/ui.vala:1843
 msgid "Save As..."
 msgstr "Tallenna nimellä..."
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:509 src/ui.vala:675
 msgid "_Cancel"
 msgstr "_Peru"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:510 src/ui.vala:676
 msgid "_Save"
 msgstr "_Tallenna"
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "Asiakirja kuvanlukijasta.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:521
 msgid "Image Files"
 msgstr "Kuvatiedostot"
 
-#. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:527
 msgid "All Files"
 msgstr "Kaikki tiedostot"
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (monisivuinen asiakirja)"
 
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (pakattu)"
 
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (häviötön)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:557
 msgid "File format:"
 msgstr "Tiedostomuoto:"
 
-#. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:650
 msgid "Failed to save file"
 msgstr "Tiedoston tallennus epäonnistui"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:673
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Jos et tallenna, muutokset katoavat pysyvästi."
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:708
+#: src/ui.vala:708
 msgid "Save current document?"
 msgstr "Tallennetaanko nykyinen asiakirja?"
 
-#. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:710
 msgid "Discard Changes"
 msgstr "Hylkää muutokset"
 
-#. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "Esikatselun tallennus epäonnistui"
 
-#. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "Esikatselusovelluksen avaus epäonnistui"
 
-#. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1206
 msgid "Combine sides"
 msgstr "Yhdistä puolet"
 
-#. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr "Yhdistä puolet (käänteinen)"
 
-#. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1226
 msgid "Reverse"
 msgstr "Käänteinen"
 
-#. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr "Säilytä muuttumattomana"
 
-#. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "Ohjetiedostoa ei voi avata"
 
-#. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1472
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -638,17 +507,15 @@ msgstr ""
 "tämän ohjelman mukana. Jos et saanut, katso lisätietoja osoitteesta "
 "<http://www.gnu.org/licenses/>."
 
-#. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "Tietoja sovelluksesta"
 
-#. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "Yksinkertainen asiakirjojen kuvanlukutyökalu"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -656,29 +523,24 @@ msgstr ""
 "  Heidi Mattila https://launchpad.net/~hessuk-deactivatedaccount\n"
 "  Jiri Grönroos https://launchpad.net/~jiri-gronroos\n"
 "  Juhani Numminen https://launchpad.net/~jsonic\n"
-"  Ncl8 https://launchpad.net/~crofle\n"
 "  Robert Ancell https://launchpad.net/~robert-ancell\n"
 "  Saku Salo https://launchpad.net/~sos\n"
 "  Timo Jyrinki https://launchpad.net/~timo-jyrinki\n"
 "  Ville Pilvio https://launchpad.net/~vpilvio"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "Tallennetaanko asiakirja ennen sovelluksen sulkemista?"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "Sulje tallentamatta"
 
-#. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr "Käytössäsi vaikuttaa olevan Brother-kuvanlukija."
 
-#. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1581
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
@@ -686,13 +548,11 @@ msgstr ""
 "Sen ajurit voi ladata <a href=\"http://support.brother.com\">Brotherin "
 "verkkosivustolta</a>."
 
-#. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr "Käytössäsi vaikuttaa olevan Samsung-kuvanlukija."
 
-#. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1587
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
@@ -700,18 +560,15 @@ msgstr ""
 "Sen ajurit voi ladata <a href=\"http://samsung.com/support\">Samsungin "
 "verkkosivustolta</a>."
 
-#. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr "Käytössäsi vaikuttaa olevan HP-kuvanlukija."
 
-#. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr "Käytössäsi vaikuttaa olevan Epson-kuvanlukija."
 
-#. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1598
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
@@ -719,140 +576,126 @@ msgstr ""
 "Sen ajurit voi ladata <a href=\"http://support.epson.com\">Epsonin "
 "verkkosivustolta</a>."
 
-#. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1602
 msgid "Install drivers"
 msgstr "Asenna ajurit"
 
-#. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 "Kun ajurit on asennettu, kuvanlukusovellus on käynnistettävä uudelleen."
 
-#. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr "Asennetaan ajureita..."
 
-#. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr "Ajurit asennettiin onnistuneesti!"
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Ajurien asentaminen epäonnistui (virhekoodi %d)."
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr "Ajurien asentaminen epäonnistui."
 
-#. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1676
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr "%s paketti/paketit tulee asentaa."
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (oletus)"
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (vedos)"
 
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (korkea tarkkuus)"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/ui.vala:1793
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1835
 msgid "New Document"
 msgstr "Uusi asiakirja"
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1840
 msgid "Document"
 msgstr "Asiakirja"
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1844
 msgid "Email..."
 msgstr "Sähköposti..."
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1845
 msgid "Print..."
 msgstr "Tulosta..."
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1853
 msgid "Help"
 msgstr "Ohje"
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1854
 msgid "About"
 msgstr "Tietoja"
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1855
 msgid "Quit"
 msgstr "Lopeta"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "Muuta _kuvanlukijaa"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr "_Asenna ajurit"
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1897
 msgid "Automatic"
 msgstr "Automaattinen"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1947
 msgid "Darker"
 msgstr "Tummempi"
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1949
 msgid "Lighter"
 msgstr "Vaaleampi"
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:1957
 msgid "Less"
 msgstr "Vähemmän"
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:1959
 msgid "More"
 msgstr "Enemmän"
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:1967
 msgid "Minimum"
 msgstr "Heikompi"
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:1969
 msgid "Maximum"
 msgstr "Parempi"
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2008
 msgid "Saving document..."
 msgstr "Tallennetaan asiakirjaa..."
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Tallennetaan sivua %d/%d"
@@ -880,18 +723,33 @@ msgstr "Tallennetaan sivua %d/%d"
 #~ "  --gtk-module=MODUULIT           Lataa lisäksi GTK+-moduulit\n"
 #~ "  --g-fatal-warnings              Tee kaikista varoituksista kuolettavia"
 
+#~ msgid "Device to scan from"
+#~ msgstr "Laite jolta luetaan"
+
 #~ msgid "Direction of scan"
 #~ msgstr "Lukemisen suunta"
 
+#~ msgid "SANE device to acquire images from."
+#~ msgstr "SANE-laite jolta kuvat luetaan."
+
 #~ msgid "Files missing"
 #~ msgstr "Tiedostoja puuttuu"
 
 #~ msgid "Height of scanned image in pixels"
 #~ msgstr "Luetun kuvan korkeus pikseleissä"
 
+#~ msgid "Resolution for text scans"
+#~ msgstr "Tarkkuus tekstin lukemiseen"
+
+#~ msgid "Resolution for photo scans"
+#~ msgstr "Tarkkuus valokuvien luvulle"
+
 #~ msgid "Resolution of last scanned image"
 #~ msgstr "Viimeisimmän luetun kuvan tarkkuus"
 
+#~ msgid "Directory to save files to"
+#~ msgstr "Kansio, johon tiedostot tallennetaan"
+
 #~ msgid "Window height in pixels"
 #~ msgstr "Ikkunan korkeus pikseleinä"
 
@@ -925,6 +783,14 @@ msgstr "Tallennetaan sivua %d/%d"
 #~ "Luettavan kuvan korkeus pikseleinä. Arvo päivittyy viimeisimmän luetun sivun "
 #~ "mukaan."
 
+#~ msgid ""
+#~ "The directory to save files to. Defaults to the documents directory if unset."
+#~ msgstr ""
+#~ "Kansio, johon tiedostot tallennetaan. Oletusasetus on Asiakirjat-kansio."
+
+#~ msgid "Type of document being scanned"
+#~ msgstr "Luettavan asiakirjan tyyppi"
+
 #~ msgid "Width of scanned image in pixels"
 #~ msgstr "Luettavan kuvan leveys pikseleinä"
 
@@ -935,11 +801,34 @@ msgstr "Tallennetaan sivua %d/%d"
 #~ "Skannattavan kuvan leveys pikseleinä. Arvo päivittyy viimeksi skannatun "
 #~ "sivun mukaan."
 
+#~ msgid "Page side to scan"
+#~ msgstr "Skannattava puoli"
+
+#~ msgid "Height of paper in tenths of a mm"
+#~ msgstr "Paperin pituus kymmenesosamilleinä"
+
 #~ msgid ""
 #~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
 #~ msgstr "Skannattava puoli. Mahdollisia valintoja ovat: molemmat, etu ja taka"
 
 #~ msgid ""
+#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr ""
+#~ "Paperin pituus kymmenesosamilleinä (tai 0 automaattista paperintunnistusta "
+#~ "varten)."
+
+#~ msgid ""
+#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr ""
+#~ "Paperin leveys kymmenesosamilleinä (tai 0 automaattista paperintunnistusta "
+#~ "varten)."
+
+#~ msgid "Width of paper in tenths of a mm"
+#~ msgstr "Paperin leveys kymmenesosamilleinä"
+
+#~ msgid ""
 #~ "Type of document being scanned. 'text' for text documents, 'photo' for "
 #~ "photos. This setting decides on the scan resolution, colors and post-"
 #~ "processing."
@@ -964,6 +853,12 @@ msgstr "Tallennetaan sivua %d/%d"
 #~ "  --help-all Näytä kaikki apuvalinnat\n"
 #~ "  --help-gtk Näytä kaikki GTK+-valinnat"
 
+#~ msgid "The resolution in dots-per-inch to use when scanning photos."
+#~ msgstr "Käytettävä resoluutio pisteinä tuumaa kohti skannattaessa kuvia."
+
+#~ msgid "The resolution in dots-per-inch to use when scanning text."
+#~ msgstr "Käytettävä resoluutio pisteinä tuumaa kohti skannattaessa tekstiä."
+
 #~ msgid "The resolution in dots-per-inch of the previously scanned image."
 #~ msgstr "Viimeksi skannatun kuvan resoluutio pisteinä tuumaa kohti."
 
@@ -975,5 +870,33 @@ msgstr "Tallennetaan sivua %d/%d"
 #~ "bottom' 'bottom-to-top' 'left-to-right' 'right-to-left' ('ylhäältä alas' "
 #~ "'alhaalta ylös' 'vasemmalta oikealle' 'oikealta vasemmalle')"
 
+#~ msgid ""
+#~ "Type of document being scanned. This setting decides on the scan resolution, "
+#~ "colors and post-processing."
+#~ msgstr ""
+#~ "Luettavan asiakirjan tyyppi. Tämä asetus määrittää tarkkuuden, värit ja "
+#~ "jälkiprosessoinnin."
+
+#~ msgid "The page side to scan."
+#~ msgstr "Skannattavan sivun puoli."
+
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "Skannerin kulkusuunta skannattavan sivun suhteen."
+
+#~ msgid "Quality value to use for JPEG compression."
+#~ msgstr "JPEG-pakkaukseen käytettävä laatuarvo."
+
+#~ msgid "Quality value to use for JPEG compression"
+#~ msgstr "JPEG-pakkaukseen käytettävä laatuarvo"
+
+#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
+#~ msgstr "Kirkkaussäätö asteikolla -100 - 100 (0 on ei yhtään)"
+
+#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
+#~ msgstr "Kontrastisäätö asteikolla -100 - 100 (0 on ei yhtään)"
+
+#~ msgid "Brightness of scan"
+#~ msgstr "Kuvanluvun kirkkaus"
+
+#~ msgid "Contrast of scan"
+#~ msgstr "Kuvanluvun kontrasti"
diff --git a/po/fr.gmo b/po/fr.gmo
new file mode 100644
index 0000000..4dbf713
--- /dev/null
+++ b/po/fr.gmo
diff --git a/po/fr.po b/po/fr.po
index 4cc92dc..115b355 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,412 +7,309 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-06 14:16+1200\n"
-"PO-Revision-Date: 2016-04-25 16:22+0000\n"
-"Last-Translator: Jean-Marc <Unknown>\n"
+"POT-Creation-Date: 2016-07-29 12:47+1200\n"
+"PO-Revision-Date: 2016-08-14 10:33+0000\n"
+"Last-Translator: Anne <anneonyme017@gmail.com>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-04-26 05:45+0000\n"
-"X-Generator: Launchpad (build 17995)\n"
+"X-Launchpad-Export-Date: 2016-08-15 05:22+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 
 #. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:2
+#: data/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_Autoriser"
 
 #. Label beside username entry
-#: ../data/simple-scan.ui.h:4
+#: data/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "_Utilisateur :"
 
 #. Label beside password entry
-#: ../data/simple-scan.ui.h:6
+#: data/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Mot de passe :"
 
 #. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:12
+#: data/simple-scan.ui:188
 msgid "Front and Back"
 msgstr "Recto-verso"
 
 #. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:14
+#: data/simple-scan.ui:192
 msgid "Front"
 msgstr "Recto"
 
 #. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:16
+#: data/simple-scan.ui:196
 msgid "Back"
 msgstr "Verso"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:18 ../data/simple-scan.desktop.in.h:1
+#: data/simple-scan.ui:225 data/simple-scan.ui:809
+#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr "Outil de numérisation Simple Scan"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:20
+#: data/simple-scan.ui:241
 msgid "_Document"
 msgstr "_Document"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:22
+#: data/simple-scan.ui:260
 msgid "Sc_an"
 msgstr "Nu_mériser"
 
+#. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:24
+#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
 msgid "Single _Page"
 msgstr "_Page unique"
 
+#. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:26
+#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr "Toutes les pages du _chargeur"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:28
+#: data/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "_Arrêter la numérisation"
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:8
+#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
 msgid "Text"
 msgstr "Texte"
 
-#. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:10
+#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
 msgid "Photo"
 msgstr "Photo"
 
 #. Menu item to reorder pages
-#. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1183 ../src/ui.vala:1841
+#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr "Réorganiser les pages"
 
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: data/simple-scan.ui:367
 msgid "_Email"
 msgstr "_Courriel"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: data/simple-scan.ui:430
 msgid "_Page"
 msgstr "_Page"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: data/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "Faire pivoter vers la _gauche"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: data/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "Faire pivoter vers la _droite"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: data/simple-scan.ui:460
 msgid "_Crop"
 msgstr "Re_cadrer"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: data/simple-scan.ui:470
 msgid "_None"
 msgstr "Aucu_n"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: data/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: data/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: data/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: data/simple-scan.ui:514
 msgid "_Letter"
 msgstr "_Letter (US)"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: data/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "_Legal (US)"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: data/simple-scan.ui:536
 msgid "4×6"
 msgstr "4 × 6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: data/simple-scan.ui:547
 msgid "_Custom"
 msgstr "_Personnalisé"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: data/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr "Faire pivote_r la sélection"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: data/simple-scan.ui:578
 msgid "Move Left"
 msgstr "Déplacer vers la gauche"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: data/simple-scan.ui:587
 msgid "Move Right"
 msgstr "Déplacer vers la droite"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: data/simple-scan.ui:624
 msgid "_Help"
 msgstr "_Aide"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: data/simple-scan.ui:632
 msgid "_Contents"
 msgstr "_Contenus"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: data/simple-scan.ui:674 data/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "Créer un nouveau document"
 
-#: ../data/simple-scan.ui.h:67
+#: data/simple-scan.ui:675
 msgid "New"
 msgstr "Nouveau"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: data/simple-scan.ui:689 data/simple-scan.ui:836
 msgid "Scan a single page from the scanner"
 msgstr "Numériser une seule page depuis le périphérique de numérisation"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: data/simple-scan.ui:691 data/simple-scan.ui:837
 msgid "Scan"
 msgstr "Numériser"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: data/simple-scan.ui:707 data/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "Enregistrer le document dans un fichier"
 
-#: ../data/simple-scan.ui.h:74
+#: data/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "Enregistrer"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: data/simple-scan.ui:724 data/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "Arrêter la numérisation en cours"
 
-#: ../data/simple-scan.ui.h:77
+#: data/simple-scan.ui:725 data/simple-scan.ui:825
 msgid "Stop"
 msgstr "Arrêter"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: data/simple-scan.ui:749 data/simple-scan.ui:936
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Faire pivoter la page vers la gauche (sens antihoraire)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: data/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "Faire pivoter vers la gauche"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: data/simple-scan.ui:764 data/simple-scan.ui:914
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Faire pivoter la page vers la droite (sens horaire)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: data/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "Faire pivoter vers la droite"
 
-#: ../data/simple-scan.ui.h:86
+#: data/simple-scan.ui:779 data/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "Recadrer la page sélectionnée"
 
-#: ../data/simple-scan.ui.h:87
+#: data/simple-scan.ui:781
 msgid "Crop"
 msgstr "Recadrer"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89
+#: data/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "Préférences"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: data/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "S_ource de numérisation :"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: data/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "Résolution pour le _texte :"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: data/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "Résolution de la _photo :"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: data/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "Face à numériser :"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: data/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "Taille de la page :"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: data/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "Luminosité :"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: data/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "Contraste :"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: data/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "Qualité :"
 
-#: ../data/simple-scan.desktop.in.h:2
+#: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr "Numériseur de documents"
 
-#: ../data/simple-scan.desktop.in.h:2
+#: data/simple-scan.desktop.in:5
 msgid "Scan Documents"
 msgstr "Numériser des documents"
 
-#: ../data/simple-scan.desktop.in.h:4
+#: data/simple-scan.desktop.in:6
 msgid "scan;scanner;flatbed;adf;"
 msgstr "numériser;scanner;numériseur;à plat;adf;"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Device to scan from"
-msgstr "Numériser depuis"
+#: data/simple-scan.desktop.in:8
+msgid "scanner"
+msgstr "numériseur"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "SANE device to acquire images from."
-msgstr "Périphérique SANE à utiliser pour l'acquisition des images."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "Type of document being scanned"
-msgstr "Type de document numérisé"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
-msgid ""
-"Type of document being scanned. This setting decides on the scan resolution, "
-"colors and post-processing."
-msgstr ""
-"Type de document numérisé. Ce réglage définit la résolution de numérisation, "
-"les couleurs et le post-traitement."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
-msgid "Width of paper in tenths of a mm"
-msgstr "Largeur du papier en dixièmes de mm."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-"La largeur du papier en dixièmes de mm (ou 0 pour une détection automatique "
-"du papier)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
-msgid "Height of paper in tenths of a mm"
-msgstr "Hauteur du papier en dixièmes de mm"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-"La hauteur du papier en dixièmes de mm (ou 0 pour une détection automatique "
-"du papier)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "Brightness of scan"
-msgstr "Luminosité de la numérisation"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "The brightness adjustment from -100 to 100 (0 being none)."
-msgstr "L'ajustement de la luminosité de -100 à 100 (0 pour aucun)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid "Contrast of scan"
-msgstr "Contraste de la numérisation"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "The contrast adjustment from -100 to 100 (0 being none)."
-msgstr "L'ajustement du contraste de -100 à 100 (0 pour aucun)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid "Resolution for text scans"
-msgstr "Résolution des numérisations de textes"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
-msgid "The resolution in dots-per-inch to use when scanning text."
-msgstr ""
-"La résolution en points par pouce à utiliser lors de la numérisation de "
-"texte."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
-msgid "Resolution for photo scans"
-msgstr "Résolution des numérisations de photos"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr ""
-"La résolution en points par pouce à utiliser lors de la numérisation de "
-"photos."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
-msgid "Page side to scan"
-msgstr "Face(s) de la page à numériser"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
-msgid "The page side to scan."
-msgstr "La face de la page à numériser."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
-msgid "Directory to save files to"
-msgstr "Dossier dans lequel les fichiers sont enregistrés"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
-msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
-msgstr ""
-"Le dossier dans lequel les fichiers sont enregistrés. S'il n'est pas défini, "
-"le dossier « Documents » sera utilisé par défaut."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
-msgid "Quality value to use for JPEG compression"
-msgstr "Taux de qualité à utiliser pour la compression JPEG"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Quality value to use for JPEG compression."
-msgstr "Taux de qualité à utiliser pour la compression JPEG."
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+#: data/simple-scan.appdata.xml.in:8
 msgid ""
 "A really easy way to scan both documents and photos. You can crop out the "
 "bad parts of a photo and rotate it if it is the wrong way round. You can "
@@ -424,204 +321,171 @@ msgstr ""
 "sens. Vous pouvez imprimer vos numérisations, les exporter au format pdf ou "
 "les enregistrer dans d'autres formats d'image."
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+#: data/simple-scan.appdata.xml.in:13
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 "Simple Scan utilise la structure logicielle de SANE pour prendre en charge "
 "la plupart des périphériques de numérisation existants."
 
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:840
+#: src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr ""
 "Aucun périphérique de numérisation disponible. Veuillez en connecter un."
 
-#. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:870
+#: src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "Impossible de se connecter au périphérique de numérisation"
 
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1222
+#: src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "Impossible de démarrer la numérisation"
 
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1235 ../src/scanner.vala:1332
+#: src/scanner.vala:1236 src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr "Erreur de communication avec le périphérique de numérisation"
 
-#. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "Afficher les informations de version"
 
-#. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr "Afficher les messages de débogage"
 
-#: ../src/simple-scan.vala:26
+#: src/simple-scan.vala:26
 msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr ""
 "Corriger les fichiers PDF générés avec les anciennes versions de Simple Scan"
 
-#. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:297
+#: src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Échec de la numérisation"
 
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DEVICE...] - Outil de numérisation"
 
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Exécutez « %s --help » pour voir la liste complète des options disponibles "
 "en ligne de commande."
 
-#: ../src/ui.vala:242 ../src/ui.vala:1525
+#: src/ui.vala:318 src/ui.vala:1602 src/ui.vala:1887
 msgid "_Close"
 msgstr "_Fermer"
 
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:251
+#: src/ui.vala:327
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Nom d'utilisateur et mot de passe nécessaires pour accéder à « %s »"
 
-#. Warning displayed when no scanners are detected
-#: ../src/ui.vala:296
+#: src/ui.vala:375
 msgid "No scanners detected"
 msgstr "Aucun périphérique de numérisation n'a été détecté."
 
-#. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:298
+#: src/ui.vala:377
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 "Veuillez vérifier que votre périphérique de numérisation est connecté et "
 "sous tension."
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:382
 msgid "Additional software needed"
 msgstr "Logiciel supplémentaire nécessaire"
 
-#. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr "Vous devez installer le logiciel du pilote de votre scanner."
 
-#. Save dialog: Dialog title
-#: ../src/ui.vala:440
+#: src/ui.vala:506 src/ui.vala:1843
 msgid "Save As..."
 msgstr "Enregistrer sous..."
 
-#: ../src/ui.vala:443 ../src/ui.vala:605
+#: src/ui.vala:509 src/ui.vala:675
 msgid "_Cancel"
 msgstr "_Annuler"
 
-#: ../src/ui.vala:444 ../src/ui.vala:606
+#: src/ui.vala:510 src/ui.vala:676
 msgid "_Save"
 msgstr "_Enregistrer"
 
-#: ../src/ui.vala:118
+#: src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "Document numérisé.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:454
+#: src/ui.vala:521
 msgid "Image Files"
 msgstr "Fichiers image"
 
-#. Save dialog: Filter name to show all files
-#: ../src/ui.vala:460
+#: src/ui.vala:527
 msgid "All Files"
 msgstr "Tous les fichiers"
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:479
+#: src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (document multipage)"
 
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:485
+#: src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (compressé)"
 
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:491
+#: src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (sans perte)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:557
 msgid "File format:"
 msgstr "Format du fichier :"
 
-#. Title of error dialog when save failed
-#: ../src/ui.vala:580
+#: src/ui.vala:650
 msgid "Failed to save file"
 msgstr "Impossible d'enregistrer le fichier"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:603
+#: src/ui.vala:673
 msgid "If you don't save, changes will be permanently lost."
 msgstr ""
 "Si vous n'enregistrez pas, les modifications seront définitivement perdues."
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:638
+#: src/ui.vala:708
 msgid "Save current document?"
 msgstr "Enregistrer le document actuel ?"
 
-#. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:640
+#: src/ui.vala:710
 msgid "Discard Changes"
 msgstr "Abandonner les modifications"
 
-#. Error message display when unable to save image for preview
-#: ../src/ui.vala:924
+#: src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "Impossible d'enregistrer l'image pour la prévisualiser"
 
-#. Error message display when unable to preview image
-#: ../src/ui.vala:936
+#: src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "Impossible d'ouvrir l'aperçu de l'image"
 
-#. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1206
 msgid "Combine sides"
 msgstr "Associer les côtés"
 
-#. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr "Associer les côtés (inverser)"
 
-#. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1226
 msgid "Reverse"
 msgstr "Inverser"
 
-#. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr "Maintenir inchangé"
 
-#. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1207
+#: src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "Impossible d'ouvrir le fichier d'aide"
 
-#. The license this software is under (GPL3+)
-#: ../src/ui.vala:1228
+#: src/ui.vala:1472
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -650,17 +514,15 @@ msgstr ""
 "en même temps que ce programme ; si ce n'est pas le cas, consultez\n"
 "<http://www.gnu.org/licenses/>."
 
-#. Title of about dialog
-#: ../src/ui.vala:1231
+#: src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "À propos de Simple Scan"
 
-#. Description of program
-#: ../src/ui.vala:1234
+#: src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "Numériser simplement vos documents"
 
-#: ../src/ui.vala:1243
+#: src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -672,12 +534,9 @@ msgstr ""
 "  Bruno Patri https://launchpad.net/~bruno666-deactivatedaccount\n"
 "  Christophe Herot https://launchpad.net/~tictoc-free\n"
 "  Darknautilus https://launchpad.net/~darknautilus\n"
-"  David Bosman https://launchpad.net/~david-bosman\n"
 "  Emmanuel Sunyer https://launchpad.net/~esunyer\n"
-"  Fabien Lusseau https://launchpad.net/~fabien-beosfrance\n"
 "  Florent Thévenet https://launchpad.net/~florent-thevenet\n"
 "  François Tissandier https://launchpad.net/~baloo\n"
-"  Grégoire Seux https://launchpad.net/~kamaradclimber\n"
 "  Guillaume Lanquepin-Chesnais https://launchpad.net/~guyomel\n"
 "  Jean-Marc https://launchpad.net/~m-balthazar\n"
 "  Jörg BUCHMANN https://launchpad.net/~jorg-buchmann\n"
@@ -691,7 +550,6 @@ msgstr ""
 "  Pierre Slamich https://launchpad.net/~pierre-slamich\n"
 "  RemiJ https://launchpad.net/~remij\n"
 "  Robert Ancell https://launchpad.net/~robert-ancell\n"
-"  Simon THOBY https://launchpad.net/~simonthoby-deactivatedaccount\n"
 "  Stanislas Michalak https://launchpad.net/~stanislas-michalak\n"
 "  Sylvie Gallet https://launchpad.net/~sylvie-gallet\n"
 "  Tankypon https://launchpad.net/~tankypon\n"
@@ -703,23 +561,19 @@ msgstr ""
 "  londumas https://launchpad.net/~helion331990\n"
 "  torglut https://launchpad.net/~torglut"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1265
+#: src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "Enregistrer le document avant de quitter ?"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1267
+#: src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "Quitter sans enregistrer"
 
-#. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr "Il semblerait que vous ayez un scanner Brother."
 
-#. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1581
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
@@ -727,13 +581,11 @@ msgstr ""
 "Les pilotes sont disponibles sur le <a "
 "href=\"http://support.brother.com\">site Web de Brother</a>."
 
-#. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr "Il semblerait que vous ayez un scanner Samsung."
 
-#. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1587
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
@@ -741,18 +593,15 @@ msgstr ""
 "Les pilotes sont disponibles sur le <a "
 "href=\"http://samsung.com/support\">site Web de Samsung</a>."
 
-#. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr "Il semblerait que vous ayez un scanner HP."
 
-#. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr "Il semblerait que vous ayez un scanner Epson."
 
-#. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1598
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
@@ -760,139 +609,125 @@ msgstr ""
 "Les pilotes sont disponibles sur le <a "
 "href=\"http://support.epson.com\">site web d'Epson</a>."
 
-#. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1602
 msgid "Install drivers"
 msgstr "Installer les pilotes"
 
-#. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "Une fois installés, vous devrez redémarrer Simple Scan."
 
-#. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr "Installation des pilotes..."
 
-#. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr "Pilotes installés avec succès !"
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Impossible d'installer les pilotes (code d'erreur %d)."
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr "Impossible d'installer les pilotes."
 
-#. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1676
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr "Vous devez installer le(s) paquet(s) %s."
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1386
+#: src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d ppp (par défaut)"
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1389
+#: src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d ppp (brouillon)"
 
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1392
+#: src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d ppp (haute résolution)"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1395
+#: src/ui.vala:1793
 #, c-format
 msgid "%d dpi"
 msgstr "%d ppp"
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1835
 msgid "New Document"
 msgstr "Nouveau document"
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1840
 msgid "Document"
 msgstr "Document"
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1844
 msgid "Email..."
 msgstr "Courriel..."
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1845
 msgid "Print..."
 msgstr "Imprimer..."
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1853
 msgid "Help"
 msgstr "Aide"
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1854
 msgid "About"
 msgstr "À propos"
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1855
 msgid "Quit"
 msgstr "Quitter"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1527
+#: src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "Changer de _périphérique de numérisation"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr "_Installer les pilotes"
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1533
+#: src/ui.vala:1897
 msgid "Automatic"
 msgstr "Automatique"
 
-#: ../src/ui.vala:1583
+#: src/ui.vala:1947
 msgid "Darker"
 msgstr "Plus foncé"
 
-#: ../src/ui.vala:1585
+#: src/ui.vala:1949
 msgid "Lighter"
 msgstr "Plus clair"
 
-#: ../src/ui.vala:1593
+#: src/ui.vala:1957
 msgid "Less"
 msgstr "Moins"
 
-#: ../src/ui.vala:1595
+#: src/ui.vala:1959
 msgid "More"
 msgstr "Plus"
 
-#: ../src/ui.vala:1603
+#: src/ui.vala:1967
 msgid "Minimum"
 msgstr "Minimum"
 
-#: ../src/ui.vala:1605
+#: src/ui.vala:1969
 msgid "Maximum"
 msgstr "Maximum"
 
-#: ../src/ui.vala:1636
+#: src/ui.vala:2008
 msgid "Saving document..."
 msgstr "Enregistrement du document..."
 
-#: ../src/ui.vala:1786
+#: src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Enregistrement de la page %d sur %d"
@@ -959,9 +794,15 @@ msgstr "Enregistrement de la page %d sur %d"
 #~ msgid "Height of scanned image in pixels"
 #~ msgstr "Hauteur de l'image numérisée en pixels"
 
+#~ msgid "SANE device to acquire images from."
+#~ msgstr "Périphérique SANE à utiliser pour l'acquisition des images."
+
 #~ msgid "Resolution of last scanned image"
 #~ msgstr "Résolution de la dernière image numérisée"
 
+#~ msgid "Device to scan from"
+#~ msgstr "Numériser depuis"
+
 #~ msgid "Direction of scan"
 #~ msgstr "Sens de numérisation"
 
@@ -995,6 +836,16 @@ msgstr "Enregistrement de la page %d sur %d"
 #~ msgid "The resolution in dots-per-inch of the previously scanned image."
 #~ msgstr "La résolution de la dernière image numérisée en points par pouce."
 
+#~ msgid "The resolution in dots-per-inch to use when scanning text."
+#~ msgstr ""
+#~ "La résolution en points par pouce à utiliser lors de la numérisation de "
+#~ "texte."
+
+#~ msgid "The resolution in dots-per-inch to use when scanning photos."
+#~ msgstr ""
+#~ "La résolution en points par pouce à utiliser lors de la numérisation de "
+#~ "photos."
+
 #~ msgid "Width of scanned image in pixels"
 #~ msgstr "Largeur de l'image numérisée en pixels"
 
@@ -1010,14 +861,83 @@ msgstr "Enregistrement de la page %d sur %d"
 #~ msgid "Select File _Type"
 #~ msgstr "Sélectionner le _type de fichier"
 
+#~ msgid "Height of paper in tenths of a mm"
+#~ msgstr "Hauteur du papier en dixièmes de mm"
+
 #~ msgid ""
 #~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
 #~ msgstr ""
 #~ "La ou les faces de la page à numériser. Cela peut être au choix : « Recto "
 #~ "verso », « Recto » ou « Verso »"
 
+#~ msgid ""
+#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr ""
+#~ "La largeur du papier en dixièmes de mm (ou 0 pour une détection automatique "
+#~ "du papier)."
+
+#~ msgid "Page side to scan"
+#~ msgstr "Face(s) de la page à numériser"
+
+#~ msgid ""
+#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr ""
+#~ "La hauteur du papier en dixièmes de mm (ou 0 pour une détection automatique "
+#~ "du papier)."
+
+#~ msgid "Width of paper in tenths of a mm"
+#~ msgstr "Largeur du papier en dixièmes de mm."
+
+#~ msgid "Directory to save files to"
+#~ msgstr "Dossier dans lequel les fichiers sont enregistrés"
+
+#~ msgid ""
+#~ "Type of document being scanned. This setting decides on the scan resolution, "
+#~ "colors and post-processing."
+#~ msgstr ""
+#~ "Type de document numérisé. Ce réglage définit la résolution de numérisation, "
+#~ "les couleurs et le post-traitement."
+
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "Le sens du scanner par rapport à la page numérisée."
 
 #~ msgid "4&#xD7;6"
 #~ msgstr "4&#xD7;6"
+
+#~ msgid "Resolution for text scans"
+#~ msgstr "Résolution des numérisations de textes"
+
+#~ msgid "Resolution for photo scans"
+#~ msgstr "Résolution des numérisations de photos"
+
+#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
+#~ msgstr "L'ajustement du contraste de -100 à 100 (0 pour aucun)."
+
+#~ msgid "Contrast of scan"
+#~ msgstr "Contraste de la numérisation"
+
+#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
+#~ msgstr "L'ajustement de la luminosité de -100 à 100 (0 pour aucun)."
+
+#~ msgid "Brightness of scan"
+#~ msgstr "Luminosité de la numérisation"
+
+#~ msgid "Quality value to use for JPEG compression"
+#~ msgstr "Taux de qualité à utiliser pour la compression JPEG"
+
+#~ msgid "Quality value to use for JPEG compression."
+#~ msgstr "Taux de qualité à utiliser pour la compression JPEG."
+
+#~ msgid "Type of document being scanned"
+#~ msgstr "Type de document numérisé"
+
+#~ msgid "The page side to scan."
+#~ msgstr "La face de la page à numériser."
+
+#~ msgid ""
+#~ "The directory to save files to. Defaults to the documents directory if unset."
+#~ msgstr ""
+#~ "Le dossier dans lequel les fichiers sont enregistrés. S'il n'est pas défini, "
+#~ "le dossier « Documents » sera utilisé par défaut."
diff --git a/po/fr_CA.gmo b/po/fr_CA.gmo
new file mode 100644
index 0000000..44f6bd1
--- /dev/null
+++ b/po/fr_CA.gmo
diff --git a/po/fr_CA.po b/po/fr_CA.po
new file mode 100644
index 0000000..0bddf9b
--- /dev/null
+++ b/po/fr_CA.po
@@ -0,0 +1,785 @@
+# French (Canada) translation for simple-scan
+# Copyright (c) 2016 Rosetta Contributors and Canonical Ltd 2016
+# This file is distributed under the same license as the simple-scan package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2016.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: simple-scan\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2016-07-29 12:47+1200\n"
+"PO-Revision-Date: 2016-04-13 19:31+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: French (Canada) <fr_CA@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2016-07-30 05:46+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
+
+#. Button to submit authorization dialog
+#: data/simple-scan.ui:24
+msgid "_Authorize"
+msgstr "_Autoriser"
+
+#. Label beside username entry
+#: data/simple-scan.ui:102
+msgid "_Username for resource:"
+msgstr "_Utilisateur :"
+
+#. Label beside password entry
+#: data/simple-scan.ui:117
+msgid "_Password:"
+msgstr "_Mot de passe :"
+
+#. Combo box label for scanning both sides of a page
+#: data/simple-scan.ui:188
+msgid "Front and Back"
+msgstr "Recto-verso"
+
+#. Combo box label for scanning the front side of a page
+#: data/simple-scan.ui:192
+msgid "Front"
+msgstr "Recto"
+
+#. Combo box label for scanning the back side of a page
+#: data/simple-scan.ui:196
+msgid "Back"
+msgstr "Verso"
+
+#. Title of scan window
+#: data/simple-scan.ui:225 data/simple-scan.ui:809
+#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
+msgid "Simple Scan"
+msgstr "Outil de numérisation Simple Scan"
+
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: data/simple-scan.ui:241
+msgid "_Document"
+msgstr "_Document"
+
+#. Scan menu item
+#: data/simple-scan.ui:260
+msgid "Sc_an"
+msgstr "Nu_mériser"
+
+#. Scan menu item to scan a single page from the scanner
+#. Toolbar scan menu item to scan a single page from the scanner
+#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+msgid "Single _Page"
+msgstr "_Page unique"
+
+#. Scan menu item to scan all pages from a document feeder
+#. Toolbar scan menu item to scan all pages from a document feeder
+#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+msgid "All Pages From _Feeder"
+msgstr "Toutes les pages du _bac"
+
+#. Menu entry to stop current scan
+#: data/simple-scan.ui:294
+msgid "_Stop Scan"
+msgstr "_Arrêter la numérisation"
+
+#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+msgid "Text"
+msgstr "Texte"
+
+#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+msgid "Photo"
+msgstr "Photo"
+
+#. Menu item to reorder pages
+#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
+msgid "Reorder Pages"
+msgstr "Réorganiser les pages"
+
+#. Label on email menu item
+#: data/simple-scan.ui:367
+msgid "_Email"
+msgstr "_Courriel"
+
+#. Page menu (contains action for each page, e.g. delete, crop)
+#: data/simple-scan.ui:430
+msgid "_Page"
+msgstr "_Page"
+
+#. Menu item to rotate page to left (anti-clockwise)
+#: data/simple-scan.ui:440
+msgid "Rotate _Left"
+msgstr "Faire pivoter vers la _gauche"
+
+#. Menu item to rotate page to right (clockwise)
+#: data/simple-scan.ui:450
+msgid "Rotate _Right"
+msgstr "Faire pivoter vers la _droite"
+
+#. Label for page crop submenu
+#: data/simple-scan.ui:460
+msgid "_Crop"
+msgstr "Re_cadrer"
+
+#. Radio button for no crop
+#: data/simple-scan.ui:470
+msgid "_None"
+msgstr "Aucu_n"
+
+#. Radio button for cropping page to A4 size
+#: data/simple-scan.ui:481
+msgid "A_4"
+msgstr "A_4"
+
+#. Radio button for cropping page to A5 size
+#: data/simple-scan.ui:492
+msgid "A_5"
+msgstr "A_5"
+
+#. Radio button for cropping page to A6 size
+#: data/simple-scan.ui:503
+msgid "A_6"
+msgstr "A_6"
+
+#. Radio button for cropping page to US letter size
+#: data/simple-scan.ui:514
+msgid "_Letter"
+msgstr "_Letter (US)"
+
+#. Radio button for cropping to page to US legal size
+#: data/simple-scan.ui:525
+msgid "Le_gal"
+msgstr "_Legal (US)"
+
+#. Radio button for cropping page to 4x6 inch
+#: data/simple-scan.ui:536
+msgid "4×6"
+msgstr "4 × 6"
+
+#. Radio button for cropping to custom page size
+#: data/simple-scan.ui:547
+msgid "_Custom"
+msgstr "_Personnalisé"
+
+#. Menu item to rotate the crop area
+#: data/simple-scan.ui:565
+msgid "_Rotate Crop"
+msgstr "Faire pivote_r la sélection"
+
+#. Menu item to move the selected page to the left
+#: data/simple-scan.ui:578
+msgid "Move Left"
+msgstr "Déplacer vers la gauche"
+
+#. Menu item to move the selected page to the right
+#: data/simple-scan.ui:587
+msgid "Move Right"
+msgstr "Déplacer vers la droite"
+
+#. Label on help menu
+#: data/simple-scan.ui:624
+msgid "_Help"
+msgstr "_Aide"
+
+#. Help|Contents menu
+#: data/simple-scan.ui:632
+msgid "_Contents"
+msgstr "_Contenus"
+
+#. Tooltip for new document button
+#: data/simple-scan.ui:674 data/simple-scan.ui:885
+msgid "Start a new document"
+msgstr "Créer un nouveau document"
+
+#: data/simple-scan.ui:675
+msgid "New"
+msgstr "Nouveau"
+
+#. Tooltip for scan toolbar button
+#: data/simple-scan.ui:689 data/simple-scan.ui:836
+msgid "Scan a single page from the scanner"
+msgstr "Numériser une seule page depuis le périphérique de numérisation"
+
+#. Label on scan toolbar item
+#: data/simple-scan.ui:691 data/simple-scan.ui:837
+msgid "Scan"
+msgstr "Numériser"
+
+#. Tooltip for save toolbar button
+#: data/simple-scan.ui:707 data/simple-scan.ui:864
+msgid "Save document to a file"
+msgstr "Enregistrer le document dans un fichier"
+
+#: data/simple-scan.ui:709 src/ui.vala:1842
+msgid "Save"
+msgstr "Enregistrer"
+
+#. Tooltip for stop button
+#: data/simple-scan.ui:724 data/simple-scan.ui:824
+msgid "Stop the current scan"
+msgstr "Arrêter la numérisation en cours"
+
+#: data/simple-scan.ui:725 data/simple-scan.ui:825
+msgid "Stop"
+msgstr "Arrêter"
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: data/simple-scan.ui:749 data/simple-scan.ui:936
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Faire pivoter la page vers la gauche (sens antihoraire)"
+
+#. Label on rotate page left (anti-clockwise) item
+#: data/simple-scan.ui:750
+msgid "Rotate Left"
+msgstr "Faire pivoter vers la gauche"
+
+#. Tooltip for rotate right (clockwise) button
+#: data/simple-scan.ui:764 data/simple-scan.ui:914
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Faire pivoter la page vers la droite (sens horaire)"
+
+#. Label on rotate page right (clockwise) item
+#: data/simple-scan.ui:765
+msgid "Rotate Right"
+msgstr "Faire pivoter vers la droite"
+
+#: data/simple-scan.ui:779 data/simple-scan.ui:963
+msgid "Crop the selected page"
+msgstr "Recadrer la page sélectionnée"
+
+#: data/simple-scan.ui:781
+msgid "Crop"
+msgstr "Recadrer"
+
+#. Title of preferences dialog
+#: data/simple-scan.ui:997 src/ui.vala:1849
+msgid "Preferences"
+msgstr "Préférences"
+
+#. Label beside scan source combo box
+#: data/simple-scan.ui:1048
+msgid "Scan S_ource:"
+msgstr "S_ource de numérisation :"
+
+#. Label beside scan source combo box
+#: data/simple-scan.ui:1079
+msgid "_Text Resolution:"
+msgstr "Résolution pour le _texte :"
+
+#. Label beside scan source combo box
+#: data/simple-scan.ui:1095
+msgid "_Photo Resolution:"
+msgstr "Résolution de la _photo :"
+
+#. Label beside scan side combo box
+#: data/simple-scan.ui:1139
+msgid "Scan Side:"
+msgstr "Face à numériser :"
+
+#. Label beside page size combo box
+#: data/simple-scan.ui:1169
+msgid "Page Size:"
+msgstr "Taille de la page :"
+
+#. Label beside brightness scale
+#: data/simple-scan.ui:1199
+msgid "Brightness:"
+msgstr "Luminosité :"
+
+#. Label beside contrast scale
+#: data/simple-scan.ui:1229
+msgid "Contrast:"
+msgstr "Contraste :"
+
+#. Label beside quality scale
+#: data/simple-scan.ui:1260
+msgid "Quality:"
+msgstr "Qualité :"
+
+#: data/simple-scan.desktop.in:4
+msgid "Document Scanner"
+msgstr "Numériseur de documents"
+
+#: data/simple-scan.desktop.in:5
+msgid "Scan Documents"
+msgstr "Numériser des documents"
+
+#: data/simple-scan.desktop.in:6
+msgid "scan;scanner;flatbed;adf;"
+msgstr "numériser;scanner;numériseur;à plat;adf;"
+
+#: data/simple-scan.desktop.in:8
+msgid "scanner"
+msgstr ""
+
+#: data/simple-scan.appdata.xml.in:8
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+"Une façon très simple de numériser à la fois documents et photos. Vous "
+"pouvez recadrer une photo et la faire pivoter si elle est dans le mauvais "
+"sens. Vous pouvez imprimer vos numérisations, les exporter au format pdf ou "
+"les enregistrer dans d'autres formats d'image."
+
+#: data/simple-scan.appdata.xml.in:13
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+"Simple Scan utilise la structure logicielle de SANE pour prendre en charge "
+"la plupart des périphériques de numérisation existants."
+
+#: src/scanner.vala:841
+msgid "No scanners available.  Please connect a scanner."
+msgstr ""
+"Aucun périphérique de numérisation disponible. Veuillez en connecter un."
+
+#: src/scanner.vala:871
+msgid "Unable to connect to scanner"
+msgstr "Impossible de se connecter au périphérique de numérisation"
+
+#: src/scanner.vala:1223
+msgid "Unable to start scan"
+msgstr "Impossible de démarrer la numérisation"
+
+#: src/scanner.vala:1236 src/scanner.vala:1333
+msgid "Error communicating with scanner"
+msgstr "Erreur de communication avec le périphérique de numérisation"
+
+#: src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "Afficher les informations de version"
+
+#: src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Afficher les messages de débogage"
+
+#: src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+msgstr ""
+"Corriger les fichiers PDF générés avec les anciennes versions de Simple Scan"
+
+#: src/simple-scan.vala:391
+msgid "Failed to scan"
+msgstr "Échec de la numérisation"
+
+#: src/simple-scan.vala:621
+msgid "[DEVICE...] - Scanning utility"
+msgstr "[DEVICE...] - Outil de numérisation"
+
+#: src/simple-scan.vala:632
+#, c-format
+msgid "Run '%s --help' to see a full list of available command line options."
+msgstr ""
+"Exécutez « %s --help » pour voir la liste complète des options disponibles "
+"en ligne de commande."
+
+#: src/ui.vala:318 src/ui.vala:1602 src/ui.vala:1887
+msgid "_Close"
+msgstr "_Fermer"
+
+#: src/ui.vala:327
+#, c-format
+msgid "Username and password required to access '%s'"
+msgstr "Nom d'utilisateur et mot de passe nécessaires pour accéder à « %s »"
+
+#: src/ui.vala:375
+msgid "No scanners detected"
+msgstr "Aucun périphérique de numérisation n'a été détecté."
+
+#: src/ui.vala:377
+msgid "Please check your scanner is connected and powered on"
+msgstr ""
+"Veuillez vérifier que votre périphérique de numérisation est connecté et "
+"sous tension."
+
+#: src/ui.vala:382
+msgid "Additional software needed"
+msgstr "Logiciel supplémentaire nécessaire"
+
+#: src/ui.vala:384
+msgid "You need to install driver software for your scanner."
+msgstr "Vous devez installer le logiciel du pilote de votre scanner."
+
+#: src/ui.vala:506 src/ui.vala:1843
+msgid "Save As..."
+msgstr "Enregistrer sous..."
+
+#: src/ui.vala:509 src/ui.vala:675
+msgid "_Cancel"
+msgstr "_Annuler"
+
+#: src/ui.vala:510 src/ui.vala:676
+msgid "_Save"
+msgstr "_Enregistrer"
+
+#: src/ui.vala:516
+msgid "Scanned Document.pdf"
+msgstr "Document numérisé.pdf"
+
+#: src/ui.vala:521
+msgid "Image Files"
+msgstr "Fichiers image"
+
+#: src/ui.vala:527
+msgid "All Files"
+msgstr "Tous les fichiers"
+
+#: src/ui.vala:536
+msgid "PDF (multi-page document)"
+msgstr "PDF (document multipage)"
+
+#: src/ui.vala:542
+msgid "JPEG (compressed)"
+msgstr "JPEG (compressé)"
+
+#: src/ui.vala:548
+msgid "PNG (lossless)"
+msgstr "PNG (sans perte)"
+
+#: src/ui.vala:557
+msgid "File format:"
+msgstr "Format du fichier :"
+
+#: src/ui.vala:650
+msgid "Failed to save file"
+msgstr "Impossible d'enregistrer le fichier"
+
+#: src/ui.vala:673
+msgid "If you don't save, changes will be permanently lost."
+msgstr ""
+"Si vous n'enregistrez pas, les modifications seront définitivement perdues."
+
+#: src/ui.vala:708
+msgid "Save current document?"
+msgstr "Enregistrer le document actuel ?"
+
+#: src/ui.vala:710
+msgid "Discard Changes"
+msgstr "Abandonner les modifications"
+
+#: src/ui.vala:992
+msgid "Unable to save image for preview"
+msgstr "Impossible d'enregistrer l'image pour la prévisualiser"
+
+#: src/ui.vala:1004
+msgid "Unable to open image preview application"
+msgstr "Impossible d'ouvrir l'aperçu de l'image"
+
+#: src/ui.vala:1206
+msgid "Combine sides"
+msgstr "Associer les côtés"
+
+#: src/ui.vala:1216
+msgid "Combine sides (reverse)"
+msgstr "Associer les côtés (inverser)"
+
+#: src/ui.vala:1226
+msgid "Reverse"
+msgstr "Inverser"
+
+#: src/ui.vala:1236
+msgid "Keep unchanged"
+msgstr "Maintenir inchangé"
+
+#: src/ui.vala:1451
+msgid "Unable to open help file"
+msgstr "Impossible d'ouvrir le fichier d'aide"
+
+#: src/ui.vala:1472
+msgid ""
+"This program is free software: you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation, either version 3 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License\n"
+"along with this program.  If not, see <http://www.gnu.org/licenses/>."
+msgstr ""
+"Ce programme est libre, vous pouvez le redistribuer et/ou le modifier\n"
+"selon les termes de la licence publique générale (GPL) GNU publiée\n"
+"par la Free Software Foundation, dans sa version 3 ou supérieure\n"
+"(selon votre choix).\n"
+"\n"
+"Ce programme est distribué dans l'espoir d'être utile, mais\n"
+"SANS AUCUNE GARANTIE, y compris les garanties de \n"
+"COMMERCIALISATION ou d'ADAPTATION À UN BUT SPÉCIFIQUE.\n"
+"Consultez la licence publique générale GNU pour plus de détails.\n"
+"\n"
+"Vous devez avoir reçu une copie de la licence publique générale GNU\n"
+"en même temps que ce programme ; si ce n'est pas le cas, consultez\n"
+"<http://www.gnu.org/licenses/>."
+
+#: src/ui.vala:1475
+msgid "About Simple Scan"
+msgstr "À propos de Simple Scan"
+
+#: src/ui.vala:1478
+msgid "Simple document scanning tool"
+msgstr "Numériser simplement vos documents"
+
+#: src/ui.vala:1487
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  Mathieu Marin https://launchpad.net/~rama-197"
+
+#: src/ui.vala:1509
+msgid "Save document before quitting?"
+msgstr "Enregistrer le document avant de quitter ?"
+
+#: src/ui.vala:1511
+msgid "Quit without Saving"
+msgstr "Quitter sans enregistrer"
+
+#: src/ui.vala:1579
+msgid "You appear to have a Brother scanner."
+msgstr "Il semblerait que vous ayez un scanner Brother."
+
+#: src/ui.vala:1581
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.brother.com\">Brother website</a>."
+msgstr ""
+"Les pilotes sont disponibles sur le <a "
+"href=\"http://support.brother.com\">site Web de Brother</a>."
+
+#: src/ui.vala:1585
+msgid "You appear to have a Samsung scanner."
+msgstr "Il semblerait que vous ayez un scanner Samsung."
+
+#: src/ui.vala:1587
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://samsung.com/support\">Samsung website</a>."
+msgstr ""
+"Les pilotes sont disponibles sur le <a "
+"href=\"http://samsung.com/support\">site Web de Samsung</a>."
+
+#: src/ui.vala:1591
+msgid "You appear to have an HP scanner."
+msgstr "Il semblerait que vous ayez un scanner HP."
+
+#: src/ui.vala:1596
+msgid "You appear to have an Epson scanner."
+msgstr "Il semblerait que vous ayez un scanner Epson."
+
+#: src/ui.vala:1598
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.epson.com\">Epson website</a>."
+msgstr ""
+"Les pilotes sont disponibles sur le <a "
+"href=\"http://support.epson.com\">site web d'Epson</a>."
+
+#: src/ui.vala:1602
+msgid "Install drivers"
+msgstr "Installer les pilotes"
+
+#: src/ui.vala:1633
+msgid "Once installed you will need to restart Simple Scan."
+msgstr "Une fois installés, vous devrez redémarrer Simple Scan."
+
+#: src/ui.vala:1645
+msgid "Installing drivers..."
+msgstr "Installation des pilotes..."
+
+#: src/ui.vala:1653
+msgid "Drivers installed successfully!"
+msgstr "Pilotes installés avec succès !"
+
+#: src/ui.vala:1663
+#, c-format
+msgid "Failed to install drivers (error code %d)."
+msgstr "Impossible d'installer les pilotes (code d'erreur %d)."
+
+#: src/ui.vala:1669
+msgid "Failed to install drivers."
+msgstr "Impossible d'installer les pilotes."
+
+#: src/ui.vala:1676
+#, c-format
+msgid "You need to install the %s package(s)."
+msgstr "Vous devez installer le(s) paquet(s) %s."
+
+#: src/ui.vala:1784
+#, c-format
+msgid "%d dpi (default)"
+msgstr "%d ppp (par défaut)"
+
+#: src/ui.vala:1787
+#, c-format
+msgid "%d dpi (draft)"
+msgstr "%d ppp (brouillon)"
+
+#: src/ui.vala:1790
+#, c-format
+msgid "%d dpi (high resolution)"
+msgstr "%d ppp (haute résolution)"
+
+#: src/ui.vala:1793
+#, c-format
+msgid "%d dpi"
+msgstr "%d ppp"
+
+#: src/ui.vala:1835
+msgid "New Document"
+msgstr "Nouveau document"
+
+#: src/ui.vala:1840
+msgid "Document"
+msgstr "Document"
+
+#: src/ui.vala:1844
+msgid "Email..."
+msgstr "Courriel..."
+
+#: src/ui.vala:1845
+msgid "Print..."
+msgstr "Imprimer..."
+
+#: src/ui.vala:1853
+msgid "Help"
+msgstr "Aide"
+
+#: src/ui.vala:1854
+msgid "About"
+msgstr "À propos"
+
+#: src/ui.vala:1855
+msgid "Quit"
+msgstr "Quitter"
+
+#: src/ui.vala:1889
+msgid "Change _Scanner"
+msgstr "Changer de _périphérique de numérisation"
+
+#: src/ui.vala:1891
+msgid "_Install Drivers"
+msgstr "_Installer les pilotes"
+
+#: src/ui.vala:1897
+msgid "Automatic"
+msgstr "Automatique"
+
+#: src/ui.vala:1947
+msgid "Darker"
+msgstr "Plus foncé"
+
+#: src/ui.vala:1949
+msgid "Lighter"
+msgstr "Plus clair"
+
+#: src/ui.vala:1957
+msgid "Less"
+msgstr "Moins"
+
+#: src/ui.vala:1959
+msgid "More"
+msgstr "Plus"
+
+#: src/ui.vala:1967
+msgid "Minimum"
+msgstr "Minimum"
+
+#: src/ui.vala:1969
+msgid "Maximum"
+msgstr "Maximum"
+
+#: src/ui.vala:2008
+msgid "Saving document..."
+msgstr "Enregistrement du document..."
+
+#: src/ui.vala:2173
+#, c-format
+msgid "Saving page %d out of %d"
+msgstr "Enregistrement de la page %d sur %d"
+
+#~ msgid "Device to scan from"
+#~ msgstr "Numériser depuis"
+
+#~ msgid "SANE device to acquire images from."
+#~ msgstr "Périphérique SANE à utiliser pour l'acquisition des images."
+
+#~ msgid "Type of document being scanned"
+#~ msgstr "Type de document numérisé"
+
+#~ msgid ""
+#~ "Type of document being scanned. This setting decides on the scan resolution, "
+#~ "colors and post-processing."
+#~ msgstr ""
+#~ "Type de document numérisé. Ce réglage définit la résolution de numérisation, "
+#~ "les couleurs et le post-traitement."
+
+#~ msgid "Width of paper in tenths of a mm"
+#~ msgstr "Largeur du papier en dixièmes de mm."
+
+#~ msgid ""
+#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr ""
+#~ "La largeur du papier en dixièmes de mm (ou 0 pour une détection automatique "
+#~ "du papier)."
+
+#~ msgid "Height of paper in tenths of a mm"
+#~ msgstr "Hauteur du papier en dixièmes de mm"
+
+#~ msgid ""
+#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr ""
+#~ "La hauteur du papier en dixièmes de mm (ou 0 pour une détection automatique "
+#~ "du papier)."
+
+#~ msgid "Brightness of scan"
+#~ msgstr "Luminosité de la numérisation"
+
+#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
+#~ msgstr "L'ajustement de la luminosité de -100 à 100 (0 pour aucun)."
+
+#~ msgid "Contrast of scan"
+#~ msgstr "Contraste de la numérisation"
+
+#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
+#~ msgstr "L'ajustement du contraste de -100 à 100 (0 pour aucun)."
+
+#~ msgid "Resolution for text scans"
+#~ msgstr "Résolution des numérisations de textes"
+
+#~ msgid "The resolution in dots-per-inch to use when scanning text."
+#~ msgstr ""
+#~ "La résolution en points par pouce à utiliser lors de la numérisation de "
+#~ "texte."
+
+#~ msgid "Resolution for photo scans"
+#~ msgstr "Résolution des numérisations de photos"
+
+#~ msgid "The resolution in dots-per-inch to use when scanning photos."
+#~ msgstr ""
+#~ "La résolution en points par pouce à utiliser lors de la numérisation de "
+#~ "photos."
+
+#~ msgid "Page side to scan"
+#~ msgstr "Face(s) de la page à numériser"
+
+#~ msgid "The page side to scan."
+#~ msgstr "La face de la page à numériser."
+
+#~ msgid "Directory to save files to"
+#~ msgstr "Dossier dans lequel les fichiers sont enregistrés"
+
+#~ msgid ""
+#~ "The directory to save files to. Defaults to the documents directory if unset."
+#~ msgstr ""
+#~ "Le dossier dans lequel les fichiers sont enregistrés. S'il n'est pas défini, "
+#~ "le dossier « Documents » sera utilisé par défaut."
+
+#~ msgid "Quality value to use for JPEG compression"
+#~ msgstr "Taux de qualité à utiliser pour la compression JPEG"
+
+#~ msgid "Quality value to use for JPEG compression."
+#~ msgstr "Taux de qualité à utiliser pour la compression JPEG."
diff --git a/po/gd.gmo b/po/gd.gmo
new file mode 100644
index 0000000..3e5b7fa
--- /dev/null
+++ b/po/gd.gmo
diff --git a/po/gd.po b/po/gd.po
index f4e73a9..8eee031 100644
--- a/po/gd.po
+++ b/po/gd.po
@@ -7,619 +7,486 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-06 14:16+1200\n"
+"POT-Creation-Date: 2016-07-29 12:47+1200\n"
 "PO-Revision-Date: 2012-04-17 06:12+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Gaelic; Scottish <gd@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-04-14 05:39+0000\n"
-"X-Generator: Launchpad (build 17990)\n"
+"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 
 #. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:2
+#: data/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "Ùg_hdarraich"
 
 #. Label beside username entry
-#: ../data/simple-scan.ui.h:4
+#: data/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "_An t-ainm-cleachdaiche airson a' ghoireis:"
 
 #. Label beside password entry
-#: ../data/simple-scan.ui.h:6
+#: data/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Facal-faire:"
 
 #. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:8
+#: data/simple-scan.ui:188
 msgid "Front and Back"
 msgstr "A h-aghaidh 's a cùl"
 
 #. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:10
+#: data/simple-scan.ui:192
 msgid "Front"
 msgstr "A h-aghaidh"
 
 #. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:12
+#: data/simple-scan.ui:196
 msgid "Back"
 msgstr "A cùl"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
-#: ../data/appdata/simple-scan.appdata.xml.in.h:1
+#: data/simple-scan.ui:225 data/simple-scan.ui:809
+#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr "Sganadh simplidh"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:16
+#: data/simple-scan.ui:241
 msgid "_Document"
 msgstr "_Sgrìobhainn"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:18
+#: data/simple-scan.ui:260
 msgid "Sc_an"
 msgstr "Sg_anaich"
 
+#. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:20
+#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
 msgid "Single _Page"
 msgstr "_Duilleag shingilte"
 
+#. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:22
+#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr "Gach duilleag a tha san _bhiathadair"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:24
+#: data/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "Cuir _stad air an sganadh"
 
-#: ../data/simple-scan.ui.h:25
+#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
 msgid "Text"
 msgstr "Teacsa"
 
-#: ../data/simple-scan.ui.h:26
+#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
 msgid "Photo"
 msgstr "Dealbh"
 
 #. Menu item to reorder pages
-#. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1183 ../src/ui.vala:1841
+#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr "Atharraich òrdugh nan duilleagan"
 
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: data/simple-scan.ui:367
 msgid "_Email"
 msgstr "_Post-d"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: data/simple-scan.ui:430
 msgid "_Page"
 msgstr "_Duilleag"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: data/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "Cuairtich gu _tuathail"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: data/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "Cuairtich gu _deiseil"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: data/simple-scan.ui:460
 msgid "_Crop"
 msgstr "_Bearr"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: data/simple-scan.ui:470
 msgid "_None"
 msgstr "Cha_n eil gin"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: data/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: data/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: data/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: data/simple-scan.ui:514
 msgid "_Letter"
 msgstr "_Litir"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: data/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: data/simple-scan.ui:536
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: data/simple-scan.ui:547
 msgid "_Custom"
 msgstr "_Gnàthaichte"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: data/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr "_Cuairtich an raon bearraidh"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: data/simple-scan.ui:578
 msgid "Move Left"
 msgstr "Gluais gun taobh chlì"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: data/simple-scan.ui:587
 msgid "Move Right"
 msgstr "Gluais gun taobh deas"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: data/simple-scan.ui:624
 msgid "_Help"
 msgstr "_Cobhair"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: data/simple-scan.ui:632
 msgid "_Contents"
 msgstr "_Clàr-innse"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: data/simple-scan.ui:674 data/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "Tòisich air sgrìobhainn ùr"
 
-#: ../data/simple-scan.ui.h:67
+#: data/simple-scan.ui:675
 msgid "New"
 msgstr "Ùr"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: data/simple-scan.ui:689 data/simple-scan.ui:836
 msgid "Scan a single page from the scanner"
 msgstr "Sganaich duilleag shingilte on sganair"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: data/simple-scan.ui:691 data/simple-scan.ui:837
 msgid "Scan"
 msgstr "Sganaich"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: data/simple-scan.ui:707 data/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "Sàbhail an sgrìobhainn mar fhaidhle"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1842
+#: data/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "Sàbhail"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: data/simple-scan.ui:724 data/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "Cuir stad air an sganadh làithreach"
 
-#: ../data/simple-scan.ui.h:77
+#: data/simple-scan.ui:725 data/simple-scan.ui:825
 msgid "Stop"
 msgstr "Stad"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: data/simple-scan.ui:749 data/simple-scan.ui:936
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Cuairtich an duilleag gu tuathail"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: data/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "Cuairtich gu tuathail"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: data/simple-scan.ui:764 data/simple-scan.ui:914
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Cuairtich an duilleag gu deiseil"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: data/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "Cuairtich gu deiseil"
 
-#: ../data/simple-scan.ui.h:86
+#: data/simple-scan.ui:779 data/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "Bearr an duilleag a thagh thu"
 
-#: ../data/simple-scan.ui.h:87
+#: data/simple-scan.ui:781
 msgid "Crop"
 msgstr "Bearr"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1849
+#: data/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "Roghainnean"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: data/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "Tùs an _sganaidh:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: data/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "_Dùmhlachd-bhreacaidh an teacsa:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: data/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "_Dùmhlachd-bhreacaidh an deilbh:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: data/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "Sganaich taobh:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: data/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "Meud na duilleige:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: data/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "Soilleireachd:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: data/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "Iomsgaradh:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: data/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "Càileachd:"
 
-#: ../data/simple-scan.desktop.in.h:2
+#: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
-msgstr ""
+msgstr "Sganair sgrìobhainnean"
 
-#: ../data/simple-scan.desktop.in.h:3
+#: data/simple-scan.desktop.in:5
 msgid "Scan Documents"
 msgstr "Sganaich sgrìobhainnean"
 
-#: ../data/simple-scan.desktop.in.h:4
+#: data/simple-scan.desktop.in:6
 msgid "scan;scanner;flatbed;adf;"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Device to scan from"
-msgstr "An t-uidheam a nì an sganadh"
+msgstr "scan;scanner;flatbed;adf;sganair;sganaich;sganadh;"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "SANE device to acquire images from."
-msgstr "An t-uidheam SANE a gheibhear na h-ìomhaighean uaithe."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "Type of document being scanned"
-msgstr "Seòrsa na sgrìobhainne a tha 'ga sganadh"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
-msgid ""
-"Type of document being scanned. This setting decides on the scan resolution, "
-"colors and post-processing."
+#: data/simple-scan.desktop.in:8
+msgid "scanner"
 msgstr ""
-"Seòrsa na sgrìobhainne a tha 'ga sganadh. Tha an roghainn seo a' "
-"suidheachadh dùmhlachd-bhreacaidh, dathan agus iar-ghiullachd an sgana."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
-msgid "Width of paper in tenths of a mm"
-msgstr "Leud a' phàipeir ann an deicheamhan de mm"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-"Leud a' phàipeir ann an deicheamhan de mm (no 0 airson mothachadh fèin-"
-"obrachail do leud a' phàipeir)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
-msgid "Height of paper in tenths of a mm"
-msgstr "Àirde a' phàipeir ann an deicheamhan de mm"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-"Àirde a' phàipeir ann an deicheamhan de mm (no 0 airson mothachadh fèin-"
-"obrachail do dh'àirde a' phàipeir)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "Brightness of scan"
-msgstr "Soilleireachd an sgana"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "The brightness adjustment from -100 to 100 (0 being none)."
-msgstr ""
-"Socrachadh na soilleireachd eadar -100 agus 100 ('s ciall dha 0 nach bi gin "
-"ann)"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid "Contrast of scan"
-msgstr "Iomsgaradh an sgana"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "The contrast adjustment from -100 to 100 (0 being none)."
-msgstr ""
-"Socrachadh an iomsgaraidh eadar -100 agus 100 ('s ciall dha 0 nach bi gin "
-"ann)"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid "Resolution for text scans"
-msgstr "An dùmhlachd-bhreacaidh airson sganadh teacsa"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
-msgid "The resolution in dots-per-inch to use when scanning text."
-msgstr ""
-"Dùmhlachd-bhreacaidh, ann a dotagan gach òirleach, a chleachdar airson "
-"sganadh teacsa."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
-msgid "Resolution for photo scans"
-msgstr "An dùmhlachd-bhreacaidh airson sganadh dhealbhan"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr ""
-"Dùmhlachd-bhreacaidh, ann a dotagan gach òirleach, a chleachdar airson "
-"sganadh dhealbhan."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
-msgid "Page side to scan"
-msgstr "Dè taobh na duilleige a tha ri sganadh"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
-msgid "The page side to scan."
-msgstr "Dè taobh na duilleige a tha ri sganadh."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
-msgid "Directory to save files to"
-msgstr "Am pasgan san dèid na faidhlichean a shàbhaladh ann"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
-msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
-msgstr ""
-"Am pasgan san dèid na faidhlichean a shàbhaladh ann. Thèid an sàbhaladh ann "
-"am pasgan nan sgrìobhainnean a ghnàth mur an deach seo atharrachadh."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
-msgid "Quality value to use for JPEG compression"
-msgstr "Ìre na càileachd a thèid a chleachdadh airson dùmhlachdh JPEG"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Quality value to use for JPEG compression."
-msgstr "Ìre na càileachd a thèid a chleachdadh airson dùmhlachdh JPEG."
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+#: data/simple-scan.appdata.xml.in:8
 msgid ""
 "A really easy way to scan both documents and photos. You can crop out the "
 "bad parts of a photo and rotate it if it is the wrong way round. You can "
 "print your scans, export them to pdf, or save them in a range of image "
 "formats."
 msgstr ""
+"Seo dòigh glè fhurasta gus an dà chuid sgrìobhainnean is dealbhan a sganadh. "
+"'S urrainn dhut na pàirtean dona dhen dhealbh a bhearradh air falbh agus an "
+"dealbh a chuairteachadh mur eil a' chomhair cheart air. 'S urrainn dhut na "
+"sganaich thu a chlò-bhualadh, às-phortadh gu PDF no a shàbhaladh ann an "
+"taghadh de fhòrmatan deilbh."
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+#: data/simple-scan.appdata.xml.in:13
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
+"Cleachdaidh Sganadh simplidh a' framework SANE gus taic a thoirt dhan "
+"mhòrchuid a sganairean a tha ann."
 
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Chan eil sganair sam bith ri làimh. Feuch is ceangail sganair ris."
 
-#. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "Cha b' urrainn dhuinn ceangal ris an sganair."
 
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "Cha b' urrainn tòiseachadh air an sganadh"
 
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1236 src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr "Thachair mearachd nuair a bha sinn a' conaltradh ris an sganair"
 
-#. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "Seall tionndadh an sgaoilidh"
 
-#. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr "Clò-bhuail teachdaireachdan dì-bhugachaidh"
 
-#: ../src/simple-scan.vala:26
+#: src/simple-scan.vala:26
 msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr ""
-"Càirich faidhlichean PDF a chaidh a chruthachadh le seann-tionndaidhean de "
-"Simple Scan"
+"Càirich faidhlichean PDF a chaidh a chruthachadh le seann-tionndaidhean dhe "
+"Sganadh simplidh"
 
-#. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:391
+#: src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Dh'fhàillig an sganadh"
 
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DEVICE...] - Goireas sganaidh"
 
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Ruith \"%s --help\" airson liosta shlàn dhe na roghainnean command line a "
 "tha ri làimh fhaicinn."
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:318 src/ui.vala:1602 src/ui.vala:1887
 msgid "_Close"
 msgstr "_Dùin"
 
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:327
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr ""
 "Tha feum air ainm-cleachdaiche agus facal-faire mus faighear cothrom air "
 "\"%s\""
 
-#. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:375
 msgid "No scanners detected"
 msgstr "Cha deach sganair sam bith a lorg"
 
-#. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:377
 msgid "Please check your scanner is connected and powered on"
 msgstr "Dèan cinnteach gu bheil sganair ceangailte ris agus gu bheil e air"
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:382
 msgid "Additional software needed"
-msgstr ""
+msgstr "Tha bathar-bog a dhìth"
 
-#. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:384
 msgid "You need to install driver software for your scanner."
-msgstr ""
+msgstr "Feumaidh tu bathar-bog draibheir a stàladh airson an sganair agad."
 
-#. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:506 src/ui.vala:1843
 msgid "Save As..."
 msgstr "Sàbhail mar..."
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:509 src/ui.vala:675
 msgid "_Cancel"
 msgstr "_Sguir dheth"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:510 src/ui.vala:676
 msgid "_Save"
 msgstr "_Sàbhail"
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "Sgrìobhainn sganaichte.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:521
 msgid "Image Files"
 msgstr "Faidhlichean deilbh"
 
-#. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:527
 msgid "All Files"
 msgstr "Na h-uile faidhle"
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF {sgrìobhainn ioma-dhuilleagach}"
 
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (dùmhlaichte)"
 
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (gun chall càileachd)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:557
 msgid "File format:"
-msgstr ""
+msgstr "Fòrmat an fhaidhle:"
 
-#. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:650
 msgid "Failed to save file"
 msgstr "Cha b' urrainn dhuinn a shàbhaladh ann am faidhle"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:673
 msgid "If you don't save, changes will be permanently lost."
 msgstr ""
 "Mur an sàbhail thu e, thèid atharrachadh sam bith a rinn thu air chall."
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:708
+#: src/ui.vala:708
 msgid "Save current document?"
 msgstr "A bheil thu airson an sgrìobhainn làithreach a shàbhaladh?"
 
-#. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:710
 msgid "Discard Changes"
 msgstr "Tilg air falbh na h-atharraichean"
 
-#. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "Cha ghabh an ìomhaigh a shàbhaladh airson a ro-shealladh"
 
-#. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "Chan urrainn dhuinn an aplacaid fhosgladh a ro-sheallas an ìomhaigh"
 
-#. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1206
 msgid "Combine sides"
 msgstr "Cuir còmhla na duilleagan"
 
-#. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr "Cuir còmhla na duilleagan (ann an òrdugh contrarra)"
 
-#. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1226
 msgid "Reverse"
 msgstr "Contrarra"
 
-#. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr "Cum gun atharrachadh"
 
-#. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "Chan urrainn dhuinn faidhle na cobharach fhosgladh"
 
-#. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1472
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -647,207 +514,190 @@ msgstr ""
 "You should have received a copy of the GNU General Public License\n"
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 
-#. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1475
 msgid "About Simple Scan"
-msgstr "Mu dhèidhinn gleus simplidh nan sgana"
+msgstr "Mu dhèidhinn Sganadh simplidh"
 
-#. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "Inneal simplidh airson sganadh sgrìobhainnean"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Akerbeltz https://launchpad.net/~fios\n"
+"  GunChleoc https://launchpad.net/~gunchleoc\n"
 "  alasdair caimbeul https://launchpad.net/~alexd-deactivatedaccount"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "A bheil thu airson an sgrìobhainn a shàbhaladh mus dèan sinn fàgail?"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "Fàg gun a shàbhaladh"
 
-#. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
-msgstr ""
+msgstr "Tha coltas gu bheil sganair Brother agad."
 
-#. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1581
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
 msgstr ""
+"Tha draibhearan dha ri am faighinn air <a "
+"href=\"http://support.brother.com\">làrach-lìn Brother</a>."
 
-#. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
-msgstr ""
+msgstr "Tha coltas gu bheil sganair Samsung agad."
 
-#. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1587
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
 msgstr ""
+"Tha draibhearan dha ri am faighinn air <a "
+"href=\"http://samsung.com/support\">làrach-lìn Samsung</a>."
 
-#. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1591
 msgid "You appear to have an HP scanner."
-msgstr ""
+msgstr "Tha coltas gu bheil sganair HP agad."
 
-#. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
-msgstr ""
+msgstr "Tha coltas gu bheil sganair Epson agad."
 
-#. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1598
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
 msgstr ""
+"Tha draibhearan dha ri am faighinn air <a "
+"href=\"http://support.epson.com\">làrach-lìn Epson</a>."
 
-#. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1602
 msgid "Install drivers"
-msgstr ""
+msgstr "Stàlaich na draibhearan"
 
-#. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
+"Bidh Sganadh simplidh feumach air ath-thòiseachadh às dèidh seo a stàladh."
 
-#. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1645
 msgid "Installing drivers..."
-msgstr ""
+msgstr "A' stàladh nan draibhearan..."
 
-#. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1653
 msgid "Drivers installed successfully!"
-msgstr ""
+msgstr "Tha na draibhearan air an stàladh!"
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
-msgstr ""
+msgstr "Cha deach leinn na draibhearan a stàladh (còd na mearachd: %d)."
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1669
 msgid "Failed to install drivers."
-msgstr ""
+msgstr "Cha deach leinn na draibhearan a stàladh."
 
-#. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1676
 #, c-format
 msgid "You need to install the %s package(s)."
-msgstr ""
+msgstr "Feumaidh tu a' phacaid / na pacaidean %s a stàladh."
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (bun-roghainn)"
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (dreachd)"
 
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (dùmhlachd-bhreacaidh àrd)"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/ui.vala:1793
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1835
 msgid "New Document"
 msgstr "Sgrìobhainn ùr"
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1840
 msgid "Document"
 msgstr "Sgrìobhainn"
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1844
 msgid "Email..."
 msgstr "Post-d..."
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1845
 msgid "Print..."
 msgstr "Clò-bhuail..."
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1853
 msgid "Help"
 msgstr "Cobhair"
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1854
 msgid "About"
 msgstr "Mu dhèidhinn"
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1855
 msgid "Quit"
 msgstr "Fàg an-seo"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "Atharraich an _sganair"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1891
 msgid "_Install Drivers"
-msgstr ""
+msgstr "Stàlaich na dra_ibhearan"
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1897
 msgid "Automatic"
 msgstr "Gu fèin-obrachail"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1947
 msgid "Darker"
 msgstr "Nas duirche"
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1949
 msgid "Lighter"
 msgstr "Nas soilleire"
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:1957
 msgid "Less"
 msgstr "Nas lugha"
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:1959
 msgid "More"
 msgstr "Barrrachd"
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:1967
 msgid "Minimum"
 msgstr "As lugha"
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:1969
 msgid "Maximum"
 msgstr "As motha"
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2008
 msgid "Saving document..."
 msgstr "A' sàbhaladh na sgrìobhainn..."
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "A' sàbhaladh duilleag %d a-mach à %d"
@@ -861,12 +711,25 @@ msgstr "A' sàbhaladh duilleag %d a-mach à %d"
 #~ msgid "Window width in pixels"
 #~ msgstr "Leud na h-uinneige ann am piosgailean"
 
+#~ msgid "Device to scan from"
+#~ msgstr "An t-uidheam a nì an sganadh"
+
 #~ msgid "TRUE if the application window is maximized"
 #~ msgstr "TRUE ma tha uinneag na h-aplacaid air a làn-mheudachadh"
 
+#~ msgid ""
+#~ "Type of document being scanned. This setting decides on the scan resolution, "
+#~ "colors and post-processing."
+#~ msgstr ""
+#~ "Seòrsa na sgrìobhainne a tha 'ga sganadh. Tha an roghainn seo a' "
+#~ "suidheachadh dùmhlachd-bhreacaidh, dathan agus iar-ghiullachd an sgana."
+
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "Comhair an sganair thairis air an duilleag a tha 'ga sganadh."
 
+#~ msgid "Type of document being scanned"
+#~ msgstr "Seòrsa na sgrìobhainne a tha 'ga sganadh"
+
 #~ msgid "Direction of scan"
 #~ msgstr "Comhair an sgana"
 
@@ -887,9 +750,41 @@ msgstr "A' sàbhaladh duilleag %d a-mach à %d"
 #~ "Àirde na h-ìomhaigh a tha 'ga sganadh ann am piogsailean. Thèid àirde na "
 #~ "duilleige mu dheireadh a chaidh a sganadh a chur an-seo."
 
+#~ msgid "SANE device to acquire images from."
+#~ msgstr "An t-uidheam SANE a gheibhear na h-ìomhaighean uaithe."
+
+#~ msgid "Width of paper in tenths of a mm"
+#~ msgstr "Leud a' phàipeir ann an deicheamhan de mm"
+
 #~ msgid "Width of scanned image in pixels"
 #~ msgstr "Leud na h-ìomhaigh a tha 'ga sganadh ann am piogsailean"
 
+#~ msgid ""
+#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr ""
+#~ "Leud a' phàipeir ann an deicheamhan de mm (no 0 airson mothachadh fèin-"
+#~ "obrachail do leud a' phàipeir)."
+
+#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
+#~ msgstr ""
+#~ "Socrachadh an iomsgaraidh eadar -100 agus 100 ('s ciall dha 0 nach bi gin "
+#~ "ann)"
+
+#~ msgid "Contrast of scan"
+#~ msgstr "Iomsgaradh an sgana"
+
+#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
+#~ msgstr ""
+#~ "Socrachadh na soilleireachd eadar -100 agus 100 ('s ciall dha 0 nach bi gin "
+#~ "ann)"
+
+#~ msgid "Brightness of scan"
+#~ msgstr "Soilleireachd an sgana"
+
+#~ msgid "Resolution for text scans"
+#~ msgstr "An dùmhlachd-bhreacaidh airson sganadh teacsa"
+
 #~ msgid "The resolution in dots-per-inch of the previously scanned image."
 #~ msgstr ""
 #~ "Dùmhlachd-bhreacaidh, ann a dotagan gach òirleach, na h-ìomhaighe a chaidh a "
@@ -899,6 +794,50 @@ msgstr "A' sàbhaladh duilleag %d a-mach à %d"
 #~ msgstr ""
 #~ "Dùmhlachd-bhreacaidh na h-ìomhaighe a chaidh a sganadh turas mu dheireadh"
 
+#~ msgid ""
+#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr ""
+#~ "Àirde a' phàipeir ann an deicheamhan de mm (no 0 airson mothachadh fèin-"
+#~ "obrachail do dh'àirde a' phàipeir)."
+
+#~ msgid "Height of paper in tenths of a mm"
+#~ msgstr "Àirde a' phàipeir ann an deicheamhan de mm"
+
+#~ msgid "The page side to scan."
+#~ msgstr "Dè taobh na duilleige a tha ri sganadh."
+
+#~ msgid "Quality value to use for JPEG compression."
+#~ msgstr "Ìre na càileachd a thèid a chleachdadh airson dùmhlachdh JPEG."
+
+#~ msgid "Page side to scan"
+#~ msgstr "Dè taobh na duilleige a tha ri sganadh"
+
+#~ msgid "Quality value to use for JPEG compression"
+#~ msgstr "Ìre na càileachd a thèid a chleachdadh airson dùmhlachdh JPEG"
+
+#~ msgid "Resolution for photo scans"
+#~ msgstr "An dùmhlachd-bhreacaidh airson sganadh dhealbhan"
+
+#~ msgid "The resolution in dots-per-inch to use when scanning text."
+#~ msgstr ""
+#~ "Dùmhlachd-bhreacaidh, ann a dotagan gach òirleach, a chleachdar airson "
+#~ "sganadh teacsa."
+
+#~ msgid "The resolution in dots-per-inch to use when scanning photos."
+#~ msgstr ""
+#~ "Dùmhlachd-bhreacaidh, ann a dotagan gach òirleach, a chleachdar airson "
+#~ "sganadh dhealbhan."
+
+#~ msgid "Directory to save files to"
+#~ msgstr "Am pasgan san dèid na faidhlichean a shàbhaladh ann"
+
+#~ msgid ""
+#~ "The directory to save files to. Defaults to the documents directory if unset."
+#~ msgstr ""
+#~ "Am pasgan san dèid na faidhlichean a shàbhaladh ann. Thèid an sàbhaladh ann "
+#~ "am pasgan nan sgrìobhainnean a ghnàth mur an deach seo atharrachadh."
+
 #~ msgid "Scanned Document"
 #~ msgstr "Sgrìobhainn sganaichte"
 
diff --git a/po/gl.gmo b/po/gl.gmo
new file mode 100644
index 0000000..cc99e74
--- /dev/null
+++ b/po/gl.gmo
diff --git a/po/gl.po b/po/gl.po
index 8b0c1f9..dc568f3 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -7,407 +7,309 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-06 14:16+1200\n"
+"POT-Creation-Date: 2016-07-29 12:47+1200\n"
 "PO-Revision-Date: 2013-10-05 07:56+0000\n"
 "Last-Translator: Fran Diéguez <Unknown>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-04-14 05:39+0000\n"
-"X-Generator: Launchpad (build 17990)\n"
+"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 
 #. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:2
+#: data/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_Autorizar"
 
 #. Label beside username entry
-#: ../data/simple-scan.ui.h:4
+#: data/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "Nome de _usuario para o recurso:"
 
 #. Label beside password entry
-#: ../data/simple-scan.ui.h:6
+#: data/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Contrasinal:"
 
 #. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:8
+#: data/simple-scan.ui:188
 msgid "Front and Back"
 msgstr "Anverso e reverso"
 
 #. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:10
+#: data/simple-scan.ui:192
 msgid "Front"
 msgstr "Anverso"
 
 #. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:12
+#: data/simple-scan.ui:196
 msgid "Back"
 msgstr "Atrás"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
-#: ../data/appdata/simple-scan.appdata.xml.in.h:1
+#: data/simple-scan.ui:225 data/simple-scan.ui:809
+#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr "Escáner sinxelo"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:16
+#: data/simple-scan.ui:241
 msgid "_Document"
 msgstr "_Documento"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:18
+#: data/simple-scan.ui:260
 msgid "Sc_an"
 msgstr "Esc_anear"
 
+#. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:20
+#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
 msgid "Single _Page"
 msgstr "Única _páxina"
 
+#. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:22
+#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr "Todas as páxinas do _alimentador"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:24
+#: data/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "_Deter o escaneado"
 
-#: ../data/simple-scan.ui.h:25
+#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
 msgid "Text"
 msgstr "Texto"
 
-#: ../data/simple-scan.ui.h:26
+#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
 msgid "Photo"
 msgstr "Fotografía"
 
 #. Menu item to reorder pages
-#. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1183 ../src/ui.vala:1841
+#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr "Reordenar as páxinas"
 
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: data/simple-scan.ui:367
 msgid "_Email"
 msgstr "Correo-_e"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: data/simple-scan.ui:430
 msgid "_Page"
 msgstr "_Páxina"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: data/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "Rotar á _esquerda"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: data/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "Rotar á _dereita"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: data/simple-scan.ui:460
 msgid "_Crop"
 msgstr "_Recortar"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: data/simple-scan.ui:470
 msgid "_None"
 msgstr "_Ningún"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: data/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: data/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: data/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: data/simple-scan.ui:514
 msgid "_Letter"
 msgstr "_Carta"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: data/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: data/simple-scan.ui:536
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: data/simple-scan.ui:547
 msgid "_Custom"
 msgstr "_Personalizado"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: data/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr "_Rotar o recorte"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: data/simple-scan.ui:578
 msgid "Move Left"
 msgstr "Mover á esquerda"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: data/simple-scan.ui:587
 msgid "Move Right"
 msgstr "Mover á dereita"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: data/simple-scan.ui:624
 msgid "_Help"
 msgstr "_Axuda"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: data/simple-scan.ui:632
 msgid "_Contents"
 msgstr "_Contidos"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: data/simple-scan.ui:674 data/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "Iniciar un novo documento"
 
-#: ../data/simple-scan.ui.h:67
+#: data/simple-scan.ui:675
 msgid "New"
 msgstr "Novo"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: data/simple-scan.ui:689 data/simple-scan.ui:836
 msgid "Scan a single page from the scanner"
 msgstr "Escanear unha única páxina co escáner"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: data/simple-scan.ui:691 data/simple-scan.ui:837
 msgid "Scan"
 msgstr "Escanear"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: data/simple-scan.ui:707 data/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "Gardar o documento nun ficheiro"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1842
+#: data/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "Gardar"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: data/simple-scan.ui:724 data/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "Deter o escaneo actual"
 
-#: ../data/simple-scan.ui.h:77
+#: data/simple-scan.ui:725 data/simple-scan.ui:825
 msgid "Stop"
 msgstr "Deter"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: data/simple-scan.ui:749 data/simple-scan.ui:936
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Xirar a páxina á esquerda (sentido contrario ao reloxo)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: data/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "Rotar á esquerda"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: data/simple-scan.ui:764 data/simple-scan.ui:914
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Xirar a páxina á dereita (sentido do reloxo)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: data/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "Rotar á dereita"
 
-#: ../data/simple-scan.ui.h:86
+#: data/simple-scan.ui:779 data/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "Recortar a páxina seleccionada"
 
-#: ../data/simple-scan.ui.h:87
+#: data/simple-scan.ui:781
 msgid "Crop"
 msgstr "Recortar"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1849
+#: data/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "Preferencias"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: data/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "_Orixe de escaneo:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: data/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "Resolución de _texto:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: data/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "Resolución _fotográfica:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: data/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "Cara a escanear:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: data/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "Tamaño da páxina:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: data/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "Brillo:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: data/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "Contraste:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: data/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "Calidade:"
 
-#: ../data/simple-scan.desktop.in.h:2
+#: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr "Escáner de documentos"
 
-#: ../data/simple-scan.desktop.in.h:3
+#: data/simple-scan.desktop.in:5
 msgid "Scan Documents"
 msgstr "Escanear documentos"
 
-#: ../data/simple-scan.desktop.in.h:4
+#: data/simple-scan.desktop.in:6
 msgid "scan;scanner;flatbed;adf;"
 msgstr "escanear;escáner;flatbed;adf;"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Device to scan from"
-msgstr "Dispositivo desde o que escanear"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "SANE device to acquire images from."
-msgstr "Dispositivo SANE desde o que adquirir as imaxes."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "Type of document being scanned"
-msgstr "Tipo de documento que está sendo escaneado"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
-msgid ""
-"Type of document being scanned. This setting decides on the scan resolution, "
-"colors and post-processing."
+#: data/simple-scan.desktop.in:8
+msgid "scanner"
 msgstr ""
-"Tipo de documento a escanear. Esta opción decide a resolución, cores e post-"
-"procesado do escaneado"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
-msgid "Width of paper in tenths of a mm"
-msgstr "Largura do papel en décimas de mm"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-"A largura do papel en décimas de mm (ou 0 para a detección automática do "
-"papel)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
-msgid "Height of paper in tenths of a mm"
-msgstr "Altura do papel en décimas de mm"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-"A altura do papel en décimas de mm (ou 0 para a detección automática do "
-"papel)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "Brightness of scan"
-msgstr "Brillo do escaneo"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "The brightness adjustment from -100 to 100 (0 being none)."
-msgstr "Axuste de brillo de -100 a 100 (0 é ningún)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid "Contrast of scan"
-msgstr "Contraste do escaneo"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "The contrast adjustment from -100 to 100 (0 being none)."
-msgstr "Axuste de contraste de -100 a 100 (0 é ningún)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid "Resolution for text scans"
-msgstr "Resolución para o escaneado de texto"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
-msgid "The resolution in dots-per-inch to use when scanning text."
-msgstr "Resolución en puntos por polgada a usar cando se escanean textos."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
-msgid "Resolution for photo scans"
-msgstr "Resolución para o escaneado de fotos"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr "Resolución en puntos por polgada a usar cando se escanean fotos."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
-msgid "Page side to scan"
-msgstr "Cara da páxina a escanear"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
-msgid "The page side to scan."
-msgstr "O lado da páxina a escanear."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
-msgid "Directory to save files to"
-msgstr "Directorio no que gardar os ficheiros"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
-msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
-msgstr ""
-"O directorio no que se gardarán os ficheiros. Por omisión usarase o "
-"directorio de documentos."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
-msgid "Quality value to use for JPEG compression"
-msgstr "Valor de calidade a usar na compresión JPEG"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Quality value to use for JPEG compression."
-msgstr "Valor de calidade a usar na compresión JPEG."
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+#: data/simple-scan.appdata.xml.in:8
 msgid ""
 "A really easy way to scan both documents and photos. You can crop out the "
 "bad parts of a photo and rotate it if it is the wrong way round. You can "
@@ -418,200 +320,166 @@ msgstr ""
 "partes malas dunha foto e rotala se está do revés. Pode imprimir os "
 "escaneos, exportalos a un PDF ou gardalos en varios formatos de imaxe."
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+#: data/simple-scan.appdata.xml.in:13
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 "Escáner Sinxelo usa o marco de traballo de SANE para ser compatíbel coa "
 "maioría de escáneres existentes."
 
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Non hai escáneres dispoñíbeis. Conecte un escáner."
 
-#. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "Non foi posíbel conectar co escáner"
 
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "Non foi posíbel iniciar o escaneado"
 
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1236 src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr "Produciuse un erro na comunicación co escáner"
 
-#. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "Mostrar a versión de publicación"
 
-#. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr "Mostrar mensaxes de depuración"
 
-#: ../src/simple-scan.vala:26
+#: src/simple-scan.vala:26
 msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr "Arranxar ficheiros PDF xerados con versións antigas de Simple Scan"
 
-#. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:391
+#: src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Produciuse un fallo ao escanear"
 
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DISPOSITIVO...] - Utilidade de escaneado"
 
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Ejecute «%s --help» para ver unha lista completa das opcións de liña de "
 "ordes dispoñíbeis."
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:318 src/ui.vala:1602 src/ui.vala:1887
 msgid "_Close"
 msgstr "_Pechar"
 
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:327
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Requírese o nome de usuario e o contrasinal para acceder a «%s»"
 
-#. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:375
 msgid "No scanners detected"
 msgstr "Non se detectou ningún escáner"
 
-#. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:377
 msgid "Please check your scanner is connected and powered on"
 msgstr "Verifique que o seu escáner está conectado e aceso"
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:382
 msgid "Additional software needed"
 msgstr "Precísase software adicional"
 
-#. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr "Precisa instalar controladores para o seu escáner."
 
-#. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:506 src/ui.vala:1843
 msgid "Save As..."
 msgstr "Gardar como..."
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:509 src/ui.vala:675
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:510 src/ui.vala:676
 msgid "_Save"
 msgstr "_Gardar"
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "Documento escaneado.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:521
 msgid "Image Files"
 msgstr "Ficheiros de imaxes"
 
-#. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:527
 msgid "All Files"
 msgstr "Todos os ficheiros"
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (documento de varias páxinas)"
 
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (comprimido)"
 
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (sen perdas)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:557
 msgid "File format:"
 msgstr "Formato do ficheiro:"
 
-#. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:650
 msgid "Failed to save file"
 msgstr "Produciuse un fallo ao gardar o ficheiro"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:673
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Se non garda o ficheiro, os seus cambios perderanse permanentemente."
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:708
+#: src/ui.vala:708
 msgid "Save current document?"
 msgstr "Gardar o documento actual?"
 
-#. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:710
 msgid "Discard Changes"
 msgstr "Rexeitar os cambios"
 
-#. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "Non foi posíbel gardar a imaxe da miniatura"
 
-#. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "Non se pode abrir o aplicativo de vista previa da imaxe"
 
-#. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1206
 msgid "Combine sides"
 msgstr "Combinar lados"
 
-#. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr "Combinar lados (inverso)"
 
-#. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1226
 msgid "Reverse"
 msgstr "Inverter"
 
-#. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr "Manter sen cambios"
 
-#. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "Non é posíbel abrir o ficheiro de axuda"
 
-#. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1472
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -639,17 +507,15 @@ msgstr ""
 "Debe haber recibido una copia de la GNU General Public License\n"
 "con este programa. Si no fuera así, vea <http://www.gnu.org/licenses/>."
 
-#. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "Acerca de Simple Scan"
 
-#. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "Ferramenta sinxela de escaneado de documentos"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -659,23 +525,19 @@ msgstr ""
 "  Miguel Anxo Bouzada https://launchpad.net/~mbouzada\n"
 "  Robert Ancell https://launchpad.net/~robert-ancell"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "Gardar o documento antes de saír?"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "Saír sen gardar"
 
-#. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr "Semella que ten un escáner Brother."
 
-#. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1581
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
@@ -683,13 +545,11 @@ msgstr ""
 "Os controladores para este dispositivo están dispoñíbeis na páxina de <a "
 "href=\"http://support.brother.com\">Brother</a>."
 
-#. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr "Semella ter un escáner Samsung."
 
-#. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1587
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
@@ -697,18 +557,15 @@ msgstr ""
 "Os controladores para este dispositivo están dispoñíbeis na páxina de <a "
 "href=\"http://samsung.com/support\">Samsung</a>."
 
-#. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr "Semella ter un escáner HP."
 
-#. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr "Semella ter un escáner Epson."
 
-#. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1598
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
@@ -716,140 +573,126 @@ msgstr ""
 "Os controladores están dispoñíbeis no sitio web de <a "
 "href=\"http://support.epson.com\">Epson</a>."
 
-#. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1602
 msgid "Install drivers"
 msgstr "Instalar controladores"
 
-#. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "Unha vez instalados deberá reiniciar o Escáner Sinxelo."
 
-#. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr "Instalando os controladores..."
 
-#. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr "Os controladores instaláronse correctamente."
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 "Produciuse un fallo na instalación dos controladores (código do erro %d)."
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr "Produciuse un fallo na instalación dos controladores."
 
-#. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1676
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr "Necesita instalar o paquete(s) %s."
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d ppp (predeterminada)"
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d ppp (borrador)"
 
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d ppp (alta resolución)"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/ui.vala:1793
 #, c-format
 msgid "%d dpi"
 msgstr "%d ppp"
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1835
 msgid "New Document"
 msgstr "Novo documento"
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1840
 msgid "Document"
 msgstr "Documento"
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1844
 msgid "Email..."
 msgstr "Correo electrónico..."
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1845
 msgid "Print..."
 msgstr "Imprimir..."
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1853
 msgid "Help"
 msgstr "Axuda"
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1854
 msgid "About"
 msgstr "Sobre"
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1855
 msgid "Quit"
 msgstr "Saír"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "Cambiar o _escáner"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr "_Instalar controladores"
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1897
 msgid "Automatic"
 msgstr "Automático"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1947
 msgid "Darker"
 msgstr "Máis escuro"
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1949
 msgid "Lighter"
 msgstr "Máis claro"
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:1957
 msgid "Less"
 msgstr "Menos"
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:1959
 msgid "More"
 msgstr "Máis"
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:1967
 msgid "Minimum"
 msgstr "Mínimo"
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:1969
 msgid "Maximum"
 msgstr "Máximo"
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2008
 msgid "Saving document..."
 msgstr "Gardando o documento..."
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Gardando páxina %d de %d"
@@ -871,6 +714,9 @@ msgstr "Gardando páxina %d de %d"
 #~ msgid "Files missing"
 #~ msgstr "Faltan ficheiros"
 
+#~ msgid "Device to scan from"
+#~ msgstr "Dispositivo desde o que escanear"
+
 #~ msgid "Direction of scan"
 #~ msgstr "Dirección de escaneado"
 
@@ -884,6 +730,9 @@ msgstr "Gardando páxina %d de %d"
 #~ "A dirección do escáner a través da páxina escaneada. Pode ser calquera dos "
 #~ "seguintes: «top-to-bottom» «bottom-to-top» «left-to-right» «right-to-left»"
 
+#~ msgid "Type of document being scanned"
+#~ msgstr "Tipo de documento que está sendo escaneado"
+
 #~ msgid ""
 #~ "Type of document being scanned. 'text' for text documents, 'photo' for "
 #~ "photos. This setting decides on the scan resolution, colors and post-"
@@ -896,6 +745,9 @@ msgstr "Gardando páxina %d de %d"
 #~ msgid "TRUE if the application window is maximized"
 #~ msgstr "VERDADEIRO se a xanela do aplicativo está maximizada"
 
+#~ msgid "SANE device to acquire images from."
+#~ msgstr "Dispositivo SANE desde o que adquirir as imaxes."
+
 #~ msgid "Width of scanned image in pixels"
 #~ msgstr "Largura da imaxe escaneada"
 
@@ -921,24 +773,78 @@ msgstr "Gardando páxina %d de %d"
 #~ "  --help-all                      Mostra todas as opcións de axuda\n"
 #~ "  --help-gtk                      Mostra as opcións de GTK+"
 
+#~ msgid "Resolution for text scans"
+#~ msgstr "Resolución para o escaneado de texto"
+
+#~ msgid "Resolution for photo scans"
+#~ msgstr "Resolución para o escaneado de fotos"
+
 #~ msgid "Resolution of last scanned image"
 #~ msgstr "Resolución da última imaxe escaneada"
 
 #~ msgid "The resolution in dots-per-inch of the previously scanned image."
 #~ msgstr "Resolución en puntos por polgada da imaxe escaneada anteriormente."
 
+#~ msgid "The resolution in dots-per-inch to use when scanning text."
+#~ msgstr "Resolución en puntos por polgada a usar cando se escanean textos."
+
+#~ msgid "The resolution in dots-per-inch to use when scanning photos."
+#~ msgstr "Resolución en puntos por polgada a usar cando se escanean fotos."
+
+#~ msgid ""
+#~ "The directory to save files to. Defaults to the documents directory if unset."
+#~ msgstr ""
+#~ "O directorio no que se gardarán os ficheiros. Por omisión usarase o "
+#~ "directorio de documentos."
+
 #~ msgid "Scanned Document"
 #~ msgstr "Documento escaneado"
 
 #~ msgid "Select File _Type"
 #~ msgstr "Elixa o _tipo de ficheiro"
 
+#~ msgid "Directory to save files to"
+#~ msgstr "Directorio no que gardar os ficheiros"
+
+#~ msgid "Page side to scan"
+#~ msgstr "Cara da páxina a escanear"
+
+#~ msgid "Height of paper in tenths of a mm"
+#~ msgstr "Altura do papel en décimas de mm"
+
 #~ msgid ""
 #~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
 #~ msgstr ""
 #~ "A cara da páxina que desexe escanear. Pode ser un dos seguintes: «ambos», "
 #~ "«anverso» e «recverso»"
 
+#~ msgid ""
+#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr ""
+#~ "A largura do papel en décimas de mm (ou 0 para a detección automática do "
+#~ "papel)."
+
+#~ msgid ""
+#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr ""
+#~ "A altura do papel en décimas de mm (ou 0 para a detección automática do "
+#~ "papel)."
+
+#~ msgid "Width of paper in tenths of a mm"
+#~ msgstr "Largura do papel en décimas de mm"
+
+#~ msgid "The page side to scan."
+#~ msgstr "O lado da páxina a escanear."
+
+#~ msgid ""
+#~ "Type of document being scanned. This setting decides on the scan resolution, "
+#~ "colors and post-processing."
+#~ msgstr ""
+#~ "Tipo de documento a escanear. Esta opción decide a resolución, cores e post-"
+#~ "procesado do escaneado"
+
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "A dirección do escáner sobre a páxina escaneada."
 
@@ -977,3 +883,21 @@ msgstr "Gardando páxina %d de %d"
 #~ "  --sync                          Facer chamadas X síncronas\n"
 #~ "  --gtk-module=MODULES            Cargar módulos GTK+ adicionais\n"
 #~ "  --g-fatal-warnings              Converter todos os avisos en erros fatais"
+
+#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
+#~ msgstr "Axuste de contraste de -100 a 100 (0 é ningún)."
+
+#~ msgid "Contrast of scan"
+#~ msgstr "Contraste do escaneo"
+
+#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
+#~ msgstr "Axuste de brillo de -100 a 100 (0 é ningún)."
+
+#~ msgid "Brightness of scan"
+#~ msgstr "Brillo do escaneo"
+
+#~ msgid "Quality value to use for JPEG compression."
+#~ msgstr "Valor de calidade a usar na compresión JPEG."
+
+#~ msgid "Quality value to use for JPEG compression"
+#~ msgstr "Valor de calidade a usar na compresión JPEG"
diff --git a/po/he.gmo b/po/he.gmo
new file mode 100644
index 0000000..f845214
--- /dev/null
+++ b/po/he.gmo
diff --git a/po/he.po b/po/he.po
index 1468dfc..4a1f45a 100644
--- a/po/he.po
+++ b/po/he.po
@@ -7,406 +7,309 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-06 14:16+1200\n"
+"POT-Creation-Date: 2016-07-29 12:47+1200\n"
 "PO-Revision-Date: 2012-07-23 09:01+0000\n"
 "Last-Translator: Robert Ancell <robert.ancell@canonical.com>\n"
 "Language-Team: Hebrew <he@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-04-14 05:40+0000\n"
-"X-Generator: Launchpad (build 17990)\n"
+"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 
 #. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:2
+#: data/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_אימות"
 
 #. Label beside username entry
-#: ../data/simple-scan.ui.h:4
+#: data/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "_שם המשתמש עבור המשאב:"
 
 #. Label beside password entry
-#: ../data/simple-scan.ui.h:6
+#: data/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_ססמה:"
 
 #. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:8
+#: data/simple-scan.ui:188
 msgid "Front and Back"
 msgstr "גב וחזית"
 
 #. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:10
+#: data/simple-scan.ui:192
 msgid "Front"
 msgstr "חזית"
 
 #. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:12
+#: data/simple-scan.ui:196
 msgid "Back"
 msgstr "גב"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
-#: ../data/appdata/simple-scan.appdata.xml.in.h:1
+#: data/simple-scan.ui:225 data/simple-scan.ui:809
+#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr "סריקה פשוטה"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:16
+#: data/simple-scan.ui:241
 msgid "_Document"
 msgstr "מ_סמך"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:18
+#: data/simple-scan.ui:260
 msgid "Sc_an"
 msgstr "_סריקה"
 
+#. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:20
+#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
 msgid "Single _Page"
 msgstr "עמוד _בודד"
 
+#. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:22
+#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr "כל הדפים מהמ_זין"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:24
+#: data/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "ע_צירת הסריקה"
 
-#: ../data/simple-scan.ui.h:25
+#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
 msgid "Text"
 msgstr "טקסט"
 
-#: ../data/simple-scan.ui.h:26
+#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
 msgid "Photo"
 msgstr "צילום"
 
 #. Menu item to reorder pages
-#. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1183 ../src/ui.vala:1841
+#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr "סידור הדפים מחדש"
 
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: data/simple-scan.ui:367
 msgid "_Email"
 msgstr "_דוא״ל"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: data/simple-scan.ui:430
 msgid "_Page"
 msgstr "_עמוד"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: data/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "סיבוב _שמאלה"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: data/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "סיבוב _ימינה"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: data/simple-scan.ui:460
 msgid "_Crop"
 msgstr "_חיתוך"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: data/simple-scan.ui:470
 msgid "_None"
 msgstr "_ללא"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: data/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: data/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: data/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: data/simple-scan.ui:514
 msgid "_Letter"
 msgstr "_מכתב"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: data/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "_פוליו"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: data/simple-scan.ui:536
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: data/simple-scan.ui:547
 msgid "_Custom"
 msgstr "ה_תאמה אישית"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: data/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr "_סיבוב חיתוך"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: data/simple-scan.ui:578
 msgid "Move Left"
 msgstr ""
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: data/simple-scan.ui:587
 msgid "Move Right"
 msgstr ""
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: data/simple-scan.ui:624
 msgid "_Help"
 msgstr "ע_זרה"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: data/simple-scan.ui:632
 msgid "_Contents"
 msgstr "_תוכן"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: data/simple-scan.ui:674 data/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "התחלת מסמך חדש"
 
-#: ../data/simple-scan.ui.h:67
+#: data/simple-scan.ui:675
 msgid "New"
 msgstr "חדש"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: data/simple-scan.ui:689 data/simple-scan.ui:836
 msgid "Scan a single page from the scanner"
 msgstr "סריקת עמוד בודד מהסורק"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: data/simple-scan.ui:691 data/simple-scan.ui:837
 msgid "Scan"
 msgstr "סריקה"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: data/simple-scan.ui:707 data/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "שמירת המסמך לקובץ"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1842
+#: data/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "שמירה"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: data/simple-scan.ui:724 data/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "עצירת הסריקה הנוכחית"
 
-#: ../data/simple-scan.ui.h:77
+#: data/simple-scan.ui:725 data/simple-scan.ui:825
 msgid "Stop"
 msgstr "עצירה"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: data/simple-scan.ui:749 data/simple-scan.ui:936
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "סיבוב העמוד לשמאל (נגד כיוון השעון)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: data/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "סיבוב שמאלה"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: data/simple-scan.ui:764 data/simple-scan.ui:914
 msgid "Rotate the page to the right (clockwise)"
 msgstr "סיבוב העמוד לימין (עם כיוון השעון)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: data/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "סיבוב ימינה"
 
-#: ../data/simple-scan.ui.h:86
+#: data/simple-scan.ui:779 data/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "חיתוך העמוד שנבחר"
 
-#: ../data/simple-scan.ui.h:87
+#: data/simple-scan.ui:781
 msgid "Crop"
 msgstr "חיתוך"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1849
+#: data/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "העדפות"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: data/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "_מקור הסריקה:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: data/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "ר_זולוציית הטקסט:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: data/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "_רזולוציית התמונה:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: data/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "הצד הנסרק:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: data/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "מידות הדף:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: data/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "בהירות:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: data/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "ניגודיות:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: data/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "איכות:"
 
-#: ../data/simple-scan.desktop.in.h:2
+#: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr "סורק מסמכים"
 
-#: ../data/simple-scan.desktop.in.h:3
+#: data/simple-scan.desktop.in:5
 msgid "Scan Documents"
 msgstr "סריקת מסמכים"
 
-#: ../data/simple-scan.desktop.in.h:4
+#: data/simple-scan.desktop.in:6
 msgid "scan;scanner;flatbed;adf;"
 msgstr "סורק;סריקה;משטח;מזין דפים;"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Device to scan from"
-msgstr "Device to scan from"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "SANE device to acquire images from."
-msgstr "SANE device to acquire images from."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "Type of document being scanned"
-msgstr "Type of document being scanned"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
-msgid ""
-"Type of document being scanned. This setting decides on the scan resolution, "
-"colors and post-processing."
+#: data/simple-scan.desktop.in:8
+msgid "scanner"
 msgstr ""
-"Type of document being scanned. This setting decides on the scan resolution, "
-"colors and post-processing."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
-msgid "Width of paper in tenths of a mm"
-msgstr "Width of paper in tenths of a mm"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
-msgid "Height of paper in tenths of a mm"
-msgstr "Height of paper in tenths of a mm"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "Brightness of scan"
-msgstr "בהירות הסריקה"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "The brightness adjustment from -100 to 100 (0 being none)."
-msgstr "התאמת הבהירות מ־‎-100 ועד 100 (0 - ללא השפעה)"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid "Contrast of scan"
-msgstr "ניגודיות הסריקה"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "The contrast adjustment from -100 to 100 (0 being none)."
-msgstr "התאמת הניגודיות מ־‎-100 ועד 100 (0 - ללא השפעה)"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid "Resolution for text scans"
-msgstr "Resolution for text scans"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
-msgid "The resolution in dots-per-inch to use when scanning text."
-msgstr "The resolution in dots-per-inch to use when scanning text."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
-msgid "Resolution for photo scans"
-msgstr "Resolution for photo scans"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr "The resolution in dots-per-inch to use when scanning photos."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
-msgid "Page side to scan"
-msgstr "Page side to scan"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
-msgid "The page side to scan."
-msgstr "The page side to scan."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
-msgid "Directory to save files to"
-msgstr "Directory to save files to"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
-msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
-msgstr ""
-"The directory to save files to. Defaults to the documents directory if unset."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
-msgid "Quality value to use for JPEG compression"
-msgstr "ערך האיכות לשימוש לדחיסת JPEG"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Quality value to use for JPEG compression."
-msgstr "ערך האיכות לשימוש לדחיסת JPEG."
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+#: data/simple-scan.appdata.xml.in:8
 msgid ""
 "A really easy way to scan both documents and photos. You can crop out the "
 "bad parts of a photo and rotate it if it is the wrong way round. You can "
@@ -417,198 +320,164 @@ msgstr ""
 "בתמונה ולהטות אם היא בכיוון הלא נכון. ניתן להדפיס את הסריקות שלך, לייצא אותן "
 "ל־PDF או לשמור אותן במגוון רחב של תסדירי תמונה."
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+#: data/simple-scan.appdata.xml.in:13
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 "סריקה פשוטה משתמשת בסביבת העבודה SANE לטובת תמיכה ברוב הסורקים הזמינים."
 
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr "אין סורקים זמינים. נא לחבר סורק."
 
-#. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "לא ניתן להתחבר לסורק"
 
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "לא ניתן להתחיל בסריקה"
 
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1236 src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr "אירעה שגיאה בעת ההתקשרות עם הסורק"
 
-#. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "Show release version"
 
-#. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr "Print debugging messages"
 
-#: ../src/simple-scan.vala:26
+#: src/simple-scan.vala:26
 msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr "תיקון קובצי PDF שנוצרו באמצעות גרסאות ישנות יותר של Simple Scan"
 
-#. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:391
+#: src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "הסריקה נכשלה"
 
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DEVICE...] - Scanning utility"
 
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Run '%s --help' to see a full list of available command line options."
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:318 src/ui.vala:1602 src/ui.vala:1887
 msgid "_Close"
 msgstr "ס_גירה"
 
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:327
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "נדרשים שם משתמש וססמה כדי לגשת אל '%s'"
 
-#. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:375
 msgid "No scanners detected"
 msgstr "לא נמצאו סורקים"
 
-#. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:377
 msgid "Please check your scanner is connected and powered on"
 msgstr "יש לבדוק כי הסורק מחובר ומופעל"
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:382
 msgid "Additional software needed"
 msgstr "נדרשות תכניות נוספות"
 
-#. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr "עליך להתקין את מנהל ההתקן של הסורק שלך."
 
-#. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:506 src/ui.vala:1843
 msgid "Save As..."
 msgstr "שמירה בשם..."
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:509 src/ui.vala:675
 msgid "_Cancel"
 msgstr "_ביטול"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:510 src/ui.vala:676
 msgid "_Save"
 msgstr "_שמירה"
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "מסמך סרוק.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:521
 msgid "Image Files"
 msgstr "קובצי תמונה"
 
-#. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:527
 msgid "All Files"
 msgstr "כל הקבצים"
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (מסמך מרובה עמודים)"
 
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (דחוס)"
 
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (ללא אבדן נתונים)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:557
 msgid "File format:"
 msgstr "תבנית הקובץ:"
 
-#. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:650
 msgid "Failed to save file"
 msgstr "שמירת הקובץ נכשלה"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:673
 msgid "If you don't save, changes will be permanently lost."
 msgstr "ללא שמירה, השינויים יאבדו לעד."
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:708
+#: src/ui.vala:708
 msgid "Save current document?"
 msgstr "האם לשמור את המסמך הנוכחי?"
 
-#. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:710
 msgid "Discard Changes"
 msgstr "התעלמות מהשינויים"
 
-#. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "לא ניתן לשמור את התמונה לתצוגה מקדימה"
 
-#. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "לא ניתן לפתוח את היישום להצגה מקדימה של תמונות"
 
-#. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1206
 msgid "Combine sides"
 msgstr "שילוב צדדים"
 
-#. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr "שילוב צדדים (הפוך)"
 
-#. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1226
 msgid "Reverse"
 msgstr "היפוך"
 
-#. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr "להשאיר ללא שינוי"
 
-#. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "לא ניתן לפתוח את קובץ העזרה"
 
-#. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1472
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -634,45 +503,39 @@ msgstr ""
 "לתכנית זו אמור להיות מצורף עותק של הרישיון הציבורי הכללי של GNU; במידה שלא, "
 "ניתן לעיין ב־<http://www.gnu.org/licenses/>."
 
-#. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "על אודות Simple Scan"
 
-#. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "כלי פשוט לסריקת מסמכים"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Amit Yaron https://launchpad.net/~amityaron87\n"
 "  Ddorda https://launchpad.net/~ddorda\n"
 "  Dudu Edri https://launchpad.net/~duduedri96\n"
-"  Liel Fridman https://launchpad.net/~lielft\n"
+"  Liel Fridman https://launchpad.net/~lielft-deactivatedaccount\n"
 "  Robert Ancell https://launchpad.net/~robert-ancell\n"
 "  Shlomil https://launchpad.net/~shlomister\n"
 "  Yaron https://launchpad.net/~sh-yaron"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "האם לשמור את המסמך בטרם היציאה?"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "לצאת ללא שמירה"
 
-#. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr "נראה כי הסורק המחובר הוא מתוצרת Brother."
 
-#. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1581
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
@@ -680,13 +543,11 @@ msgstr ""
 "מנהלי ההתקן זמינים ב<a href=\"http://support.brother.com\">אתר של "
 "Brother</a>."
 
-#. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr "נראה כי הסורק המחובר הוא מתוצרת Samsung."
 
-#. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1587
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
@@ -694,156 +555,141 @@ msgstr ""
 "מנהלי ההתקן זמינים ב<a href=\"http://samsung.com/support\">אתר של "
 "Samsung</a>."
 
-#. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr "נראה כי הסורק המחובר הוא מתוצרת HP."
 
-#. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr "נראה כי הסורק המחובר הוא מתוצרת Epson."
 
-#. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1598
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
 msgstr ""
+"מנהלי התקן עבור ההתקן זמינים ב<a href=\"http://support.epson.com\">אתר של "
+"Epson</a>."
 
-#. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1602
 msgid "Install drivers"
 msgstr "התקנת מנהלי התקן"
 
-#. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "לאחר ההתקנה יהיה עליך להפעיל מחדש את סריקה פשוטה."
 
-#. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr "מנהלי ההתקן מותקנים…"
 
-#. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr "מנהלי ההתקנים הותקנו בהצלחה!"
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "התקנת מנהלי ההתקנים נכשלה (קוד שגיאה %d)."
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr "התקנת מנהלי ההתקן נכשלה."
 
-#. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1676
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr "יהיה עליך להתקין את החבילה/ות %s."
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (בררת מחדל)"
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (טיוטה)"
 
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (רזולוציה גבוהה)"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/ui.vala:1793
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1835
 msgid "New Document"
 msgstr "מסמך חדש"
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1840
 msgid "Document"
 msgstr "מסמך"
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1844
 msgid "Email..."
 msgstr "דוא״ל…"
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1845
 msgid "Print..."
 msgstr "הדפסה…"
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1853
 msgid "Help"
 msgstr "עזרה"
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1854
 msgid "About"
 msgstr "על אודות"
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1855
 msgid "Quit"
 msgstr "יציאה"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "ב_חירה בסורק אחר"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr "הת_קנת מנהלי התקן"
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1897
 msgid "Automatic"
 msgstr "אוטומטי"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1947
 msgid "Darker"
 msgstr "כהה יותר"
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1949
 msgid "Lighter"
 msgstr "בהיר יותר"
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:1957
 msgid "Less"
 msgstr "פחות"
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:1959
 msgid "More"
 msgstr "יותר"
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:1967
 msgid "Minimum"
 msgstr "מזערי"
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:1969
 msgid "Maximum"
 msgstr "מרבי"
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2008
 msgid "Saving document..."
 msgstr "המסמך נשמר...‏"
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "נשמר העמוד %d מתוך %d"
@@ -893,9 +739,21 @@ msgstr "נשמר העמוד %d מתוך %d"
 #~ msgid "TRUE if the application window is maximized"
 #~ msgstr "TRUE if the application window is maximized"
 
+#~ msgid "Device to scan from"
+#~ msgstr "Device to scan from"
+
+#~ msgid "SANE device to acquire images from."
+#~ msgstr "SANE device to acquire images from."
+
 #~ msgid "Direction of scan"
 #~ msgstr "Direction of scan"
 
+#~ msgid "Resolution for text scans"
+#~ msgstr "Resolution for text scans"
+
+#~ msgid "Resolution for photo scans"
+#~ msgstr "Resolution for photo scans"
+
 #~ msgid "Resolution of last scanned image"
 #~ msgstr "Resolution of last scanned image"
 
@@ -913,6 +771,9 @@ msgstr "נשמר העמוד %d מתוך %d"
 #~ "The direction of the scanner across the scanned page. It can be one of the "
 #~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
 
+#~ msgid "Type of document being scanned"
+#~ msgstr "Type of document being scanned"
+
 #~ msgid ""
 #~ "Type of document being scanned. 'text' for text documents, 'photo' for "
 #~ "photos. This setting decides on the scan resolution, colors and post-"
@@ -935,6 +796,12 @@ msgstr "נשמר העמוד %d מתוך %d"
 #~ msgid "The resolution in dots-per-inch of the previously scanned image."
 #~ msgstr "The resolution in dots-per-inch of the previously scanned image."
 
+#~ msgid "The resolution in dots-per-inch to use when scanning text."
+#~ msgstr "The resolution in dots-per-inch to use when scanning text."
+
+#~ msgid "The resolution in dots-per-inch to use when scanning photos."
+#~ msgstr "The resolution in dots-per-inch to use when scanning photos."
+
 #~ msgid "Width of scanned image in pixels"
 #~ msgstr "Width of scanned image in pixels"
 
@@ -960,13 +827,72 @@ msgstr "נשמר העמוד %d מתוך %d"
 #~ msgid "Scanned Document"
 #~ msgstr "מסמך שנסרק"
 
+#~ msgid "Page side to scan"
+#~ msgstr "Page side to scan"
+
+#~ msgid "Height of paper in tenths of a mm"
+#~ msgstr "Height of paper in tenths of a mm"
+
+#~ msgid "Directory to save files to"
+#~ msgstr "Directory to save files to"
+
 #~ msgid ""
 #~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
 #~ msgstr ""
 #~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
 
+#~ msgid ""
+#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr ""
+#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+
+#~ msgid ""
+#~ "The directory to save files to. Defaults to the documents directory if unset."
+#~ msgstr ""
+#~ "The directory to save files to. Defaults to the documents directory if unset."
+
+#~ msgid ""
+#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr ""
+#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+
+#~ msgid "Width of paper in tenths of a mm"
+#~ msgstr "Width of paper in tenths of a mm"
+
 #~ msgid "Select File _Type"
 #~ msgstr "בחירת _סוג הקובץ"
 
+#~ msgid "The page side to scan."
+#~ msgstr "The page side to scan."
+
+#~ msgid ""
+#~ "Type of document being scanned. This setting decides on the scan resolution, "
+#~ "colors and post-processing."
+#~ msgstr ""
+#~ "Type of document being scanned. This setting decides on the scan resolution, "
+#~ "colors and post-processing."
+
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "The direction of the scanner across the scanned page."
+
+#~ msgid "Quality value to use for JPEG compression."
+#~ msgstr "ערך האיכות לשימוש לדחיסת JPEG."
+
+#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
+#~ msgstr "התאמת הניגודיות מ־‎-100 ועד 100 (0 - ללא השפעה)"
+
+#~ msgid "Contrast of scan"
+#~ msgstr "ניגודיות הסריקה"
+
+#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
+#~ msgstr "התאמת הבהירות מ־‎-100 ועד 100 (0 - ללא השפעה)"
+
+#~ msgid "Brightness of scan"
+#~ msgstr "בהירות הסריקה"
+
+#~ msgid "Quality value to use for JPEG compression"
+#~ msgstr "ערך האיכות לשימוש לדחיסת JPEG"
diff --git a/po/hr.gmo b/po/hr.gmo
new file mode 100644
index 0000000..5608e50
--- /dev/null
+++ b/po/hr.gmo
diff --git a/po/hr.po b/po/hr.po
index 27e621d..4dc6030 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -7,407 +7,309 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-06 14:16+1200\n"
+"POT-Creation-Date: 2016-07-29 12:47+1200\n"
 "PO-Revision-Date: 2012-07-23 09:01+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-04-14 05:40+0000\n"
-"X-Generator: Launchpad (build 17990)\n"
+"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 
 #. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:2
+#: data/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_Ovlasti"
 
 #. Label beside username entry
-#: ../data/simple-scan.ui.h:4
+#: data/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "_Korisničko ime za izvor:"
 
 #. Label beside password entry
-#: ../data/simple-scan.ui.h:6
+#: data/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Lozinka:"
 
 #. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:8
+#: data/simple-scan.ui:188
 msgid "Front and Back"
 msgstr "Prednja i stražnja"
 
 #. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:10
+#: data/simple-scan.ui:192
 msgid "Front"
 msgstr "Prednja"
 
 #. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:12
+#: data/simple-scan.ui:196
 msgid "Back"
 msgstr "Stražnja"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
-#: ../data/appdata/simple-scan.appdata.xml.in.h:1
+#: data/simple-scan.ui:225 data/simple-scan.ui:809
+#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr "Skeniranje dokumenata"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:16
+#: data/simple-scan.ui:241
 msgid "_Document"
 msgstr "_Dokument"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:18
+#: data/simple-scan.ui:260
 msgid "Sc_an"
 msgstr "Sk_eniraj"
 
+#. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:20
+#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
 msgid "Single _Page"
 msgstr "Jednu _stranicu"
 
+#. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:22
+#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr "Sve stranice iz _uvlakača"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:24
+#: data/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "_Zaustavi skeniranje"
 
-#: ../data/simple-scan.ui.h:25
+#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
 msgid "Text"
 msgstr "Tekst"
 
-#: ../data/simple-scan.ui.h:26
+#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
 msgid "Photo"
 msgstr "Fotografija"
 
 #. Menu item to reorder pages
-#. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1183 ../src/ui.vala:1841
+#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr "Presloži stranice"
 
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: data/simple-scan.ui:367
 msgid "_Email"
 msgstr "_E-pošta"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: data/simple-scan.ui:430
 msgid "_Page"
 msgstr "_Stranica"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: data/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "Zakreni _lijevo"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: data/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "Zakreni _desno"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: data/simple-scan.ui:460
 msgid "_Crop"
 msgstr "_Izreži"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: data/simple-scan.ui:470
 msgid "_None"
 msgstr "_Ništa"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: data/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: data/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: data/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: data/simple-scan.ui:514
 msgid "_Letter"
 msgstr "_Pismo"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: data/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "Pr_avno"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: data/simple-scan.ui:536
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: data/simple-scan.ui:547
 msgid "_Custom"
 msgstr "_Prilagođeno"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: data/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr "_Zakreni isječak"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: data/simple-scan.ui:578
 msgid "Move Left"
 msgstr "Pomakni ulijevo"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: data/simple-scan.ui:587
 msgid "Move Right"
 msgstr "Pomakni udesno"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: data/simple-scan.ui:624
 msgid "_Help"
 msgstr "_Pomoć"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: data/simple-scan.ui:632
 msgid "_Contents"
 msgstr "_Priručnik"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: data/simple-scan.ui:674 data/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "Započni novi dokument"
 
-#: ../data/simple-scan.ui.h:67
+#: data/simple-scan.ui:675
 msgid "New"
 msgstr "Novo"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: data/simple-scan.ui:689 data/simple-scan.ui:836
 msgid "Scan a single page from the scanner"
 msgstr "Skeniraj jednu stranicu sa skenera"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: data/simple-scan.ui:691 data/simple-scan.ui:837
 msgid "Scan"
 msgstr "Skeniraj"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: data/simple-scan.ui:707 data/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "Spremi dokument u datoteku"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1842
+#: data/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "Spremi"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: data/simple-scan.ui:724 data/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "Zaustavi trenutno skeniranje"
 
-#: ../data/simple-scan.ui.h:77
+#: data/simple-scan.ui:725 data/simple-scan.ui:825
 msgid "Stop"
 msgstr "Zaustavi"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: data/simple-scan.ui:749 data/simple-scan.ui:936
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Zakreni stranicu ulijevo (obrnuto od kazaljke na satu)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: data/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "Zakreni lijevo"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: data/simple-scan.ui:764 data/simple-scan.ui:914
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Zakreni stranicu udesno (u smjeru kazaljke na satu)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: data/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "Zakreni udesno"
 
-#: ../data/simple-scan.ui.h:86
+#: data/simple-scan.ui:779 data/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "Izreži odabranu stranicu"
 
-#: ../data/simple-scan.ui.h:87
+#: data/simple-scan.ui:781
 msgid "Crop"
 msgstr "Izreži"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1849
+#: data/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "Osobitosti"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: data/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "_Izvor skeniranja:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: data/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "_Razlučivost teksta:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: data/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "_Razlučivost slike:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: data/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "Stranica skeniranja:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: data/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "Veličina stranice:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: data/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "Svjetlina:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: data/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "Kontrast:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: data/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "Kvaliteta:"
 
-#: ../data/simple-scan.desktop.in.h:2
+#: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr "Skener dokumenta"
 
-#: ../data/simple-scan.desktop.in.h:3
+#: data/simple-scan.desktop.in:5
 msgid "Scan Documents"
 msgstr "Skenirajte dokumente"
 
-#: ../data/simple-scan.desktop.in.h:4
+#: data/simple-scan.desktop.in:6
 msgid "scan;scanner;flatbed;adf;"
 msgstr "skeniraj;skener;plosnat;adf;"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Device to scan from"
-msgstr "Uređaj za skeniranje"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "SANE device to acquire images from."
-msgstr "SANE uređaj iz kojeg se dobiva slika."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "Type of document being scanned"
-msgstr "Vrsta dokumenat koji se skenira"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
-msgid ""
-"Type of document being scanned. This setting decides on the scan resolution, "
-"colors and post-processing."
+#: data/simple-scan.desktop.in:8
+msgid "scanner"
 msgstr ""
-"Vrsta dokumenta koji se skenira. Ova postavka određuje razlučivost, boju i "
-"naknadnu obradu."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
-msgid "Width of paper in tenths of a mm"
-msgstr "Širina papira u desetinkama milimetra"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-"Širina papira u desetinkama milimetra (ili 0 za automatsko prepoznavanje "
-"papira)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
-msgid "Height of paper in tenths of a mm"
-msgstr "Visina papira u desetinkama milimetra"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-"Visina papira u desetinkama milimetra (ili 0 za automatsko prepoznavanje "
-"papira)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "Brightness of scan"
-msgstr "Svjetlina skeniranja"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "The brightness adjustment from -100 to 100 (0 being none)."
-msgstr "Prilagodba svjetline od -100 do 100 (0 za nepromijenjeno)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid "Contrast of scan"
-msgstr "Kontrast skeniranja"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "The contrast adjustment from -100 to 100 (0 being none)."
-msgstr "Prilagodba kontrasta od -100 do 100 (0 za nepromijenjeno)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid "Resolution for text scans"
-msgstr "Razlučivost skeniranja teksta"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
-msgid "The resolution in dots-per-inch to use when scanning text."
-msgstr "Razlučivost u točkama po inču pri skeniranja teksta."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
-msgid "Resolution for photo scans"
-msgstr "Razlučivost skeniranja fotografija"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr "Razlučivost u točkama po inču pri skeniranju slika."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
-msgid "Page side to scan"
-msgstr "Stranica lista za skeniranje"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
-msgid "The page side to scan."
-msgstr "Stranica lista za skeniranje."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
-msgid "Directory to save files to"
-msgstr "Direktorij za spremanje datoteka"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
-msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
-msgstr ""
-"Direktorij za spremanje datoteka. Ako nije postavljeno, koristi se "
-"direktorij dokumenata."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
-msgid "Quality value to use for JPEG compression"
-msgstr "Vrijednost kvalitetete pri JPEG sažimanju"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Quality value to use for JPEG compression."
-msgstr "Vrijednost kvalitetete pri JPEG sažimanju."
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+#: data/simple-scan.appdata.xml.in:8
 msgid ""
 "A really easy way to scan both documents and photos. You can crop out the "
 "bad parts of a photo and rotate it if it is the wrong way round. You can "
@@ -419,201 +321,167 @@ msgstr ""
 "Možete ispisati vaše skenirane dokumente ili fotografije, izvesti ih u pdf "
 "ili ih spremiti u različite slikovne formate."
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+#: data/simple-scan.appdata.xml.in:13
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 "Skeniranje dokumenata koristi SANE radni okvir za podršku većine postojećih "
 "skenera."
 
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Nema dostupnih skenera. Molim spojite skener."
 
-#. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "Nemoguće povezivanje sa skenerom"
 
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "Nemoguće pokretanje skenera"
 
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1236 src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr "Greška pri komunikaciji sa skenerom"
 
-#. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "Prikaži inačicu izdanja"
 
-#. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr "Ispiši poruke otklanjanja grešaka"
 
-#: ../src/simple-scan.vala:26
+#: src/simple-scan.vala:26
 msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr ""
 "Popravi PDF datoteke generirane starijom inačicom Skeniranja dokumenata"
 
-#. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:391
+#: src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Neuspjelo skeniranje"
 
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[UREĐAJ...] - Alat za skeniranje"
 
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Pokrenite '%s --help'  kako biste vidjeli potpuni popis dostupnih mogućnosti "
 "naredbenog retka."
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:318 src/ui.vala:1602 src/ui.vala:1887
 msgid "_Close"
 msgstr "_Zatvori"
 
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:327
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Korisničko ime i lozinka su potrebni za pristup '%s'"
 
-#. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:375
 msgid "No scanners detected"
 msgstr "Nema otkrivenih skenera"
 
-#. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:377
 msgid "Please check your scanner is connected and powered on"
 msgstr "Provjerite je li vaš skener spojen i uključen"
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:382
 msgid "Additional software needed"
 msgstr "Potreban je daodatan softver"
 
-#. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr "Morate instalirati upravljački program za vaš skener."
 
-#. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:506 src/ui.vala:1843
 msgid "Save As..."
 msgstr "Spremi kao..."
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:509 src/ui.vala:675
 msgid "_Cancel"
 msgstr "_Odustani"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:510 src/ui.vala:676
 msgid "_Save"
 msgstr "_Spremi"
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "Skenirani dokument.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:521
 msgid "Image Files"
 msgstr "Slikovne datoteke"
 
-#. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:527
 msgid "All Files"
 msgstr "Sve datoteke"
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (dokument od više stranica)"
 
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (sažeto)"
 
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (bez gubitaka)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:557
 msgid "File format:"
 msgstr "Format datoteke:"
 
-#. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:650
 msgid "Failed to save file"
 msgstr "Neuspjelo spremanje datoteke"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:673
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Ako ne spremite, promjene će biti trajno izgubljene."
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:708
+#: src/ui.vala:708
 msgid "Save current document?"
 msgstr "Spremi trenutni dokument?"
 
-#. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:710
 msgid "Discard Changes"
 msgstr "Odbaci promjene"
 
-#. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "Neuspjelo spremanje slike za pregled"
 
-#. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "Nemoguće otvaranje aplikacije pregleda slike"
 
-#. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1206
 msgid "Combine sides"
 msgstr "Kombiniraj strane"
 
-#. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr "Kombiniraj strane (obrnuto)"
 
-#. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1226
 msgid "Reverse"
 msgstr "Obrnuto"
 
-#. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr "Zadrži nepromijenjeno"
 
-#. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "Nemoguće otvaranje datoteke pomoći"
 
-#. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1472
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -641,17 +509,15 @@ msgstr ""
 "Trebali ste dobiti primjerak GNU Opće javne licence uz ovaj\n"
 "program. Ako niste pogledajte <http://www.gnu.org/licenses/>."
 
-#. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "O skeniranju dokumenata"
 
-#. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "Alat za jednostavno skeniranje"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -664,23 +530,19 @@ msgstr ""
 "  jfk- https://launchpad.net/~jfk-\n"
 "  student4 https://launchpad.net/~iputnik-msn"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "Spremi dokument prije zatvaranja?"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "Zatvori bez spremanja"
 
-#. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr "Izgleda kako imate Brother skener."
 
-#. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1581
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
@@ -688,13 +550,11 @@ msgstr ""
 "Upravljački programi su dostupni na <a "
 "href=\"http://support.brother.com\">Brother web stranici</a>."
 
-#. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr "Izgleda kako imate Samsung skener."
 
-#. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1587
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
@@ -702,18 +562,15 @@ msgstr ""
 "Upravljački programi su dostupni na <a "
 "href=\"http://samsung.com/support\">Samsung web stranici</a>."
 
-#. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr "Izgleda kako imate HP skener."
 
-#. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr "Izgleda kako imate Epson skener."
 
-#. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1598
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
@@ -721,140 +578,126 @@ msgstr ""
 "Upravljački programi za ovaj pisač su dostupi na <a "
 "href=\"http://support.epson.com\">Epson web stranici</a>."
 
-#. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1602
 msgid "Install drivers"
 msgstr "Instaliraj upravljački program"
 
-#. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 "Jednom kada se instalira, morate ponovno pokrenuti Skeniranje dokumenata."
 
-#. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr "Instalacija upravljačkih programa..."
 
-#. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr "Upravljački programi su uspješno instalirani!"
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Neuspjela instalacija upravljačkih programa (kôd greške %d)."
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr "Neuspjela instalacija upravljačkih programa."
 
-#. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1676
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr "Morate instalirati %s package(s)."
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (zadano)"
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (skica)"
 
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (visoka razlučivost)"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/ui.vala:1793
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1835
 msgid "New Document"
 msgstr "Novi dokument"
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1840
 msgid "Document"
 msgstr "Dokument"
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1844
 msgid "Email..."
 msgstr "E-pošta..."
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1845
 msgid "Print..."
 msgstr "Ispiši…"
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1853
 msgid "Help"
 msgstr "Pomoć"
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1854
 msgid "About"
 msgstr "O programu"
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1855
 msgid "Quit"
 msgstr "Zatvori"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "Promijeni _skener"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr "_Instaliraj upravljačke programe"
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1897
 msgid "Automatic"
 msgstr "Automatska"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1947
 msgid "Darker"
 msgstr "Tamnije"
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1949
 msgid "Lighter"
 msgstr "Svjetlije"
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:1957
 msgid "Less"
 msgstr "Manje"
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:1959
 msgid "More"
 msgstr "Više"
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:1967
 msgid "Minimum"
 msgstr "Najmanje"
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:1969
 msgid "Maximum"
 msgstr "Najviše"
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2008
 msgid "Saving document..."
 msgstr "Spremanje dokumenta..."
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Spremanje stranice %d od %d"
@@ -862,6 +705,9 @@ msgstr "Spremanje stranice %d od %d"
 #~ msgid "4&#xD7;6"
 #~ msgstr "4&#xD7;6"
 
+#~ msgid "Device to scan from"
+#~ msgstr "Uređaj za skeniranje"
+
 #~ msgid "Direction of scan"
 #~ msgstr "Smjer skeniranja"
 
@@ -885,10 +731,36 @@ msgstr "Spremanje stranice %d od %d"
 #~ "Visina skenirane slike u pikselima. Ova vrijednost se ažurira na vrijednost "
 #~ "zadnje skenirane stranice."
 
+#~ msgid "SANE device to acquire images from."
+#~ msgstr "SANE uređaj iz kojeg se dobiva slika."
+
 #~ msgid "Resolution of last scanned image"
 #~ msgstr "Rezolucija zadnje skenirane slike"
 
 #~ msgid ""
+#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr ""
+#~ "Širina papira u desetinkama milimetra (ili 0 za automatsko prepoznavanje "
+#~ "papira)."
+
+#~ msgid "Width of paper in tenths of a mm"
+#~ msgstr "Širina papira u desetinkama milimetra"
+
+#~ msgid "Height of paper in tenths of a mm"
+#~ msgstr "Visina papira u desetinkama milimetra"
+
+#~ msgid ""
+#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr ""
+#~ "Visina papira u desetinkama milimetra (ili 0 za automatsko prepoznavanje "
+#~ "papira)."
+
+#~ msgid "Type of document being scanned"
+#~ msgstr "Vrsta dokumenat koji se skenira"
+
+#~ msgid ""
 #~ "Type of document being scanned. 'text' for text documents, 'photo' for "
 #~ "photos. This setting decides on the scan resolution, colors and post-"
 #~ "processing."
@@ -970,9 +842,61 @@ msgstr "Spremanje stranice %d od %d"
 #~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
 #~ msgstr "Strana lista za skeniranje. Može biti: 'obje' 'prednja' 'stražnja'"
 
+#~ msgid ""
+#~ "Type of document being scanned. This setting decides on the scan resolution, "
+#~ "colors and post-processing."
+#~ msgstr ""
+#~ "Vrsta dokumenta koji se skenira. Ova postavka određuje razlučivost, boju i "
+#~ "naknadnu obradu."
+
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "Smjer skenera preko skenirane stranice."
 
+#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
+#~ msgstr "Prilagodba kontrasta od -100 do 100 (0 za nepromijenjeno)."
+
+#~ msgid "Contrast of scan"
+#~ msgstr "Kontrast skeniranja"
+
+#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
+#~ msgstr "Prilagodba svjetline od -100 do 100 (0 za nepromijenjeno)."
+
+#~ msgid "Brightness of scan"
+#~ msgstr "Svjetlina skeniranja"
+
+#~ msgid "Resolution for text scans"
+#~ msgstr "Razlučivost skeniranja teksta"
+
+#~ msgid "The resolution in dots-per-inch to use when scanning text."
+#~ msgstr "Razlučivost u točkama po inču pri skeniranja teksta."
+
+#~ msgid "The page side to scan."
+#~ msgstr "Stranica lista za skeniranje."
+
+#~ msgid "Quality value to use for JPEG compression."
+#~ msgstr "Vrijednost kvalitetete pri JPEG sažimanju."
+
+#~ msgid "Page side to scan"
+#~ msgstr "Stranica lista za skeniranje"
+
+#~ msgid "Quality value to use for JPEG compression"
+#~ msgstr "Vrijednost kvalitetete pri JPEG sažimanju"
+
+#~ msgid "Resolution for photo scans"
+#~ msgstr "Razlučivost skeniranja fotografija"
+
+#~ msgid "The resolution in dots-per-inch to use when scanning photos."
+#~ msgstr "Razlučivost u točkama po inču pri skeniranju slika."
+
+#~ msgid ""
+#~ "The directory to save files to. Defaults to the documents directory if unset."
+#~ msgstr ""
+#~ "Direktorij za spremanje datoteka. Ako nije postavljeno, koristi se "
+#~ "direktorij dokumenata."
+
+#~ msgid "Directory to save files to"
+#~ msgstr "Direktorij za spremanje datoteka"
+
 #~ msgid "Select File _Type"
 #~ msgstr "Odaberi _vrstu datoteke"
 
diff --git a/po/hu.gmo b/po/hu.gmo
new file mode 100644
index 0000000..39775b3
--- /dev/null
+++ b/po/hu.gmo
diff --git a/po/hu.po b/po/hu.po
index 765f445..f749495 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,405 +7,309 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-06 14:16+1200\n"
+"POT-Creation-Date: 2016-07-29 12:47+1200\n"
 "PO-Revision-Date: 2014-02-18 14:14+0000\n"
 "Last-Translator: Gabor Kelemen <kelemeng@openscope.org>\n"
 "Language-Team: Hungarian <hu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-04-14 05:40+0000\n"
-"X-Generator: Launchpad (build 17990)\n"
+"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 
 #. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:2
+#: data/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_Felhatalmazás"
 
 #. Label beside username entry
-#: ../data/simple-scan.ui.h:4
+#: data/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "_Felhasználónév az erőforráshoz:"
 
 #. Label beside password entry
-#: ../data/simple-scan.ui.h:6
+#: data/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Jelszó:"
 
 #. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:8
+#: data/simple-scan.ui:188
 msgid "Front and Back"
 msgstr "Előlap és hátlap"
 
 #. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:10
+#: data/simple-scan.ui:192
 msgid "Front"
 msgstr "Előlap"
 
 #. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:12
+#: data/simple-scan.ui:196
 msgid "Back"
 msgstr "Hátlap"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
-#: ../data/appdata/simple-scan.appdata.xml.in.h:1
+#: data/simple-scan.ui:225 data/simple-scan.ui:809
+#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr "Simple Scan"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:16
+#: data/simple-scan.ui:241
 msgid "_Document"
 msgstr "_Dokumentum"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:18
+#: data/simple-scan.ui:260
 msgid "Sc_an"
 msgstr "Sz_kennelés"
 
+#. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:20
+#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
 msgid "Single _Page"
 msgstr "Egy _oldal"
 
+#. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:22
+#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr "Minden oldal az _adagolóból"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:24
+#: data/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "_Szkennelés megállítása"
 
-#: ../data/simple-scan.ui.h:25
+#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
 msgid "Text"
 msgstr "Szöveg"
 
-#: ../data/simple-scan.ui.h:26
+#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
 msgid "Photo"
 msgstr "Fénykép"
 
 #. Menu item to reorder pages
-#. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1183 ../src/ui.vala:1841
+#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr "Oldalak újrarendezése"
 
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: data/simple-scan.ui:367
 msgid "_Email"
 msgstr "_E-mail"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: data/simple-scan.ui:430
 msgid "_Page"
 msgstr "_Oldal"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: data/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "Forgatás b_alra"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: data/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "Forgatás _jobbra"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: data/simple-scan.ui:460
 msgid "_Crop"
 msgstr "_Vágás"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: data/simple-scan.ui:470
 msgid "_None"
 msgstr "_Nincs vágás"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: data/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: data/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: data/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: data/simple-scan.ui:514
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: data/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: data/simple-scan.ui:536
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: data/simple-scan.ui:547
 msgid "_Custom"
 msgstr "_Egyéni"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: data/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr "Vágott rész fo_rgatása"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: data/simple-scan.ui:578
 msgid "Move Left"
 msgstr "Mozgatás balra"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: data/simple-scan.ui:587
 msgid "Move Right"
 msgstr "Mozgatás jobbra"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: data/simple-scan.ui:624
 msgid "_Help"
 msgstr "_Súgó"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: data/simple-scan.ui:632
 msgid "_Contents"
 msgstr "_Tartalom"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: data/simple-scan.ui:674 data/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "Új dokumentum létrehozása"
 
-#: ../data/simple-scan.ui.h:67
+#: data/simple-scan.ui:675
 msgid "New"
 msgstr "Új"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: data/simple-scan.ui:689 data/simple-scan.ui:836
 msgid "Scan a single page from the scanner"
 msgstr "Egy oldal szkennelése az eszközről"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: data/simple-scan.ui:691 data/simple-scan.ui:837
 msgid "Scan"
 msgstr "Szkennelés"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: data/simple-scan.ui:707 data/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "Dokumentum fájlba mentése"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1842
+#: data/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "Mentés"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: data/simple-scan.ui:724 data/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "A jelenlegi szkennelés leállítása"
 
-#: ../data/simple-scan.ui.h:77
+#: data/simple-scan.ui:725 data/simple-scan.ui:825
 msgid "Stop"
 msgstr "Leállít"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: data/simple-scan.ui:749 data/simple-scan.ui:936
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Az oldal elforgatása balra (az óra járásával ellentétesen)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: data/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "Forgatás balra"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: data/simple-scan.ui:764 data/simple-scan.ui:914
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Az oldal elforgatása jobbra (az óra járásával egyezően)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: data/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "Forgatás jobbra"
 
-#: ../data/simple-scan.ui.h:86
+#: data/simple-scan.ui:779 data/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "A kiválasztott oldal vágása"
 
-#: ../data/simple-scan.ui.h:87
+#: data/simple-scan.ui:781
 msgid "Crop"
 msgstr "Vágás"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1849
+#: data/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "Beállítások"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: data/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "Szkennelés _forrása:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: data/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "_Szöveg felbontása:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: data/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "_Fotó felbontása:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: data/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "Oldal szkennelése:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: data/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "Oldalméret:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: data/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "Fényerő:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: data/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "Kontraszt:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: data/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "Minőség:"
 
-#: ../data/simple-scan.desktop.in.h:2
+#: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr "Dokumentumbeolvasó"
 
-#: ../data/simple-scan.desktop.in.h:3
+#: data/simple-scan.desktop.in:5
 msgid "Scan Documents"
 msgstr "Dokumentumok szkennelése"
 
-#: ../data/simple-scan.desktop.in.h:4
+#: data/simple-scan.desktop.in:6
 msgid "scan;scanner;flatbed;adf;"
 msgstr "szkennelés;szkenner;beolvasó;síkágyas;adf;"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Device to scan from"
-msgstr "A szkennelő eszkőz"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "SANE device to acquire images from."
-msgstr "Képek beszerzése erről a SANE eszközről"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "Type of document being scanned"
-msgstr "A szkennelt dokumentum típusa"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
-msgid ""
-"Type of document being scanned. This setting decides on the scan resolution, "
-"colors and post-processing."
+#: data/simple-scan.desktop.in:8
+msgid "scanner"
 msgstr ""
-"A szkennelt dokumentum típusa. Ez a beállítás meghatározza a beolvasott "
-"oldal felbontását, színeit és utófeldolgozását."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
-msgid "Width of paper in tenths of a mm"
-msgstr "Papír szélessége tizedmilliméterben"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-"Papír szélessége tizedmilliméterben (0 az automatikus papírfelismeréshez)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
-msgid "Height of paper in tenths of a mm"
-msgstr "Papír magassága tizedmilliméterben"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-"Papír magassága tizedmilliméterben (0 az automatikus papírfelismeréshez)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "Brightness of scan"
-msgstr "A beolvasás fényereje"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "The brightness adjustment from -100 to 100 (0 being none)."
-msgstr "A fényerő változtatása -100-tól 100-ig (0=nincs)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid "Contrast of scan"
-msgstr "A beolvasás kontrasztja"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "The contrast adjustment from -100 to 100 (0 being none)."
-msgstr "A kontraszt változtatása -100-tól 100-ig (0=nincs)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid "Resolution for text scans"
-msgstr "Szövegek szkennelésének felbontása"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
-msgid "The resolution in dots-per-inch to use when scanning text."
-msgstr "Szövegek szkennelésnél használandó  DPI felbontás."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
-msgid "Resolution for photo scans"
-msgstr "Fotók szkennelésének felbontása"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr "Fotók szkennelésnél használandó  DPI felbontás."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
-msgid "Page side to scan"
-msgstr "Lapok szkennelendő oldala"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
-msgid "The page side to scan."
-msgstr "A lap szkennelendő oldala."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
-msgid "Directory to save files to"
-msgstr "Fájlok mentése ebbe a könyvtárba"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
-msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
-msgstr ""
-"A fájlok mentésének helye. Alapértelmezésben a Dokumentumok mappa, ha nincs "
-"beállítva."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
-msgid "Quality value to use for JPEG compression"
-msgstr "A minőségi tényező megadása a JPEG tömörítéshez"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Quality value to use for JPEG compression."
-msgstr "A minőségi tényező megadása a JPEG tömörítéshez."
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+#: data/simple-scan.appdata.xml.in:8
 msgid ""
 "A really easy way to scan both documents and photos. You can crop out the "
 "bad parts of a photo and rotate it if it is the wrong way round. You can "
@@ -416,200 +320,166 @@ msgstr ""
 "a képek fölösleges részeit, és elforgathatja azokat. Kinyomtathatja, PDF-be "
 "vagy számos képformátumba is exportálhatja a szkennelt dokumentumokat."
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+#: data/simple-scan.appdata.xml.in:13
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 "A Simple Scan a SANE keretrendszert használja a legtöbb létező szkenner "
 "támogatása érdekében."
 
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Nem található szkenner. Csatlakoztasson egyet."
 
-#. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "Nem sikerült csatlakozni a szkennerhez"
 
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "Nem sikerült elindítani a szkennelést"
 
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1236 src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr "Kommunikációs hiba a szkennerrel"
 
-#. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "Verziószám megjelenítése"
 
-#. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr "Hibakeresési üzenetek kiírása"
 
-#: ../src/simple-scan.vala:26
+#: src/simple-scan.vala:26
 msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr "A Simple Scan régebbi verzióival készült PDF fájlok javítása"
 
-#. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:391
+#: src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "A szkennelés meghiúsult"
 
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[ESZKÖZ…] – Szkennelő segédprogram"
 
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Futtassa a(z) „%s --help” parancsot a parancssori kapcsolók listájáért."
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:318 src/ui.vala:1602 src/ui.vala:1887
 msgid "_Close"
 msgstr "_Bezárás"
 
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:327
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "A(z) „%s” eléréséhez felhasználónév és jelszó szükséges"
 
-#. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:375
 msgid "No scanners detected"
 msgstr "Nem található szkenner"
 
-#. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:377
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 "Ellenőrizze, hogy a szkenner csatlakoztatva van, és be van-e kapcsolva"
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:382
 msgid "Additional software needed"
 msgstr "További szoftverek szükségesek"
 
-#. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr "A szkennerhez illesztőprogramot kell telepíteni."
 
-#. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:506 src/ui.vala:1843
 msgid "Save As..."
 msgstr "Mentés másként…"
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:509 src/ui.vala:675
 msgid "_Cancel"
 msgstr "_Mégse"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:510 src/ui.vala:676
 msgid "_Save"
 msgstr "_Mentés"
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "Szkennelt dokumentum.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:521
 msgid "Image Files"
 msgstr "Képfájlok"
 
-#. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:527
 msgid "All Files"
 msgstr "Minden fájl"
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (többoldalas dokumentum)"
 
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (tömörített)"
 
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (veszteségmentes)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:557
 msgid "File format:"
 msgstr "Fájlformátum:"
 
-#. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:650
 msgid "Failed to save file"
 msgstr "A fájl mentése sikertelen"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:673
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Ha nem ment, akkor a változtatások véglegesen elvesznek."
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:708
+#: src/ui.vala:708
 msgid "Save current document?"
 msgstr "Mentse az aktuális dokumentumot?"
 
-#. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:710
 msgid "Discard Changes"
 msgstr "Módosítások eldobása"
 
-#. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "A képfájlt nem lehet elmenteni előnézethez"
 
-#. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "Nem nyitható meg az előnézetet megjelenítő alkalmazás"
 
-#. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1206
 msgid "Combine sides"
 msgstr "Oldalak egyesítése"
 
-#. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr "Oldalak egyesítése (fordított)"
 
-#. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1226
 msgid "Reverse"
 msgstr "Fordított"
 
-#. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr "Maradjon változatlan"
 
-#. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "A súgófájl nem nyitható meg"
 
-#. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1472
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -636,17 +506,15 @@ msgstr ""
 "A programhoz a GNU General Public License egy példánya is jár, ha nem kapta "
 "meg, itt elolvashatja: <http://www.gnu.org/licenses/>."
 
-#. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "Simple Scan névjegye"
 
-#. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "Egyszerű dokumentumszkennelés"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -662,23 +530,19 @@ msgstr ""
 "  csola48 https://launchpad.net/~mail-csordaslaszlo\n"
 "  Úr Balázs https://launchpad.net/~urbalazs"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "Menti a dokumentumot kilépés előtt?"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "Kilépés mentés nélkül"
 
-#. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr "Úgy tűnik, Brother márkájú szkennere van."
 
-#. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1581
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
@@ -686,13 +550,11 @@ msgstr ""
 "Ehhez a <a href=\"http://support.brother.com\">Brother weboldaláról</a> "
 "érhetők el illesztőprogramok."
 
-#. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr "Úgy tűnik, Samsung márkájú szkennere van."
 
-#. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1587
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
@@ -700,18 +562,15 @@ msgstr ""
 "Ehhez a <a href=\"http://samsung.com/support\">Samsung weboldaláról</a> "
 "érhetők el illesztőprogramok."
 
-#. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr "Úgy tűnik, HP márkájú szkennere van."
 
-#. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr "Úgy tűnik, Epson márkájú szkennere van."
 
-#. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1598
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
@@ -719,139 +578,125 @@ msgstr ""
 "Ehhez az <a href=\"http://support.epson.com\">Epson weboldaláról</a> érhetők "
 "el illesztőprogramok."
 
-#. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1602
 msgid "Install drivers"
 msgstr "Illesztőprogramok telepítése"
 
-#. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "A telepítés után újra kell indítania a Simple Scant."
 
-#. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr "Illesztőprogramok telepítése…"
 
-#. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr "Az illesztőprogramok sikeresen telepítve"
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Az illesztőprogramok telepítése meghiúsult (hibakód: %d)."
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr "Az illesztőprogramok telepítése meghiúsult."
 
-#. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1676
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr "Telepíteni kell a következő csomagokat: %s."
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (alapértelmezett)"
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (vázlat)"
 
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (nagy felbontás)"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/ui.vala:1793
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1835
 msgid "New Document"
 msgstr "Új dokumentum"
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1840
 msgid "Document"
 msgstr "Dokumentum"
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1844
 msgid "Email..."
 msgstr "E-mail…"
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1845
 msgid "Print..."
 msgstr "Nyomtatás…"
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1853
 msgid "Help"
 msgstr "Súgó"
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1854
 msgid "About"
 msgstr "Névjegy"
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1855
 msgid "Quit"
 msgstr "Kilépés"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "_Szkennerváltás"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr "_Illesztőprogramok telepítése"
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1897
 msgid "Automatic"
 msgstr "Automatikus"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1947
 msgid "Darker"
 msgstr "Sötétebb"
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1949
 msgid "Lighter"
 msgstr "Világosabb"
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:1957
 msgid "Less"
 msgstr "Kevesebb"
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:1959
 msgid "More"
 msgstr "Több"
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:1967
 msgid "Minimum"
 msgstr "Minimum"
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:1969
 msgid "Maximum"
 msgstr "Maximum"
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2008
 msgid "Saving document..."
 msgstr "Dokumentum mentése..."
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "%d. oldal mentése, összesen %d"
@@ -896,12 +741,21 @@ msgstr "%d. oldal mentése, összesen %d"
 #~ "  --gtk-module=MODULOK            További GTK+ modulok betöltése\n"
 #~ "  --g-fatal-warnings              Minden figyelmeztetés végzetes legyen"
 
+#~ msgid "Device to scan from"
+#~ msgstr "A szkennelő eszkőz"
+
 #~ msgid "Direction of scan"
 #~ msgstr "A szkennelés íránya"
 
+#~ msgid "Type of document being scanned"
+#~ msgstr "A szkennelt dokumentum típusa"
+
 #~ msgid "TRUE if the application window is maximized"
 #~ msgstr "Igaz, ha az alkalmazás teljes képernyős módban van"
 
+#~ msgid "SANE device to acquire images from."
+#~ msgstr "Képek beszerzése erről a SANE eszközről"
+
 #~ msgid ""
 #~ "The direction of the scanner across the scanned page. It can be one of the "
 #~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
@@ -961,6 +815,12 @@ msgstr "%d. oldal mentése, összesen %d"
 #~ msgid "Width of scanned image in pixels"
 #~ msgstr "A szkennelt kép szélessége képpontban"
 
+#~ msgid "Resolution for text scans"
+#~ msgstr "Szövegek szkennelésének felbontása"
+
+#~ msgid "Resolution for photo scans"
+#~ msgstr "Fotók szkennelésének felbontása"
+
 #~ msgid "The resolution in dots-per-inch of the previously scanned image."
 #~ msgstr "Az utoljára beszkennelt kép DPI felbontása."
 
@@ -973,11 +833,75 @@ msgstr "%d. oldal mentése, összesen %d"
 #~ msgid "Select File _Type"
 #~ msgstr "Válasszon fájl_típust"
 
+#~ msgid "The resolution in dots-per-inch to use when scanning text."
+#~ msgstr "Szövegek szkennelésnél használandó  DPI felbontás."
+
+#~ msgid "The resolution in dots-per-inch to use when scanning photos."
+#~ msgstr "Fotók szkennelésnél használandó  DPI felbontás."
+
+#~ msgid "Directory to save files to"
+#~ msgstr "Fájlok mentése ebbe a könyvtárba"
+
+#~ msgid ""
+#~ "The directory to save files to. Defaults to the documents directory if unset."
+#~ msgstr ""
+#~ "A fájlok mentésének helye. Alapértelmezésben a Dokumentumok mappa, ha nincs "
+#~ "beállítva."
+
+#~ msgid "Height of paper in tenths of a mm"
+#~ msgstr "Papír magassága tizedmilliméterben"
+
+#~ msgid "Width of paper in tenths of a mm"
+#~ msgstr "Papír szélessége tizedmilliméterben"
+
 #~ msgid ""
 #~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
 #~ msgstr ""
 #~ "Lapok szkennelendő oldala. A lehetséges értékek: „both” (mindkettő) „front” "
 #~ "(előlap), „back” (hátlap)"
 
+#~ msgid "Page side to scan"
+#~ msgstr "Lapok szkennelendő oldala"
+
+#~ msgid ""
+#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr ""
+#~ "Papír magassága tizedmilliméterben (0 az automatikus papírfelismeréshez)."
+
+#~ msgid ""
+#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr ""
+#~ "Papír szélessége tizedmilliméterben (0 az automatikus papírfelismeréshez)."
+
+#~ msgid "The page side to scan."
+#~ msgstr "A lap szkennelendő oldala."
+
+#~ msgid ""
+#~ "Type of document being scanned. This setting decides on the scan resolution, "
+#~ "colors and post-processing."
+#~ msgstr ""
+#~ "A szkennelt dokumentum típusa. Ez a beállítás meghatározza a beolvasott "
+#~ "oldal felbontását, színeit és utófeldolgozását."
+
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "A szkennelés iránya a szkennelt lap fölött."
+
+#~ msgid "Quality value to use for JPEG compression."
+#~ msgstr "A minőségi tényező megadása a JPEG tömörítéshez."
+
+#~ msgid "Contrast of scan"
+#~ msgstr "A beolvasás kontrasztja"
+
+#~ msgid "Quality value to use for JPEG compression"
+#~ msgstr "A minőségi tényező megadása a JPEG tömörítéshez"
+
+#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
+#~ msgstr "A kontraszt változtatása -100-tól 100-ig (0=nincs)."
+
+#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
+#~ msgstr "A fényerő változtatása -100-tól 100-ig (0=nincs)."
+
+#~ msgid "Brightness of scan"
+#~ msgstr "A beolvasás fényereje"
diff --git a/po/hy.gmo b/po/hy.gmo
new file mode 100644
index 0000000..22b6cc7
--- /dev/null
+++ b/po/hy.gmo
diff --git a/po/hy.po b/po/hy.po
index 42ccdab..55060af 100644
--- a/po/hy.po
+++ b/po/hy.po
@@ -7,399 +7,309 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-06 14:16+1200\n"
+"POT-Creation-Date: 2016-07-29 12:47+1200\n"
 "PO-Revision-Date: 2012-04-17 06:12+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Armenian <hy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-04-14 05:39+0000\n"
-"X-Generator: Launchpad (build 17990)\n"
+"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 
 #. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:2
+#: data/simple-scan.ui:24
 msgid "_Authorize"
 msgstr ""
 
 #. Label beside username entry
-#: ../data/simple-scan.ui.h:4
+#: data/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr ""
 
 #. Label beside password entry
-#: ../data/simple-scan.ui.h:6
+#: data/simple-scan.ui:117
 msgid "_Password:"
 msgstr ""
 
 #. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:8
+#: data/simple-scan.ui:188
 msgid "Front and Back"
 msgstr ""
 
 #. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:10
+#: data/simple-scan.ui:192
 msgid "Front"
 msgstr ""
 
 #. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:12
+#: data/simple-scan.ui:196
 msgid "Back"
 msgstr "Ետ"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
-#: ../data/appdata/simple-scan.appdata.xml.in.h:1
+#: data/simple-scan.ui:225 data/simple-scan.ui:809
+#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr ""
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:16
+#: data/simple-scan.ui:241
 msgid "_Document"
 msgstr ""
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:18
+#: data/simple-scan.ui:260
 msgid "Sc_an"
 msgstr ""
 
+#. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:20
+#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
 msgid "Single _Page"
 msgstr ""
 
+#. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:22
+#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr ""
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:24
+#: data/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:25
+#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
 msgid "Text"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:26
+#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
 msgid "Photo"
 msgstr ""
 
 #. Menu item to reorder pages
-#. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1183 ../src/ui.vala:1841
+#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr ""
 
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: data/simple-scan.ui:367
 msgid "_Email"
 msgstr ""
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: data/simple-scan.ui:430
 msgid "_Page"
 msgstr ""
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: data/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr ""
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: data/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr ""
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: data/simple-scan.ui:460
 msgid "_Crop"
 msgstr ""
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: data/simple-scan.ui:470
 msgid "_None"
 msgstr ""
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: data/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: data/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: data/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: data/simple-scan.ui:514
 msgid "_Letter"
 msgstr ""
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: data/simple-scan.ui:525
 msgid "Le_gal"
 msgstr ""
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: data/simple-scan.ui:536
 msgid "4×6"
 msgstr ""
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: data/simple-scan.ui:547
 msgid "_Custom"
 msgstr ""
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: data/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr ""
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: data/simple-scan.ui:578
 msgid "Move Left"
 msgstr ""
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: data/simple-scan.ui:587
 msgid "Move Right"
 msgstr ""
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: data/simple-scan.ui:624
 msgid "_Help"
 msgstr ""
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: data/simple-scan.ui:632
 msgid "_Contents"
 msgstr ""
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: data/simple-scan.ui:674 data/simple-scan.ui:885
 msgid "Start a new document"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:67
+#: data/simple-scan.ui:675
 msgid "New"
 msgstr ""
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: data/simple-scan.ui:689 data/simple-scan.ui:836
 msgid "Scan a single page from the scanner"
 msgstr ""
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: data/simple-scan.ui:691 data/simple-scan.ui:837
 msgid "Scan"
 msgstr ""
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: data/simple-scan.ui:707 data/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1842
+#: data/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr ""
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: data/simple-scan.ui:724 data/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:77
+#: data/simple-scan.ui:725 data/simple-scan.ui:825
 msgid "Stop"
 msgstr ""
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: data/simple-scan.ui:749 data/simple-scan.ui:936
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr ""
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: data/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr ""
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: data/simple-scan.ui:764 data/simple-scan.ui:914
 msgid "Rotate the page to the right (clockwise)"
 msgstr ""
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: data/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:86
+#: data/simple-scan.ui:779 data/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:87
+#: data/simple-scan.ui:781
 msgid "Crop"
 msgstr ""
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1849
+#: data/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: data/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: data/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: data/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr ""
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: data/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr ""
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: data/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr ""
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: data/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: data/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: data/simple-scan.ui:1260
 msgid "Quality:"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:2
+#: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:3
+#: data/simple-scan.desktop.in:5
 msgid "Scan Documents"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:4
+#: data/simple-scan.desktop.in:6
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Device to scan from"
+#: data/simple-scan.desktop.in:8
+msgid "scanner"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "SANE device to acquire images from."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "Type of document being scanned"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
-msgid ""
-"Type of document being scanned. This setting decides on the scan resolution, "
-"colors and post-processing."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
-msgid "Width of paper in tenths of a mm"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
-msgid "Height of paper in tenths of a mm"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "Brightness of scan"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "The brightness adjustment from -100 to 100 (0 being none)."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid "Contrast of scan"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "The contrast adjustment from -100 to 100 (0 being none)."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid "Resolution for text scans"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
-msgid "The resolution in dots-per-inch to use when scanning text."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
-msgid "Resolution for photo scans"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
-msgid "Page side to scan"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
-msgid "The page side to scan."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
-msgid "Directory to save files to"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
-msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
-msgid "Quality value to use for JPEG compression"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Quality value to use for JPEG compression."
-msgstr ""
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+#: data/simple-scan.appdata.xml.in:8
 msgid ""
 "A really easy way to scan both documents and photos. You can crop out the "
 "bad parts of a photo and rotate it if it is the wrong way round. You can "
@@ -407,196 +317,162 @@ msgid ""
 "formats."
 msgstr ""
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+#: data/simple-scan.appdata.xml.in:13
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr ""
 
-#. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr ""
 
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr ""
 
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1236 src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr ""
 
-#. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr ""
 
-#. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr ""
 
-#: ../src/simple-scan.vala:26
+#: src/simple-scan.vala:26
 msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr ""
 
-#. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:391
+#: src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr ""
 
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:318 src/ui.vala:1602 src/ui.vala:1887
 msgid "_Close"
 msgstr ""
 
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:327
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr ""
 
-#. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:375
 msgid "No scanners detected"
 msgstr ""
 
-#. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:377
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:382
 msgid "Additional software needed"
 msgstr ""
 
-#. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr ""
 
-#. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:506 src/ui.vala:1843
 msgid "Save As..."
 msgstr ""
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:509 src/ui.vala:675
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:510 src/ui.vala:676
 msgid "_Save"
 msgstr ""
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr ""
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:521
 msgid "Image Files"
 msgstr ""
 
-#. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:527
 msgid "All Files"
 msgstr ""
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr ""
 
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr ""
 
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr ""
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:557
 msgid "File format:"
 msgstr ""
 
-#. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:650
 msgid "Failed to save file"
 msgstr ""
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:673
 msgid "If you don't save, changes will be permanently lost."
 msgstr ""
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:708
+#: src/ui.vala:708
 msgid "Save current document?"
 msgstr ""
 
-#. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:710
 msgid "Discard Changes"
 msgstr ""
 
-#. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr ""
 
-#. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr ""
 
-#. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1206
 msgid "Combine sides"
 msgstr ""
 
-#. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr ""
 
-#. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1226
 msgid "Reverse"
 msgstr ""
 
-#. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr ""
 
-#. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr ""
 
-#. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1472
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -612,206 +488,181 @@ msgid ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
 
-#. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr ""
 
-#. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Serj Safarian https://launchpad.net/~safarian"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr ""
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr ""
 
-#. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
-#. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1581
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
 msgstr ""
 
-#. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
-#. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1587
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
 msgstr ""
 
-#. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr ""
 
-#. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
-#. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1598
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
 msgstr ""
 
-#. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1602
 msgid "Install drivers"
 msgstr ""
 
-#. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
-#. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr ""
 
-#. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr ""
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr ""
 
-#. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1676
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr ""
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/ui.vala:1793
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1835
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1840
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1844
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1845
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1853
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1854
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1855
 msgid "Quit"
 msgstr ""
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr ""
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr ""
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1897
 msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1947
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1949
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:1957
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:1959
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:1967
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:1969
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2008
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/id.gmo b/po/id.gmo
new file mode 100644
index 0000000..38c474a
--- /dev/null
+++ b/po/id.gmo
diff --git a/po/id.po b/po/id.po
index e8f2d5b..dbb2dc0 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,603 +7,478 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-06 14:16+1200\n"
+"POT-Creation-Date: 2016-07-29 12:47+1200\n"
 "PO-Revision-Date: 2014-01-18 00:43+0000\n"
 "Last-Translator: Andika Triwidada <andika@gmail.com>\n"
 "Language-Team: Indonesian <id@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-04-14 05:40+0000\n"
-"X-Generator: Launchpad (build 17990)\n"
+"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 
 #. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:2
+#: data/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "Otoris_asikan"
 
 #. Label beside username entry
-#: ../data/simple-scan.ui.h:4
+#: data/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "Nama pengg_una untuk sumber daya:"
 
 #. Label beside password entry
-#: ../data/simple-scan.ui.h:6
+#: data/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Sandi:"
 
 #. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:8
+#: data/simple-scan.ui:188
 msgid "Front and Back"
 msgstr "Depan dan Belakang"
 
 #. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:10
+#: data/simple-scan.ui:192
 msgid "Front"
 msgstr "Depan"
 
 #. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:12
+#: data/simple-scan.ui:196
 msgid "Back"
 msgstr "Belakang"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
-#: ../data/appdata/simple-scan.appdata.xml.in.h:1
+#: data/simple-scan.ui:225 data/simple-scan.ui:809
+#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr "Pemindai Ringkas"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:16
+#: data/simple-scan.ui:241
 msgid "_Document"
 msgstr "_Dokumen"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:18
+#: data/simple-scan.ui:260
 msgid "Sc_an"
 msgstr "Pind_ai"
 
+#. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:20
+#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
 msgid "Single _Page"
 msgstr "Satu _Halaman"
 
+#. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:22
+#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr "Semua Halaman Dari _Feeder"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:24
+#: data/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "Berhenti _Memindai"
 
-#: ../data/simple-scan.ui.h:25
+#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
 msgid "Text"
 msgstr "Teks"
 
-#: ../data/simple-scan.ui.h:26
+#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
 msgid "Photo"
 msgstr "Foto"
 
 #. Menu item to reorder pages
-#. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1183 ../src/ui.vala:1841
+#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr "Atur Ulang Halaman"
 
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: data/simple-scan.ui:367
 msgid "_Email"
 msgstr "Sur_el"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: data/simple-scan.ui:430
 msgid "_Page"
 msgstr "_Halaman"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: data/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr ""
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: data/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr ""
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: data/simple-scan.ui:460
 msgid "_Crop"
 msgstr ""
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: data/simple-scan.ui:470
 msgid "_None"
 msgstr "_Nihil"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: data/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: data/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: data/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: data/simple-scan.ui:514
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: data/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: data/simple-scan.ui:536
 msgid "4×6"
 msgstr "4x6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: data/simple-scan.ui:547
 msgid "_Custom"
 msgstr "_Ubahan"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: data/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr "Puta_r dan Potong"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: data/simple-scan.ui:578
 msgid "Move Left"
 msgstr "Pindah Ke Kiri"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: data/simple-scan.ui:587
 msgid "Move Right"
 msgstr "Pindah Ke Kanan"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: data/simple-scan.ui:624
 msgid "_Help"
 msgstr ""
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: data/simple-scan.ui:632
 msgid "_Contents"
 msgstr "_Isi"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: data/simple-scan.ui:674 data/simple-scan.ui:885
 msgid "Start a new document"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:67
+#: data/simple-scan.ui:675
 msgid "New"
 msgstr ""
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: data/simple-scan.ui:689 data/simple-scan.ui:836
 msgid "Scan a single page from the scanner"
 msgstr ""
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: data/simple-scan.ui:691 data/simple-scan.ui:837
 msgid "Scan"
 msgstr "Pindai"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: data/simple-scan.ui:707 data/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1842
+#: data/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr ""
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: data/simple-scan.ui:724 data/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:77
+#: data/simple-scan.ui:725 data/simple-scan.ui:825
 msgid "Stop"
 msgstr ""
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: data/simple-scan.ui:749 data/simple-scan.ui:936
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Putar halaman ke kiri (berlawanan arah jarum jam)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: data/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr ""
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: data/simple-scan.ui:764 data/simple-scan.ui:914
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Putar halaman ke kanan (searah jarum jam)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: data/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:86
+#: data/simple-scan.ui:779 data/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:87
+#: data/simple-scan.ui:781
 msgid "Crop"
 msgstr ""
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1849
+#: data/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "Preferensi"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: data/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "_Sumber Pindai:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: data/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "Resolusi _Teks:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: data/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "Resolusi _Foto:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: data/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr ""
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: data/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr ""
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: data/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "Kecerahan:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: data/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "Kontras:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: data/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "Kualitas:"
 
-#: ../data/simple-scan.desktop.in.h:2
+#: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr "Pelarik Dokumen"
 
-#: ../data/simple-scan.desktop.in.h:3
+#: data/simple-scan.desktop.in:5
 msgid "Scan Documents"
 msgstr "Pindai Dokumen"
 
-#: ../data/simple-scan.desktop.in.h:4
+#: data/simple-scan.desktop.in:6
 msgid "scan;scanner;flatbed;adf;"
 msgstr "scan;scanner;pelarik;pemindai;flatbed;adf;"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Device to scan from"
-msgstr "Perangkat untuk memindai"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "SANE device to acquire images from."
-msgstr "Perangkat SANE yang dipakai untuk mengambil gambar."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "Type of document being scanned"
-msgstr "Tipe dokumen yang akan dipindai"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
-msgid ""
-"Type of document being scanned. This setting decides on the scan resolution, "
-"colors and post-processing."
-msgstr ""
-"Tipe dokumen yang akan dipindai. Pengaturan ini menentukan resolusi, warna, "
-"dan pasca-proses pemindaian."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
-msgid "Width of paper in tenths of a mm"
-msgstr "Lebar kertas dalam persepuluhan milimeter"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
+#: data/simple-scan.desktop.in:8
+msgid "scanner"
 msgstr ""
-"Lebar kertas dalam persepuluhan mm (atau 0 untuk deteksi kertas otomatis)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
-msgid "Height of paper in tenths of a mm"
-msgstr "Panjang kertas dalam persepuluh mm"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-"Panjang kertas dalam sepersepuluh mm (atau 0 jika kertas dideteksi otomatis)"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "Brightness of scan"
-msgstr "Kecerahan pemindaian"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "The brightness adjustment from -100 to 100 (0 being none)."
-msgstr "Penyesuaian kecerahan dari -100 ke 100 (0 berarti nihil)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid "Contrast of scan"
-msgstr "Kontras pemindaian"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "The contrast adjustment from -100 to 100 (0 being none)."
-msgstr "Penyesuaian kontras dari -100 ke 100 (0 berarti nihil)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid "Resolution for text scans"
-msgstr "Resolusi untuk pemindaian teks"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
-msgid "The resolution in dots-per-inch to use when scanning text."
-msgstr "Resolusi dalam dots-per-inch yang digunakan dalam pemindaian teks."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
-msgid "Resolution for photo scans"
-msgstr "Resolusi untuk pemindaian foto"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr "Resolusi dalam dots-per-inch yang digunakan dalam pemindaian foto."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
-msgid "Page side to scan"
-msgstr "Sisi halaman yang dipindai"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
-msgid "The page side to scan."
-msgstr "Sisi halaman yang dipindai."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
-msgid "Directory to save files to"
-msgstr "Simpan berkas ke direktori"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
-msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
-msgstr ""
-"Direktori tempat menyimpan berkas. Akan disimpan ke direktori dokumen jika "
-"belum diset."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
-msgid "Quality value to use for JPEG compression"
-msgstr "Nilai kualitas yang akan dipakai untuk kompresi JPEG"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Quality value to use for JPEG compression."
-msgstr "Nilai kualitas yang akan dipakai untuk kompresi JPEG."
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+#: data/simple-scan.appdata.xml.in:8
 msgid ""
 "A really easy way to scan both documents and photos. You can crop out the "
 "bad parts of a photo and rotate it if it is the wrong way round. You can "
 "print your scans, export them to pdf, or save them in a range of image "
 "formats."
 msgstr ""
+"Cara mudah untuk memindai dokumen dan foto. Anda dapat membuang bagian yang "
+"jelek dari suatu foto dan memutarnya bila itu terbalik. Anda dapat mencetak "
+"pindaian Anda, mengekspor ke pdf, atau menyimpan ke sejumlah format berkas."
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+#: data/simple-scan.appdata.xml.in:13
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
+"Simple Scan memakai framework SANE untuk mendukung kebanyakan pemindai yang "
+"ada."
 
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Tidak ada pemindai yang tersedia. Mohon hubungkan pemindai."
 
-#. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "Tak dapat terhubung ke pemindai"
 
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "Tak dapat memulai pemindaian"
 
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1236 src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr "Galat saat berhubungan dengan pemindai"
 
-#. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "Tampilkan versi rilis"
 
-#. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr "Cetak pesan pengawakutuan"
 
-#: ../src/simple-scan.vala:26
+#: src/simple-scan.vala:26
 msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr "Perbaiki berkas PDF yang dibuat dengan Simple Scan versi lawas"
 
-#. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:391
+#: src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Gagal memindai"
 
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[PERANGKAT...] - Utilitas pemindaian"
 
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr "Jalankan '%s --help' untuk daftar lengkap opsi yang tersedia."
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:318 src/ui.vala:1602 src/ui.vala:1887
 msgid "_Close"
 msgstr "_Tutup"
 
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:327
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Nama pengguna dan kata sandi dibutuhkan untuk mengakses '%s'"
 
-#. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:375
 msgid "No scanners detected"
 msgstr "Tidak ada pemindai yang terdeteksi"
 
-#. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:377
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 "Mohon periksa apakah pemindai Anda terhubung dan dalam keadaan menyala"
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:382
 msgid "Additional software needed"
-msgstr ""
+msgstr "Perlu perangkat lunak tambahan"
 
-#. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:384
 msgid "You need to install driver software for your scanner."
-msgstr ""
+msgstr "Anda perlu memasang perangkat lunak penggerak bagi pemindai Anda."
 
-#. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:506 src/ui.vala:1843
 msgid "Save As..."
 msgstr "Simpan Sebagai..."
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:509 src/ui.vala:675
 msgid "_Cancel"
 msgstr "_Batal"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:510 src/ui.vala:676
 msgid "_Save"
 msgstr "_Simpan"
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "Dokumen Hasil Pindai.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:521
 msgid "Image Files"
 msgstr "Berkas Citra"
 
-#. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:527
 msgid "All Files"
 msgstr "Semua Berkas"
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (dokumen multi-halaman)"
 
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (terkompresi)"
 
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (lossless)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:557
 msgid "File format:"
-msgstr ""
+msgstr "Format berkas:"
 
-#. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:650
 msgid "Failed to save file"
 msgstr "Gagal menyimpan berkas"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:673
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Jika Anda tidak menyimpan, perubahan akan hilang secara permanen."
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:708
+#: src/ui.vala:708
 msgid "Save current document?"
 msgstr "Simpan dokumen saat ini?"
 
-#. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:710
 msgid "Discard Changes"
 msgstr "Buang Perubahan"
 
-#. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "Tak dapat menyimpan gambar untuk pratinjau"
 
-#. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "Tidak dapat membuka aplikasi pratinjau gambar"
 
-#. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1206
 msgid "Combine sides"
 msgstr "Kombinasikan sisi-sisi"
 
-#. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr "Kombinasikan sisi-sisi (balik)"
 
-#. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1226
 msgid "Reverse"
 msgstr "Balikkan"
 
-#. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr "Biarkan tak berubah"
 
-#. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "Tak dapat membuka berkas bantuan"
 
-#. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1472
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -630,17 +505,15 @@ msgstr ""
 "Anda seharusnya mendapat salinan GNU General Public License\n"
 "bersama program ini. Bila tidak, lihat <http://www.gnu.org/licenses/>."
 
-#. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "Tentang Simple Scan"
 
-#. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "Alat pemindai dokumen sederhana"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -648,7 +521,6 @@ msgstr ""
 "  Andika Triwidada https://launchpad.net/~andika\n"
 "  Arief Setiadi Wibowo https://launchpad.net/~q-thrynx\n"
 "  Budi Prasetyo https://launchpad.net/~bprast1\n"
-"  Hace https://launchpad.net/~hardikris\n"
 "  La Ode Adam Saputra https://launchpad.net/~laode-saputra\n"
 "  Launchpad Translations Administrators https://launchpad.net/~rosetta\n"
 "  Putu Wiramaswara Widya https://launchpad.net/~wiramaswara\n"
@@ -657,221 +529,239 @@ msgstr ""
 "  Viktor Aditya https://launchpad.net/~victoraditya91\n"
 "  Waluyo Adi Siswanto https://launchpad.net/~was-wlk\n"
 "  idham khaidir https://launchpad.net/~kenzoabeta\n"
-"  imsoft https://launchpad.net/~khoirul-im\n"
 "  jemmy surya https://launchpad.net/~jemmy"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "Simpan dokumen sebelum keluar"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "Keluar tanpa menyimpan"
 
-#. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
-msgstr ""
+msgstr "Nampaknya Anda punya pemindai Brother."
 
-#. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1581
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
 msgstr ""
+"Penggerak bagi ini tersedia di <a href=\"http://support.brother.com\">situs "
+"web Brother</a>."
 
-#. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
-msgstr ""
+msgstr "Nampaknya Anda punya pemindai Samsung."
 
-#. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1587
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
 msgstr ""
+"Penggerak bagi ini tersedia di <a href=\"http://samsung.com/support\">situs "
+"web Samsung</a>."
 
-#. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1591
 msgid "You appear to have an HP scanner."
-msgstr ""
+msgstr "Nampaknya Anda punya pemindai HP."
 
-#. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
-msgstr ""
+msgstr "Nampaknya Anda punya pemindai Epson."
 
-#. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1598
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
 msgstr ""
+"Penggerak bagi ini tersedia di <a href=\"http://support.epson.com\">situs "
+"web Epson</a>."
 
-#. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1602
 msgid "Install drivers"
-msgstr ""
+msgstr "Pasang penggerak"
 
-#. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
-msgstr ""
+msgstr "Sekali terpasang Anda perlu memulai ulang Simple Scan."
 
-#. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1645
 msgid "Installing drivers..."
-msgstr ""
+msgstr "Memasang penggerak..."
 
-#. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1653
 msgid "Drivers installed successfully!"
-msgstr ""
+msgstr "Penggerak sukses terpasang!"
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
-msgstr ""
+msgstr "Gagal memasang penggerak (kode kesalahan %d)."
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1669
 msgid "Failed to install drivers."
-msgstr ""
+msgstr "Gagal memasang penggerak."
 
-#. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1676
 #, c-format
 msgid "You need to install the %s package(s)."
-msgstr ""
+msgstr "Anda perlu memasang paket %s."
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (default)"
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (draft)"
 
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (resolusi tinggi)"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/ui.vala:1793
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1835
 msgid "New Document"
 msgstr "Dokumen Baru"
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1840
 msgid "Document"
 msgstr "Dokumen"
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1844
 msgid "Email..."
 msgstr "Surel..."
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1845
 msgid "Print..."
 msgstr "Cetak..."
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1853
 msgid "Help"
 msgstr "Bantuan"
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1854
 msgid "About"
 msgstr "Perihal"
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1855
 msgid "Quit"
 msgstr "Keluar"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "Ganti _Pemindai"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1891
 msgid "_Install Drivers"
-msgstr ""
+msgstr "_Pasang Penggerak"
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1897
 msgid "Automatic"
 msgstr "Otomatis"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1947
 msgid "Darker"
 msgstr "Lebih Gelap"
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1949
 msgid "Lighter"
 msgstr "Lebih Terang"
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:1957
 msgid "Less"
 msgstr "Kurang"
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:1959
 msgid "More"
 msgstr "Lebih"
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:1967
 msgid "Minimum"
 msgstr "Minimum"
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:1969
 msgid "Maximum"
 msgstr "Maksimum"
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2008
 msgid "Saving document..."
 msgstr "Menyimpan dokumen..."
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Menyimpan halaman %d dari %d"
 
+#~ msgid "Resolution for photo scans"
+#~ msgstr "Resolusi untuk pemindaian foto"
+
+#~ msgid "Resolution for text scans"
+#~ msgstr "Resolusi untuk pemindaian teks"
+
 #~ msgid "Files missing"
 #~ msgstr "Berkas hilang"
 
+#~ msgid "Page side to scan"
+#~ msgstr "Sisi halaman yang dipindai"
+
+#~ msgid "Height of paper in tenths of a mm"
+#~ msgstr "Panjang kertas dalam persepuluh mm"
+
 #~ msgid "Resolution of last scanned image"
 #~ msgstr "Resolusi pemindaian terakhir"
 
+#~ msgid "Directory to save files to"
+#~ msgstr "Simpan berkas ke direktori"
+
 #~ msgid "Direction of scan"
 #~ msgstr "Arah pemindaian"
 
+#~ msgid "The page side to scan."
+#~ msgstr "Sisi halaman yang dipindai."
+
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "Arah pemindaian terhadap halaman yang dipindai."
 
+#~ msgid ""
+#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr ""
+#~ "Panjang kertas dalam sepersepuluh mm (atau 0 jika kertas dideteksi otomatis)"
+
 #~ msgid "TRUE if the application window is maximized"
 #~ msgstr "TRUE jika jendela aplikasi dimaksimalkan"
 
 #~ msgid "The resolution in dots-per-inch of the previously scanned image."
 #~ msgstr "Resolusi dalam dots-per-inch dari gambar sebelumnya."
 
+#~ msgid ""
+#~ "The directory to save files to. Defaults to the documents directory if unset."
+#~ msgstr ""
+#~ "Direktori tempat menyimpan berkas. Akan disimpan ke direktori dokumen jika "
+#~ "belum diset."
+
+#~ msgid "Type of document being scanned"
+#~ msgstr "Tipe dokumen yang akan dipindai"
+
 #~ msgid "Window height in pixels"
 #~ msgstr "Tinggi jendela dalam piksel"
 
 #~ msgid "Window width in pixels"
 #~ msgstr "Lebar jendela dalam piksel"
 
+#~ msgid "Device to scan from"
+#~ msgstr "Perangkat untuk memindai"
+
 #~ msgid "Height of scanned image in pixels"
 #~ msgstr "Tinggi gambar terpindai dalam piksel"
 
@@ -892,11 +782,54 @@ msgstr "Menyimpan halaman %d dari %d"
 #~ msgid "Width of scanned image in pixels"
 #~ msgstr "Lebar gambar terpindai dalam piksel"
 
+#~ msgid "The resolution in dots-per-inch to use when scanning text."
+#~ msgstr "Resolusi dalam dots-per-inch yang digunakan dalam pemindaian teks."
+
 #~ msgid "Scanned Document"
 #~ msgstr "Dokumen Terpindai"
 
 #~ msgid "Select File _Type"
 #~ msgstr "Pilih _Tipe Berkas"
 
+#~ msgid ""
+#~ "Type of document being scanned. This setting decides on the scan resolution, "
+#~ "colors and post-processing."
+#~ msgstr ""
+#~ "Tipe dokumen yang akan dipindai. Pengaturan ini menentukan resolusi, warna, "
+#~ "dan pasca-proses pemindaian."
+
+#~ msgid "SANE device to acquire images from."
+#~ msgstr "Perangkat SANE yang dipakai untuk mengambil gambar."
+
+#~ msgid "Width of paper in tenths of a mm"
+#~ msgstr "Lebar kertas dalam persepuluhan milimeter"
+
+#~ msgid ""
+#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr ""
+#~ "Lebar kertas dalam persepuluhan mm (atau 0 untuk deteksi kertas otomatis)."
+
+#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
+#~ msgstr "Penyesuaian kontras dari -100 ke 100 (0 berarti nihil)."
+
+#~ msgid "Contrast of scan"
+#~ msgstr "Kontras pemindaian"
+
+#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
+#~ msgstr "Penyesuaian kecerahan dari -100 ke 100 (0 berarti nihil)."
+
+#~ msgid "Brightness of scan"
+#~ msgstr "Kecerahan pemindaian"
+
+#~ msgid "Quality value to use for JPEG compression."
+#~ msgstr "Nilai kualitas yang akan dipakai untuk kompresi JPEG."
+
+#~ msgid "Quality value to use for JPEG compression"
+#~ msgstr "Nilai kualitas yang akan dipakai untuk kompresi JPEG"
+
+#~ msgid "The resolution in dots-per-inch to use when scanning photos."
+#~ msgstr "Resolusi dalam dots-per-inch yang digunakan dalam pemindaian foto."
+
 #~ msgid "Please check your installation"
 #~ msgstr "Mohon periksa instalasi Anda"
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..5238fe4
--- /dev/null
+++ b/po/it.gmo
diff --git a/po/it.po b/po/it.po
index 601be66..1756b63 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,409 +7,309 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-06 14:16+1200\n"
+"POT-Creation-Date: 2016-07-29 12:47+1200\n"
 "PO-Revision-Date: 2012-08-22 07:09+0000\n"
 "Last-Translator: Leonardo Corato <leocor@gmail.com>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-04-14 05:40+0000\n"
-"X-Generator: Launchpad (build 17990)\n"
+"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 
 #. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:2
+#: data/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_Autorizza"
 
 #. Label beside username entry
-#: ../data/simple-scan.ui.h:4
+#: data/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "_Nome utente per la risorsa:"
 
 #. Label beside password entry
-#: ../data/simple-scan.ui.h:6
+#: data/simple-scan.ui:117
 msgid "_Password:"
 msgstr "Pass_word:"
 
 #. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:8
+#: data/simple-scan.ui:188
 msgid "Front and Back"
 msgstr "Fronte e retro"
 
 #. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:10
+#: data/simple-scan.ui:192
 msgid "Front"
 msgstr "Fronte"
 
 #. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:12
+#: data/simple-scan.ui:196
 msgid "Back"
 msgstr "Retro"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
-#: ../data/appdata/simple-scan.appdata.xml.in.h:1
+#: data/simple-scan.ui:225 data/simple-scan.ui:809
+#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr "Simple Scan"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:16
+#: data/simple-scan.ui:241
 msgid "_Document"
 msgstr "_Documento"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:18
+#: data/simple-scan.ui:260
 msgid "Sc_an"
 msgstr "_Acquisisci"
 
+#. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:20
+#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
 msgid "Single _Page"
 msgstr "_Pagina singola"
 
+#. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:22
+#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr "_Tutte le pagine dal caricatore"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:24
+#: data/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "Ferma l'acqui_sizione"
 
-#: ../data/simple-scan.ui.h:25
+#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
 msgid "Text"
 msgstr "Testo"
 
-#: ../data/simple-scan.ui.h:26
+#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
 msgid "Photo"
 msgstr "Foto"
 
 #. Menu item to reorder pages
-#. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1183 ../src/ui.vala:1841
+#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr "Riordina pagine"
 
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: data/simple-scan.ui:367
 msgid "_Email"
 msgstr "_Email"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: data/simple-scan.ui:430
 msgid "_Page"
 msgstr "_Pagina"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: data/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "Ruota a _sinistra"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: data/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "Ruota a _destra"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: data/simple-scan.ui:460
 msgid "_Crop"
 msgstr "_Ritaglio"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: data/simple-scan.ui:470
 msgid "_None"
 msgstr "_Nessuno"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: data/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: data/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: data/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: data/simple-scan.ui:514
 msgid "_Letter"
 msgstr "US _Letter"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: data/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: data/simple-scan.ui:536
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: data/simple-scan.ui:547
 msgid "_Custom"
 msgstr "_Personalizzato"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: data/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr "_Ruota ritaglio"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: data/simple-scan.ui:578
 msgid "Move Left"
 msgstr "Sposta a sinistra"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: data/simple-scan.ui:587
 msgid "Move Right"
 msgstr "Sposta a destra"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: data/simple-scan.ui:624
 msgid "_Help"
 msgstr "A_iuto"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: data/simple-scan.ui:632
 msgid "_Contents"
 msgstr "_Sommario"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: data/simple-scan.ui:674 data/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "Crea un nuovo documento"
 
-#: ../data/simple-scan.ui.h:67
+#: data/simple-scan.ui:675
 msgid "New"
 msgstr "Nuovo"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: data/simple-scan.ui:689 data/simple-scan.ui:836
 msgid "Scan a single page from the scanner"
 msgstr "Acquisisce una pagina singola dallo scanner"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: data/simple-scan.ui:691 data/simple-scan.ui:837
 msgid "Scan"
 msgstr "Acquisisci"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: data/simple-scan.ui:707 data/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "Salva documento in un file"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1842
+#: data/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "Salva"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: data/simple-scan.ui:724 data/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "Interrompe l'acquisizione in corso"
 
-#: ../data/simple-scan.ui.h:77
+#: data/simple-scan.ui:725 data/simple-scan.ui:825
 msgid "Stop"
 msgstr "Ferma"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: data/simple-scan.ui:749 data/simple-scan.ui:936
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Ruota la pagina a sinistra (senso antiorario)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: data/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "Ruota a sinistra"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: data/simple-scan.ui:764 data/simple-scan.ui:914
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Ruota la pagina a destra (senso orario)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: data/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "Ruota a destra"
 
-#: ../data/simple-scan.ui.h:86
+#: data/simple-scan.ui:779 data/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "Ritaglia la pagina selezionata"
 
-#: ../data/simple-scan.ui.h:87
+#: data/simple-scan.ui:781
 msgid "Crop"
 msgstr "Ritaglia"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1849
+#: data/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "Preferenze"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: data/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "S_orgente di acquisizione:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: data/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "Risoluzione _testo:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: data/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "_Risoluzione foto:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: data/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "Lato acquisizione:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: data/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "Dimensione pagina:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: data/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "Luminosità:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: data/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "Contrasto:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: data/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "Qualità:"
 
-#: ../data/simple-scan.desktop.in.h:2
+#: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr "Scansiona documenti"
 
-#: ../data/simple-scan.desktop.in.h:3
+#: data/simple-scan.desktop.in:5
 msgid "Scan Documents"
 msgstr "Acquisisci documenti"
 
-#: ../data/simple-scan.desktop.in.h:4
+#: data/simple-scan.desktop.in:6
 msgid "scan;scanner;flatbed;adf;"
 msgstr "scan;scanner;scansiona;adf;"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Device to scan from"
-msgstr "Dispositivo di acquisizione"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "SANE device to acquire images from."
-msgstr "Dispositivo SANE da cui acquisire le immagini."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "Type of document being scanned"
-msgstr "Tipo del documento da acquisire"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
-msgid ""
-"Type of document being scanned. This setting decides on the scan resolution, "
-"colors and post-processing."
-msgstr ""
-"Tipo del documento da acquisire. Questa impostazione influenza la "
-"risoluzione, il numero dei colori e l'elaborazione successiva "
-"all'acquisizione."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
-msgid "Width of paper in tenths of a mm"
-msgstr "Larghezza del foglio in decimi di mm"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-"L'altezza del foglio in decimi di mm  (0 per il rilevamento automatico)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
-msgid "Height of paper in tenths of a mm"
-msgstr "Altezza del foglio in decimi di mm"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-"Altezza del foglio in decimi di mm (0 per il rilevamento automatico)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "Brightness of scan"
-msgstr "Luminosità dell'acquisizione"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "The brightness adjustment from -100 to 100 (0 being none)."
-msgstr ""
-"La regolazione della luminosità da -100 a 100 (0 per alcuna luminosità)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid "Contrast of scan"
-msgstr "Contrasto dell'acquisizione"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "The contrast adjustment from -100 to 100 (0 being none)."
-msgstr "La regolazione del contrasto da -100 a 100 (0 per alcun contrasto)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid "Resolution for text scans"
-msgstr "Risoluzione per acquisizione testo"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
-msgid "The resolution in dots-per-inch to use when scanning text."
-msgstr ""
-"La risoluzione in punti per pollice da usare per l'acquisizione di testi."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
-msgid "Resolution for photo scans"
-msgstr "Risoluzione per acquisizione foto"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr ""
-"La risoluzione in punti per pollice da usare per l'acquisizione di foto."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
-msgid "Page side to scan"
-msgstr "Lato della pagina da acquisire"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
-msgid "The page side to scan."
-msgstr "Lato della pagina da acquisire."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
-msgid "Directory to save files to"
-msgstr "Directory dove salvare i file"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
-msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
+#: data/simple-scan.desktop.in:8
+msgid "scanner"
 msgstr ""
-"La directory dove salvare i file. Il valore predefinito è la directory dei "
-"documenti."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
-msgid "Quality value to use for JPEG compression"
-msgstr "Indica il valore della qualità per la compressione JPEG"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Quality value to use for JPEG compression."
-msgstr "Indica il valore della qualità per la compressione JPEG"
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+#: data/simple-scan.appdata.xml.in:8
 msgid ""
 "A really easy way to scan both documents and photos. You can crop out the "
 "bad parts of a photo and rotate it if it is the wrong way round. You can "
@@ -421,201 +321,167 @@ msgstr ""
 "sbagliato. È anche possibile stampare i file acquisiti esportarli in formato "
 "PDF o salvarli in vari formati di immagine."
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+#: data/simple-scan.appdata.xml.in:13
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 "Simple Scan usa il framework SANE per supportare il maggior numero di "
 "scanner esistenti."
 
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Nessuno scanner disponibile. Collegare uno scanner."
 
-#. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "Impossibile connettersi allo scanner"
 
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "Impossibile avviare l'acquisizione"
 
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1236 src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr "Errore di comunicazione con lo scanner"
 
-#. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "Mostra la versione del rilascio"
 
-#. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr "Stampa i messaggi di debug"
 
-#: ../src/simple-scan.vala:26
+#: src/simple-scan.vala:26
 msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr "Corregge file PDF generati con una vecchia versione di Simple Scan"
 
-#. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:391
+#: src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Acquisizione non riuscita"
 
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DISPOSITIVO...] - Strumento per l'acquisizione"
 
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Eseguire \"%s --help\" per l'elenco completo delle opzioni disponibili a "
 "riga di comando."
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:318 src/ui.vala:1602 src/ui.vala:1887
 msgid "_Close"
 msgstr "_Chiudi"
 
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:327
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Sono richiesti nome utente e password per accedere a «%s»"
 
-#. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:375
 msgid "No scanners detected"
 msgstr "Nessuno scanner rilevato"
 
-#. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:377
 msgid "Please check your scanner is connected and powered on"
 msgstr "Controllare che lo scanner sia collegato e acceso"
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:382
 msgid "Additional software needed"
 msgstr "Software aggiuntivo necessario"
 
-#. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr "È necessario installare i driver dello scanner."
 
-#. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:506 src/ui.vala:1843
 msgid "Save As..."
 msgstr "Salva come..."
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:509 src/ui.vala:675
 msgid "_Cancel"
 msgstr "A_nnulla"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:510 src/ui.vala:676
 msgid "_Save"
 msgstr "_Salva"
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "Documento-acquisito.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:521
 msgid "Image Files"
 msgstr "File immagine"
 
-#. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:527
 msgid "All Files"
 msgstr "Tutti i file"
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (documento multi-pagina)"
 
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (compresso)"
 
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (senza perdita di qualità)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:557
 msgid "File format:"
 msgstr "Formato file:"
 
-#. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:650
 msgid "Failed to save file"
 msgstr "Salvataggio file non riuscito"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:673
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Se non si salva le modifiche andranno perse per sempre."
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:708
+#: src/ui.vala:708
 msgid "Save current document?"
 msgstr "Salvare il documento corrente?"
 
-#. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:710
 msgid "Discard Changes"
 msgstr "Scarta le modifiche"
 
-#. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "Impossibile salvare l'immagine per l'anteprima"
 
-#. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr ""
 "Impossibile aprire l'applicazione per la visualizzazione delle anteprime"
 
-#. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1206
 msgid "Combine sides"
 msgstr "Unisci lati"
 
-#. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr "Unisci lati (inverso)"
 
-#. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1226
 msgid "Reverse"
 msgstr "Inverso"
 
-#. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr "Mantieni non modificato"
 
-#. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "Impossibile aprire il file di aiuto"
 
-#. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1472
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -645,17 +511,15 @@ msgstr ""
 "la licenza in Inglese con validità legale consultate "
 "<http://www.gnu.org/licenses/>."
 
-#. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "Informazioni su Simple Scan"
 
-#. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "Semplice strumento per l'acquisizione di documenti"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -665,8 +529,8 @@ msgstr ""
 "  DM74S https://launchpad.net/~danielsan474\n"
 "  Daniele Napolitano https://launchpad.net/~dnax88\n"
 "  Daniele Sapino https://launchpad.net/~daniele-sapino\n"
+"  Federico https://launchpad.net/~federico+\n"
 "  Federico Foschini https://launchpad.net/~undicizeri\n"
-"  Federico Pontelli https://launchpad.net/~fpontelli\n"
 "  Giasone https://launchpad.net/~giasone\n"
 "  Giovanni Mottola https://launchpad.net/~trottola-deactivatedaccount\n"
 "  Leonardo Corato https://launchpad.net/~leocor\n"
@@ -681,23 +545,19 @@ msgstr ""
 "  matrobriva https://launchpad.net/~matrobriva\n"
 "  phede92 https://launchpad.net/~phede92"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "Salvare il documento prima di uscire?"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "Esci senza salvare"
 
-#. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr "Sembra essere uno scanner «Brother»."
 
-#. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1581
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
@@ -705,13 +565,11 @@ msgstr ""
 "I driver per questo dispositivo sono disponibili sul <a "
 "href=\"http://support.brother.com\">sito web Brother</a>."
 
-#. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr "Sembra essere uno scanner «Samsung»."
 
-#. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1587
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
@@ -719,18 +577,15 @@ msgstr ""
 "I driver per questo dispositivo sono disponibili sul <a "
 "href=\"http://samsung.com/support\">sito web Samsung</a>."
 
-#. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr "Sembra essere uno scanner «HP»."
 
-#. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr "Sembra essere uno scanner «Epson»."
 
-#. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1598
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
@@ -738,140 +593,126 @@ msgstr ""
 "I driver sono disponibili dal <a href=\"http://support.epson.com\">sito web "
 "Epson</a>."
 
-#. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1602
 msgid "Install drivers"
 msgstr "Installazione dei driver"
 
-#. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 "Una volta completata l'installazione sarà necessario riavviare Simple Scan."
 
-#. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr "Installazione dei driver..."
 
-#. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr "Driver installati con successo."
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Installazione dei driver non riuscita (codice errore %d)."
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr "Installazione driver non riuscita."
 
-#. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1676
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr "È necessario installare i seguenti pacchetti: %s."
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (predefinita)"
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (bozza)"
 
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (alta risoluzione)"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/ui.vala:1793
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1835
 msgid "New Document"
 msgstr "Nuovo documento"
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1840
 msgid "Document"
 msgstr "Documento"
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1844
 msgid "Email..."
 msgstr "Email..."
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1845
 msgid "Print..."
 msgstr "Stampa..."
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1853
 msgid "Help"
 msgstr "Aiuto"
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1854
 msgid "About"
 msgstr "Informazioni"
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1855
 msgid "Quit"
 msgstr "Esci"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "Cambia _scanner"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr "_Installa driver"
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1897
 msgid "Automatic"
 msgstr "Automatico"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1947
 msgid "Darker"
 msgstr "Più scura"
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1949
 msgid "Lighter"
 msgstr "Più chiara"
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:1957
 msgid "Less"
 msgstr "Minore"
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:1959
 msgid "More"
 msgstr "Maggiore"
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:1967
 msgid "Minimum"
 msgstr "Minima"
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:1969
 msgid "Maximum"
 msgstr "Massima"
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2008
 msgid "Saving document..."
 msgstr "Salvataggio del documento..."
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Salvataggio pagina %d di %d"
@@ -903,6 +744,15 @@ msgstr "Salvataggio pagina %d di %d"
 #~ msgid "Select File _Type"
 #~ msgstr "Seziona il _tipo di file"
 
+#~ msgid "Resolution for text scans"
+#~ msgstr "Risoluzione per acquisizione testo"
+
+#~ msgid "Resolution for photo scans"
+#~ msgstr "Risoluzione per acquisizione foto"
+
+#~ msgid "Type of document being scanned"
+#~ msgstr "Tipo del documento da acquisire"
+
 #~ msgid ""
 #~ "The width of scanned image in pixels. This value is updated to what the last "
 #~ "scanned page was."
@@ -921,9 +771,22 @@ msgstr "Salvataggio pagina %d di %d"
 #~ msgstr ""
 #~ "La risoluzione in punti per pollice del documento precedentemente acquisito."
 
+#~ msgid "The resolution in dots-per-inch to use when scanning text."
+#~ msgstr ""
+#~ "La risoluzione in punti per pollice da usare per l'acquisizione di testi."
+
 #~ msgid "Scanned Document"
 #~ msgstr "Documento acquisito"
 
+#~ msgid "Directory to save files to"
+#~ msgstr "Directory dove salvare i file"
+
+#~ msgid "Device to scan from"
+#~ msgstr "Dispositivo di acquisizione"
+
+#~ msgid "SANE device to acquire images from."
+#~ msgstr "Dispositivo SANE da cui acquisire le immagini."
+
 #~ msgid "TRUE if the application window is maximized"
 #~ msgstr "VERO se la finestra dell'applicazione è massimizzata"
 
@@ -935,6 +798,10 @@ msgstr "Salvataggio pagina %d di %d"
 #~ "bottom\" (dall'alto in basso), \"bottom-to-top\" (dal basso in alto), \"left-"
 #~ "to-right\" (da sinistra a destra), \"right-to-left\" (da destra a sinistra)"
 
+#~ msgid "The resolution in dots-per-inch to use when scanning photos."
+#~ msgstr ""
+#~ "La risoluzione in punti per pollice da usare per l'acquisizione di foto."
+
 #, c-format
 #~ msgid ""
 #~ "Usage:\n"
@@ -990,6 +857,15 @@ msgstr "Salvataggio pagina %d di %d"
 #~ "I lati della pagina da acquisire. Può essere uno dei seguenti: \"entrambi\" "
 #~ "\"fronte\" \"retro\""
 
+#~ msgid "Page side to scan"
+#~ msgstr "Lato della pagina da acquisire"
+
+#~ msgid "Height of paper in tenths of a mm"
+#~ msgstr "Altezza del foglio in decimi di mm"
+
+#~ msgid "Width of paper in tenths of a mm"
+#~ msgstr "Larghezza del foglio in decimi di mm"
+
 #~ msgid ""
 #~ "Type of document being scanned. 'text' for text documents, 'photo' for "
 #~ "photos. This setting decides on the scan resolution, colors and post-"
@@ -999,5 +875,53 @@ msgstr "Salvataggio pagina %d di %d"
 #~ "per fotografie. Questa impostazione influenza la risoluzione "
 #~ "dell'acquisizione, le impostazioni di colore e la post-produzione."
 
+#~ msgid "The page side to scan."
+#~ msgstr "Lato della pagina da acquisire."
+
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "La direzione dell'acquisizione lungo la pagina."
+
+#~ msgid ""
+#~ "Type of document being scanned. This setting decides on the scan resolution, "
+#~ "colors and post-processing."
+#~ msgstr ""
+#~ "Tipo del documento da acquisire. Questa impostazione influenza la "
+#~ "risoluzione, il numero dei colori e l'elaborazione successiva "
+#~ "all'acquisizione."
+
+#~ msgid ""
+#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr ""
+#~ "L'altezza del foglio in decimi di mm  (0 per il rilevamento automatico)."
+
+#~ msgid ""
+#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr ""
+#~ "Altezza del foglio in decimi di mm (0 per il rilevamento automatico)."
+
+#~ msgid ""
+#~ "The directory to save files to. Defaults to the documents directory if unset."
+#~ msgstr ""
+#~ "La directory dove salvare i file. Il valore predefinito è la directory dei "
+#~ "documenti."
+
+#~ msgid "Contrast of scan"
+#~ msgstr "Contrasto dell'acquisizione"
+
+#~ msgid "Brightness of scan"
+#~ msgstr "Luminosità dell'acquisizione"
+
+#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
+#~ msgstr "La regolazione del contrasto da -100 a 100 (0 per alcun contrasto)."
+
+#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
+#~ msgstr ""
+#~ "La regolazione della luminosità da -100 a 100 (0 per alcuna luminosità)."
+
+#~ msgid "Quality value to use for JPEG compression."
+#~ msgstr "Indica il valore della qualità per la compressione JPEG"
+
+#~ msgid "Quality value to use for JPEG compression"
+#~ msgstr "Indica il valore della qualità per la compressione JPEG"
diff --git a/po/ja.gmo b/po/ja.gmo
new file mode 100644
index 0000000..fbb3ce2
--- /dev/null
+++ b/po/ja.gmo
diff --git a/po/ja.po b/po/ja.po
index 5981a81..d93c80b 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,399 +7,309 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-06 14:16+1200\n"
+"POT-Creation-Date: 2016-07-29 12:47+1200\n"
 "PO-Revision-Date: 2014-11-20 05:14+0000\n"
 "Last-Translator: Kentaro Kazuhama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-04-14 05:40+0000\n"
-"X-Generator: Launchpad (build 17990)\n"
+"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 
 #. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:2
+#: data/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "認証(_A)"
 
 #. Label beside username entry
-#: ../data/simple-scan.ui.h:4
+#: data/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "リソースに対するユーザ名(_U):"
 
 #. Label beside password entry
-#: ../data/simple-scan.ui.h:6
+#: data/simple-scan.ui:117
 msgid "_Password:"
 msgstr "パスワード(_P):"
 
 #. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:8
+#: data/simple-scan.ui:188
 msgid "Front and Back"
 msgstr "表面と裏面"
 
 #. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:10
+#: data/simple-scan.ui:192
 msgid "Front"
 msgstr "表面"
 
 #. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:12
+#: data/simple-scan.ui:196
 msgid "Back"
 msgstr "戻る"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
-#: ../data/appdata/simple-scan.appdata.xml.in.h:1
+#: data/simple-scan.ui:225 data/simple-scan.ui:809
+#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr "シンプルスキャン"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:16
+#: data/simple-scan.ui:241
 msgid "_Document"
 msgstr "ドキュメント(_D)"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:18
+#: data/simple-scan.ui:260
 msgid "Sc_an"
 msgstr "スキャン(_A)"
 
+#. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:20
+#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
 msgid "Single _Page"
 msgstr "一枚のページ(_P)"
 
+#. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:22
+#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr "フィーダより全てのページ(_F)"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:24
+#: data/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "スキャン停止(_S)"
 
-#: ../data/simple-scan.ui.h:25
+#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
 msgid "Text"
 msgstr "テキスト"
 
-#: ../data/simple-scan.ui.h:26
+#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
 msgid "Photo"
 msgstr "写真"
 
 #. Menu item to reorder pages
-#. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1183 ../src/ui.vala:1841
+#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr "ページを再整列"
 
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: data/simple-scan.ui:367
 msgid "_Email"
 msgstr "電子メール(_E)"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: data/simple-scan.ui:430
 msgid "_Page"
 msgstr "ページ(_P)"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: data/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "左へ回転(_L)"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: data/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "右へ回転(_R)"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: data/simple-scan.ui:460
 msgid "_Crop"
 msgstr "切り抜き(_C)"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: data/simple-scan.ui:470
 msgid "_None"
 msgstr "なし(_N)"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: data/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: data/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: data/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: data/simple-scan.ui:514
 msgid "_Letter"
 msgstr "US レター(_L)"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: data/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "US リーガル(_G)"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: data/simple-scan.ui:536
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: data/simple-scan.ui:547
 msgid "_Custom"
 msgstr "カスタム(_C)"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: data/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr "切り抜きを回転(_R)"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: data/simple-scan.ui:578
 msgid "Move Left"
 msgstr "左へ移動"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: data/simple-scan.ui:587
 msgid "Move Right"
 msgstr "右へ移動"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: data/simple-scan.ui:624
 msgid "_Help"
 msgstr "ヘルプ(_H)"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: data/simple-scan.ui:632
 msgid "_Contents"
 msgstr "コンテンツ(_C)"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: data/simple-scan.ui:674 data/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "新規ドキュメントの作成"
 
-#: ../data/simple-scan.ui.h:67
+#: data/simple-scan.ui:675
 msgid "New"
 msgstr "新規"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: data/simple-scan.ui:689 data/simple-scan.ui:836
 msgid "Scan a single page from the scanner"
 msgstr "一枚のページをスキャンします"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: data/simple-scan.ui:691 data/simple-scan.ui:837
 msgid "Scan"
 msgstr "スキャン"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: data/simple-scan.ui:707 data/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "ドキュメントをファイルに保存"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1842
+#: data/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "保存"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: data/simple-scan.ui:724 data/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "スキャンを停止します"
 
-#: ../data/simple-scan.ui.h:77
+#: data/simple-scan.ui:725 data/simple-scan.ui:825
 msgid "Stop"
 msgstr "停止"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: data/simple-scan.ui:749 data/simple-scan.ui:936
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "ページを左回転 (反時計回り)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: data/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "左へ回転"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: data/simple-scan.ui:764 data/simple-scan.ui:914
 msgid "Rotate the page to the right (clockwise)"
 msgstr "ページを右回転 (時計回り)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: data/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "右へ回転"
 
-#: ../data/simple-scan.ui.h:86
+#: data/simple-scan.ui:779 data/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "選択した範囲の切り抜き"
 
-#: ../data/simple-scan.ui.h:87
+#: data/simple-scan.ui:781
 msgid "Crop"
 msgstr "切り抜き"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1849
+#: data/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "設定"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: data/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "スキャンする対象(_O):"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: data/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "テキストの画素数(_T):"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: data/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "写真の画素数(_P):"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: data/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "スキャン面:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: data/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "ページサイズ:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: data/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "明るさ:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: data/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "コントラスト:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: data/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "品質:"
 
-#: ../data/simple-scan.desktop.in.h:2
+#: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr "ドキュメントスキャナ―"
 
-#: ../data/simple-scan.desktop.in.h:3
+#: data/simple-scan.desktop.in:5
 msgid "Scan Documents"
 msgstr "ドキュメントをスキャンします"
 
-#: ../data/simple-scan.desktop.in.h:4
+#: data/simple-scan.desktop.in:6
 msgid "scan;scanner;flatbed;adf;"
 msgstr "scan;scanner;flatbed;adf;スキャン;スキャナー;フラットベッド;オートドキュメントフィーダ;自動給紙装置;"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Device to scan from"
-msgstr "スキャンするデバイス"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "SANE device to acquire images from."
-msgstr "画像を取得する SANE デバイスです。"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "Type of document being scanned"
-msgstr "スキャンするドキュメントの種類"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
-msgid ""
-"Type of document being scanned. This setting decides on the scan resolution, "
-"colors and post-processing."
-msgstr "スキャンされる文書の種類。この設定により、画像の解像度、色の深度、事後処理が決定されます。"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
-msgid "Width of paper in tenths of a mm"
-msgstr "10mm単位での紙の幅"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr "10mm単位の用紙の幅 (または自動用紙検知の場合は 0)"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
-msgid "Height of paper in tenths of a mm"
-msgstr "10mm単位の用紙の高さ"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr "10mm単位の紙の高さ (または 0 で自動紙検知)"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "Brightness of scan"
-msgstr "スキャンの明るさ"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "The brightness adjustment from -100 to 100 (0 being none)."
-msgstr "-100から100までの範囲で明るさを調節する (0は無調整)。"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid "Contrast of scan"
-msgstr "スキャンのコントラスト"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "The contrast adjustment from -100 to 100 (0 being none)."
-msgstr "-100から100までの範囲でコントラストを調節する (0は無調整)。"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid "Resolution for text scans"
-msgstr "テキストスキャンの解像度"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
-msgid "The resolution in dots-per-inch to use when scanning text."
-msgstr "テキストをスキャンするときの解像度(DPI)です。"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
-msgid "Resolution for photo scans"
-msgstr "写真スキャンの解像度"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr "写真をスキャンするときの解像度(DPI)です。"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
-msgid "Page side to scan"
-msgstr "スキャンする面"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
-msgid "The page side to scan."
-msgstr "スキャンされる面"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
-msgid "Directory to save files to"
-msgstr "ファイルを保存するディレクトリ"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
-msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
-msgstr "ファイルを保存するディレクトリです。設定されていない場合、標準でドキュメントディレクトリに保存されます。"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
-msgid "Quality value to use for JPEG compression"
-msgstr "JPEGの圧縮に使用する品質の値"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Quality value to use for JPEG compression."
-msgstr "JPEGの圧縮に使用する品質の値です。"
+#: data/simple-scan.desktop.in:8
+msgid "scanner"
+msgstr ""
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+#: data/simple-scan.appdata.xml.in:8
 msgid ""
 "A really easy way to scan both documents and photos. You can crop out the "
 "bad parts of a photo and rotate it if it is the wrong way round. You can "
@@ -409,196 +319,162 @@ msgstr ""
 "ドキュメントや写真を本当に簡単な方法でスキャンします。写真の不要な部分を切り取ったり、間違った方向に向いている場合は回転できます。スキャンしたものを印刷、"
 "PDFへのエクスポート、多くの画像フォーマットに保存することができます。"
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+#: data/simple-scan.appdata.xml.in:13
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr "シンプル スキャンはSANE フレームワークを採用しており、多数の既存スキャナに対応しています。"
 
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr "利用可能なスキャナがありません。スキャナを接続してください。"
 
-#. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "スキャナに接続できません"
 
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "スキャンを開始できません"
 
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1236 src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr "スキャナとの通信に失敗しました"
 
-#. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "リリースバージョンを表示"
 
-#. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr "デバッグメッセージを表示"
 
-#: ../src/simple-scan.vala:26
+#: src/simple-scan.vala:26
 msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr "古いバージョンの Simple Scan によって生成されたPDFファイルを修復する"
 
-#. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:391
+#: src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "スキャンに失敗しました"
 
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[デバイス...] - スキャンユーティリティ"
 
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr "'%s --help' を実行すると利用可能なすべてのコマンドラインオプションの一覧が表示されます"
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:318 src/ui.vala:1602 src/ui.vala:1887
 msgid "_Close"
 msgstr "閉じる(_C)"
 
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:327
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "'%s' にアクセスするにはユーザ名とパスワードが必要です"
 
-#. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:375
 msgid "No scanners detected"
 msgstr "スキャナが検出されていません"
 
-#. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:377
 msgid "Please check your scanner is connected and powered on"
 msgstr "スキャナが接続されて電源が入っているか確認してください"
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:382
 msgid "Additional software needed"
 msgstr "追加ソフトウェアが必要です"
 
-#. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr "スキャナに対応したドライバー ソフトウェアをインストールする必要があります。"
 
-#. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:506 src/ui.vala:1843
 msgid "Save As..."
 msgstr "名前を付けて保存..."
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:509 src/ui.vala:675
 msgid "_Cancel"
 msgstr "キャンセル(_C)"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:510 src/ui.vala:676
 msgid "_Save"
 msgstr "保存(_S)"
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "スキャンされたドキュメント.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:521
 msgid "Image Files"
 msgstr "画像ファイル"
 
-#. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:527
 msgid "All Files"
 msgstr "すべてのファイル"
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (複数ページ)"
 
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (圧縮済み)"
 
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (ロスレス)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:557
 msgid "File format:"
 msgstr "ファイルフォーマット:"
 
-#. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:650
 msgid "Failed to save file"
 msgstr "ファイルの保存に失敗しました"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:673
 msgid "If you don't save, changes will be permanently lost."
 msgstr "保存しない場合、変更点は失われます。"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:708
+#: src/ui.vala:708
 msgid "Save current document?"
 msgstr "現在のドキュメントを保存しますか?"
 
-#. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:710
 msgid "Discard Changes"
 msgstr "変更を破棄"
 
-#. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "プレビュー用の画像を保存できません"
 
-#. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "画像プレビューアプリケーションを開けませんでした"
 
-#. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1206
 msgid "Combine sides"
 msgstr "面を結合"
 
-#. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr "面を結合(逆順)"
 
-#. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1226
 msgid "Reverse"
 msgstr "逆順"
 
-#. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr "無変更を維持"
 
-#. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "ヘルプファイルを開くことができません"
 
-#. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1472
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -626,17 +502,15 @@ msgstr ""
 "You should have received a copy of the GNU General Public License\n"
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 
-#. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "Simple Scan について"
 
-#. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "ドキュメントのスキャンを行うシンプルなツールです"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -652,23 +526,19 @@ msgstr ""
 "  Tosiki Iga https://launchpad.net/~tosiki-iga\n"
 "  kaneisland https://launchpad.net/~kaneisland"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "終了する前にドキュメントを保存しますか?"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "保存せずに終了"
 
-#. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr "ブラザー製スキャナーを見つけました。"
 
-#. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1581
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
@@ -676,13 +546,11 @@ msgstr ""
 "このスキャナーのドライバーは、<a "
 "href=\"http://support.brother.com\">Brotherのウェブサイト</a>から入手できます。"
 
-#. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr "Samsung製スキャナーを見つけました。"
 
-#. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1587
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
@@ -690,157 +558,140 @@ msgstr ""
 "このスキャナーのドライバーは、<a href=\"http://samsung.com/support\">Samsungのウェブサイト</a> "
 "から入手できます。"
 
-#. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr "HP製スキャナーを見つけました。"
 
-#. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr "エプソン製スキャナーを見つけました。"
 
-#. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1598
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
 msgstr ""
 "このスキャナーのドライバーは、<a href=\"http://support.epson.com\">Epsonウェブサイト</a>から入手できます。"
 
-#. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1602
 msgid "Install drivers"
 msgstr "ドライバーのインストール手順"
 
-#. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "ドライバーのインストール後、シンプル スキャンを再起動する必要があります。"
 
-#. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr "ドライバーをインストールしています..."
 
-#. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr "ドライバーのインストールに成功しました!"
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "ドライバーのインストールに失敗しました(エラーコード %d)。"
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr "ドライバーのインストールに失敗しました。"
 
-#. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1676
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr "%s パッケージをインストールする必要があります。"
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (標準)"
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (ドラフト)"
 
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (高解像度)"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/ui.vala:1793
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1835
 msgid "New Document"
 msgstr "新しいドキュメント"
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1840
 msgid "Document"
 msgstr "ドキュメント"
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1844
 msgid "Email..."
 msgstr "メール..."
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1845
 msgid "Print..."
 msgstr "印刷..."
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1853
 msgid "Help"
 msgstr "ヘルプ"
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1854
 msgid "About"
 msgstr "このプログラムについて"
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1855
 msgid "Quit"
 msgstr "終了"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "スキャナを変更(_S)"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr "ドライバーをインストール (_I)"
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1897
 msgid "Automatic"
 msgstr "自動"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1947
 msgid "Darker"
 msgstr "暗く"
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1949
 msgid "Lighter"
 msgstr "明るく"
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:1957
 msgid "Less"
 msgstr "弱く"
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:1959
 msgid "More"
 msgstr "強く"
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:1967
 msgid "Minimum"
 msgstr "最小"
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:1969
 msgid "Maximum"
 msgstr "最大"
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2008
 msgid "Saving document..."
 msgstr "ドキュメントを保存しています..."
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "%2$dページ中%1$dページを保存しています"
@@ -871,6 +722,21 @@ msgstr "%2$dページ中%1$dページを保存しています"
 #~ msgid "Select File _Type"
 #~ msgstr "ファイルタイプの選択(_T)"
 
+#~ msgid "Type of document being scanned"
+#~ msgstr "スキャンするドキュメントの種類"
+
+#~ msgid "Page side to scan"
+#~ msgstr "スキャンする面"
+
+#~ msgid "Directory to save files to"
+#~ msgstr "ファイルを保存するディレクトリ"
+
+#~ msgid "Height of paper in tenths of a mm"
+#~ msgstr "10mm単位の用紙の高さ"
+
+#~ msgid "Device to scan from"
+#~ msgstr "スキャンするデバイス"
+
 #~ msgid ""
 #~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
 #~ msgstr "スキャンする面のことです。次のうちから 1 つ選択できます: '両面' '表面' '裏面'"
@@ -880,12 +746,30 @@ msgstr "%2$dページ中%1$dページを保存しています"
 #~ "last scanned page was."
 #~ msgstr "ピクセル単位のスキャンされたイメージの高さです。この値は最後にスキャンしたページのものに更新されます。"
 
+#~ msgid ""
+#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr "10mm単位の紙の高さ (または 0 で自動紙検知)"
+
 #~ msgid "TRUE if the application window is maximized"
 #~ msgstr "アプリケーションのウィンドウを最大化するには TRUE にします"
 
+#~ msgid "SANE device to acquire images from."
+#~ msgstr "画像を取得する SANE デバイスです。"
+
+#~ msgid "Resolution for text scans"
+#~ msgstr "テキストスキャンの解像度"
+
+#~ msgid "Resolution for photo scans"
+#~ msgstr "写真スキャンの解像度"
+
 #~ msgid "Resolution of last scanned image"
 #~ msgstr "最後にスキャンした画像の解像度"
 
+#~ msgid ""
+#~ "The directory to save files to. Defaults to the documents directory if unset."
+#~ msgstr "ファイルを保存するディレクトリです。設定されていない場合、標準でドキュメントディレクトリに保存されます。"
+
 #~ msgid "Window height in pixels"
 #~ msgstr "ウィンドウの高さ(ピクセル)"
 
@@ -895,11 +779,51 @@ msgstr "%2$dページ中%1$dページを保存しています"
 #~ msgid "The resolution in dots-per-inch of the previously scanned image."
 #~ msgstr "前にスキャンした画像の解像度(DPI)です。"
 
+#~ msgid "The resolution in dots-per-inch to use when scanning text."
+#~ msgstr "テキストをスキャンするときの解像度(DPI)です。"
+
+#~ msgid "The resolution in dots-per-inch to use when scanning photos."
+#~ msgstr "写真をスキャンするときの解像度(DPI)です。"
+
+#~ msgid "Width of paper in tenths of a mm"
+#~ msgstr "10mm単位での紙の幅"
+
 #~ msgid "Width of scanned image in pixels"
 #~ msgstr "スキャン画像の幅(ピクセル)"
 
+#~ msgid ""
+#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr "10mm単位の用紙の幅 (または自動用紙検知の場合は 0)"
+
+#~ msgid "The page side to scan."
+#~ msgstr "スキャンされる面"
+
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "スキャナの走査方向"
 
+#~ msgid ""
+#~ "Type of document being scanned. This setting decides on the scan resolution, "
+#~ "colors and post-processing."
+#~ msgstr "スキャンされる文書の種類。この設定により、画像の解像度、色の深度、事後処理が決定されます。"
+
+#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
+#~ msgstr "-100から100までの範囲でコントラストを調節する (0は無調整)。"
+
+#~ msgid "Contrast of scan"
+#~ msgstr "スキャンのコントラスト"
+
+#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
+#~ msgstr "-100から100までの範囲で明るさを調節する (0は無調整)。"
+
+#~ msgid "Brightness of scan"
+#~ msgstr "スキャンの明るさ"
+
+#~ msgid "Quality value to use for JPEG compression."
+#~ msgstr "JPEGの圧縮に使用する品質の値です。"
+
+#~ msgid "Quality value to use for JPEG compression"
+#~ msgstr "JPEGの圧縮に使用する品質の値"
+
 #~ msgid "Scanned Document"
 #~ msgstr "スキャン済みドキュメント"
diff --git a/po/kk.gmo b/po/kk.gmo
new file mode 100644
index 0000000..077ad70
--- /dev/null
+++ b/po/kk.gmo
diff --git a/po/kk.po b/po/kk.po
index b2d205e..501e24a 100644
--- a/po/kk.po
+++ b/po/kk.po
@@ -7,399 +7,309 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-06 14:16+1200\n"
+"POT-Creation-Date: 2016-07-29 12:47+1200\n"
 "PO-Revision-Date: 2012-04-17 06:12+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Kazakh <kk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-04-14 05:40+0000\n"
-"X-Generator: Launchpad (build 17990)\n"
+"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 
 #. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:2
+#: data/simple-scan.ui:24
 msgid "_Authorize"
 msgstr ""
 
 #. Label beside username entry
-#: ../data/simple-scan.ui.h:4
+#: data/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr ""
 
 #. Label beside password entry
-#: ../data/simple-scan.ui.h:6
+#: data/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Құпия сөз:"
 
 #. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:8
+#: data/simple-scan.ui:188
 msgid "Front and Back"
 msgstr ""
 
 #. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:10
+#: data/simple-scan.ui:192
 msgid "Front"
 msgstr "Бет жағы"
 
 #. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:12
+#: data/simple-scan.ui:196
 msgid "Back"
 msgstr "Сырты"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
-#: ../data/appdata/simple-scan.appdata.xml.in.h:1
+#: data/simple-scan.ui:225 data/simple-scan.ui:809
+#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr ""
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:16
+#: data/simple-scan.ui:241
 msgid "_Document"
 msgstr ""
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:18
+#: data/simple-scan.ui:260
 msgid "Sc_an"
 msgstr ""
 
+#. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:20
+#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
 msgid "Single _Page"
 msgstr ""
 
+#. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:22
+#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr ""
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:24
+#: data/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:25
+#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
 msgid "Text"
 msgstr "Мәтін"
 
-#: ../data/simple-scan.ui.h:26
+#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
 msgid "Photo"
 msgstr "Фото"
 
 #. Menu item to reorder pages
-#. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1183 ../src/ui.vala:1841
+#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr ""
 
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: data/simple-scan.ui:367
 msgid "_Email"
 msgstr ""
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: data/simple-scan.ui:430
 msgid "_Page"
 msgstr ""
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: data/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "_Солға бұру"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: data/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "_Оңға бұру"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: data/simple-scan.ui:460
 msgid "_Crop"
 msgstr "Қ_иып жіберу"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: data/simple-scan.ui:470
 msgid "_None"
 msgstr "_Ешнәрсе"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: data/simple-scan.ui:481
 msgid "A_4"
 msgstr ""
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: data/simple-scan.ui:492
 msgid "A_5"
 msgstr ""
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: data/simple-scan.ui:503
 msgid "A_6"
 msgstr ""
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: data/simple-scan.ui:514
 msgid "_Letter"
 msgstr ""
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: data/simple-scan.ui:525
 msgid "Le_gal"
 msgstr ""
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: data/simple-scan.ui:536
 msgid "4×6"
 msgstr ""
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: data/simple-scan.ui:547
 msgid "_Custom"
 msgstr ""
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: data/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr ""
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: data/simple-scan.ui:578
 msgid "Move Left"
 msgstr ""
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: data/simple-scan.ui:587
 msgid "Move Right"
 msgstr ""
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: data/simple-scan.ui:624
 msgid "_Help"
 msgstr "_Көмек"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: data/simple-scan.ui:632
 msgid "_Contents"
 msgstr "Құра_масы"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: data/simple-scan.ui:674 data/simple-scan.ui:885
 msgid "Start a new document"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:67
+#: data/simple-scan.ui:675
 msgid "New"
 msgstr "Жаңа"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: data/simple-scan.ui:689 data/simple-scan.ui:836
 msgid "Scan a single page from the scanner"
 msgstr ""
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: data/simple-scan.ui:691 data/simple-scan.ui:837
 msgid "Scan"
 msgstr "Іздеу"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: data/simple-scan.ui:707 data/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1842
+#: data/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "Сақтау"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: data/simple-scan.ui:724 data/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:77
+#: data/simple-scan.ui:725 data/simple-scan.ui:825
 msgid "Stop"
 msgstr "Тоқтау"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: data/simple-scan.ui:749 data/simple-scan.ui:936
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr ""
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: data/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "Солға бұру"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: data/simple-scan.ui:764 data/simple-scan.ui:914
 msgid "Rotate the page to the right (clockwise)"
 msgstr ""
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: data/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "Оңға бұру"
 
-#: ../data/simple-scan.ui.h:86
+#: data/simple-scan.ui:779 data/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:87
+#: data/simple-scan.ui:781
 msgid "Crop"
 msgstr "Қиып жіберу"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1849
+#: data/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "Баптаулары"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: data/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: data/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: data/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr ""
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: data/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr ""
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: data/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr ""
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: data/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: data/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: data/simple-scan.ui:1260
 msgid "Quality:"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:2
+#: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:3
+#: data/simple-scan.desktop.in:5
 msgid "Scan Documents"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:4
+#: data/simple-scan.desktop.in:6
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Device to scan from"
+#: data/simple-scan.desktop.in:8
+msgid "scanner"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "SANE device to acquire images from."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "Type of document being scanned"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
-msgid ""
-"Type of document being scanned. This setting decides on the scan resolution, "
-"colors and post-processing."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
-msgid "Width of paper in tenths of a mm"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
-msgid "Height of paper in tenths of a mm"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "Brightness of scan"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "The brightness adjustment from -100 to 100 (0 being none)."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid "Contrast of scan"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "The contrast adjustment from -100 to 100 (0 being none)."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid "Resolution for text scans"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
-msgid "The resolution in dots-per-inch to use when scanning text."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
-msgid "Resolution for photo scans"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
-msgid "Page side to scan"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
-msgid "The page side to scan."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
-msgid "Directory to save files to"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
-msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
-msgid "Quality value to use for JPEG compression"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Quality value to use for JPEG compression."
-msgstr ""
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+#: data/simple-scan.appdata.xml.in:8
 msgid ""
 "A really easy way to scan both documents and photos. You can crop out the "
 "bad parts of a photo and rotate it if it is the wrong way round. You can "
@@ -407,196 +317,162 @@ msgid ""
 "formats."
 msgstr ""
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+#: data/simple-scan.appdata.xml.in:13
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr ""
 
-#. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr ""
 
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr ""
 
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1236 src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr ""
 
-#. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr ""
 
-#. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr ""
 
-#: ../src/simple-scan.vala:26
+#: src/simple-scan.vala:26
 msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr ""
 
-#. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:391
+#: src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr ""
 
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:318 src/ui.vala:1602 src/ui.vala:1887
 msgid "_Close"
 msgstr ""
 
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:327
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr ""
 
-#. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:375
 msgid "No scanners detected"
 msgstr ""
 
-#. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:377
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:382
 msgid "Additional software needed"
 msgstr ""
 
-#. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr ""
 
-#. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:506 src/ui.vala:1843
 msgid "Save As..."
 msgstr "Қалайша сақтау..."
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:509 src/ui.vala:675
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:510 src/ui.vala:676
 msgid "_Save"
 msgstr ""
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr ""
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:521
 msgid "Image Files"
 msgstr ""
 
-#. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:527
 msgid "All Files"
 msgstr "Бүкіл файлдар"
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr ""
 
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr ""
 
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr ""
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:557
 msgid "File format:"
 msgstr ""
 
-#. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:650
 msgid "Failed to save file"
 msgstr ""
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:673
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Сақтамасаңыз, өзгерістер қайтпастай жоғалады."
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:708
+#: src/ui.vala:708
 msgid "Save current document?"
 msgstr ""
 
-#. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:710
 msgid "Discard Changes"
 msgstr "Өзгерістерді ысырып тастау"
 
-#. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr ""
 
-#. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr ""
 
-#. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1206
 msgid "Combine sides"
 msgstr ""
 
-#. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr ""
 
-#. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1226
 msgid "Reverse"
 msgstr ""
 
-#. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr ""
 
-#. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "Көмек ақпараты файлын ашу мүмкін емес"
 
-#. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1472
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -612,207 +488,182 @@ msgid ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
 
-#. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr ""
 
-#. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  arruah https://launchpad.net/~arruah\n"
 "  jmb_kz https://launchpad.net/~jmb-kz"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr ""
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr ""
 
-#. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
-#. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1581
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
 msgstr ""
 
-#. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
-#. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1587
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
 msgstr ""
 
-#. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr ""
 
-#. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
-#. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1598
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
 msgstr ""
 
-#. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1602
 msgid "Install drivers"
 msgstr ""
 
-#. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
-#. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr ""
 
-#. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr ""
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr ""
 
-#. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1676
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr ""
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/ui.vala:1793
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1835
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1840
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1844
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1845
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1853
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1854
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1855
 msgid "Quit"
 msgstr ""
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr ""
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr ""
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1897
 msgid "Automatic"
 msgstr "Авто"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1947
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1949
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:1957
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:1959
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:1967
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:1969
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2008
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/km.gmo b/po/km.gmo
new file mode 100644
index 0000000..9909312
--- /dev/null
+++ b/po/km.gmo
diff --git a/po/km.po b/po/km.po
index 0385cc4..cebfa18 100644
--- a/po/km.po
+++ b/po/km.po
@@ -7,408 +7,309 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-06 14:16+1200\n"
+"POT-Creation-Date: 2016-07-29 12:47+1200\n"
 "PO-Revision-Date: 2012-04-17 06:12+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Khmer <km@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-04-14 05:40+0000\n"
-"X-Generator: Launchpad (build 17990)\n"
+"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 
 #. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:2
+#: data/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "ការ​អនុញ្ញាត"
 
 #. Label beside username entry
-#: ../data/simple-scan.ui.h:4
+#: data/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "ឈ្មោះ​អ្នកប្រើ​ធនធាន ៖"
 
 #. Label beside password entry
-#: ../data/simple-scan.ui.h:6
+#: data/simple-scan.ui:117
 msgid "_Password:"
 msgstr "ពាក្យសម្ងាត់ ៖"
 
 #. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:8
+#: data/simple-scan.ui:188
 msgid "Front and Back"
 msgstr "មុខ នឹង​ក្រោយ"
 
 #. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:10
+#: data/simple-scan.ui:192
 msgid "Front"
 msgstr "មុខ"
 
 #. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:12
+#: data/simple-scan.ui:196
 msgid "Back"
 msgstr "ថយក្រោយ"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
-#: ../data/appdata/simple-scan.appdata.xml.in.h:1
+#: data/simple-scan.ui:225 data/simple-scan.ui:809
+#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr "ស្កេន​ធម្មតា"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:16
+#: data/simple-scan.ui:241
 msgid "_Document"
 msgstr "ឯកសារ"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:18
+#: data/simple-scan.ui:260
 msgid "Sc_an"
 msgstr "ស្កេន"
 
+#. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:20
+#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
 msgid "Single _Page"
 msgstr "ទំព័រ​ម្ខាង"
 
+#. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:22
+#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr "ទំព័រ​ទាំងអស់​ពី​កម្មវិធី​មតិ"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:24
+#: data/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "ឈប់​ស្កេន"
 
-#: ../data/simple-scan.ui.h:25
+#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
 msgid "Text"
 msgstr "អត្ថបទ"
 
-#: ../data/simple-scan.ui.h:26
+#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
 msgid "Photo"
 msgstr "រូបថត"
 
 #. Menu item to reorder pages
-#. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1183 ../src/ui.vala:1841
+#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr "ការរៀបចំទំព័រ"
 
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: data/simple-scan.ui:367
 msgid "_Email"
 msgstr "អ៊ីមែល"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: data/simple-scan.ui:430
 msgid "_Page"
 msgstr "ទំព័រ"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: data/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "បង្វិល​ឆ្វេង"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: data/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "បង្វិល​ស្ដាំ"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: data/simple-scan.ui:460
 msgid "_Crop"
 msgstr "ច្រឹប"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: data/simple-scan.ui:470
 msgid "_None"
 msgstr "គ្មាន"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: data/simple-scan.ui:481
 msgid "A_4"
 msgstr "A4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: data/simple-scan.ui:492
 msgid "A_5"
 msgstr "A5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: data/simple-scan.ui:503
 msgid "A_6"
 msgstr "A6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: data/simple-scan.ui:514
 msgid "_Letter"
 msgstr "សំបុត្រ"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: data/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "ស្រប​ច្បាប់"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: data/simple-scan.ui:536
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: data/simple-scan.ui:547
 msgid "_Custom"
 msgstr "ផ្ទាល់ខ្លួន"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: data/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr "បង្វិល​ការ​ច្រឹប"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: data/simple-scan.ui:578
 msgid "Move Left"
 msgstr "ផ្លាស់ទី​ទៅ​ឆ្វេង"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: data/simple-scan.ui:587
 msgid "Move Right"
 msgstr "ផ្លាស់ទី​ទៅ​ស្ដាំ"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: data/simple-scan.ui:624
 msgid "_Help"
 msgstr "ជំនួយ"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: data/simple-scan.ui:632
 msgid "_Contents"
 msgstr "មាតិកា"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: data/simple-scan.ui:674 data/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "ចាប់ផ្ដើម​ឯកសារ​ថ្មី"
 
-#: ../data/simple-scan.ui.h:67
+#: data/simple-scan.ui:675
 msgid "New"
 msgstr "ថ្មី"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: data/simple-scan.ui:689 data/simple-scan.ui:836
 msgid "Scan a single page from the scanner"
 msgstr "ស្កេន​ទំព័រ​ទោល​ពី​ម៉ាស៊ីន​ស្កេន"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: data/simple-scan.ui:691 data/simple-scan.ui:837
 msgid "Scan"
 msgstr "ស្កេន"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: data/simple-scan.ui:707 data/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "រក្សាទុក​ឯកសារ​ទៅ​ឯកសារ"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1842
+#: data/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "រក្សាទុក"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: data/simple-scan.ui:724 data/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "បញ្ឈប់​ការ​ស្កេន​បច្ចុប្បន្ន"
 
-#: ../data/simple-scan.ui.h:77
+#: data/simple-scan.ui:725 data/simple-scan.ui:825
 msgid "Stop"
 msgstr "ឈប់"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: data/simple-scan.ui:749 data/simple-scan.ui:936
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "បង្វិល​ទំព័រ​ទៅ​ឆ្វេង (ច្រាស​ទ្រនិច​នាឡិកា)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: data/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "បង្វិល​ឆ្វេង"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: data/simple-scan.ui:764 data/simple-scan.ui:914
 msgid "Rotate the page to the right (clockwise)"
 msgstr "បង្វិល​ទំព័រ​ទៅ​ស្ដាំ (ស្រប​ទ្រនិច​នាឡិកា)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: data/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "បង្វិល​ស្ដាំ"
 
-#: ../data/simple-scan.ui.h:86
+#: data/simple-scan.ui:779 data/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "ច្រឹប​ទំព័រ​ដែល​បាន​ជ្រើស"
 
-#: ../data/simple-scan.ui.h:87
+#: data/simple-scan.ui:781
 msgid "Crop"
 msgstr "ច្រឹប"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1849
+#: data/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "ចំណូលចិត្ត"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: data/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "ស្កេន​ប្រភព ៖"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: data/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "គុណភាព​បង្ហាញ​អត្ថបទ ៖"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: data/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "គុណភាព​បង្ហាញ​រូបថត ៖"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: data/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "ស្កេន​ចំហៀង ៖"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: data/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "ទំហំ​ទំព័រ ៖"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: data/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "ពន្លឺ ៖"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: data/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "កម្រិត​ពណ៌ ៖"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: data/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "គុណភាព ៖"
 
-#: ../data/simple-scan.desktop.in.h:2
+#: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr "ម៉ាស៊ីនស្កេនឯកសារ"
 
-#: ../data/simple-scan.desktop.in.h:3
+#: data/simple-scan.desktop.in:5
 msgid "Scan Documents"
 msgstr "ស្កេន​ឯកសារ"
 
-#: ../data/simple-scan.desktop.in.h:4
+#: data/simple-scan.desktop.in:6
 msgid "scan;scanner;flatbed;adf;"
 msgstr "ស្កេន;ម៉ាស៊ីនស្កេន;flatbed;adf;"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Device to scan from"
-msgstr "ឧបករណ៍​ដែល​ត្រូវ​ស្កេន"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "SANE device to acquire images from."
-msgstr "ឧបករណ៍ SANE ដើម្បី​ទៅ​យក​រូបភាព ។"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "Type of document being scanned"
-msgstr "ប្រភេទ​ឯកសារ​ដែល​កំពុង​ត្រូវ​បាន​ស្កេន"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
-msgid ""
-"Type of document being scanned. This setting decides on the scan resolution, "
-"colors and post-processing."
+#: data/simple-scan.desktop.in:8
+msgid "scanner"
 msgstr ""
-"ប្រភេទ​ឯកសារ​ដែល​កំពុង​ត្រូវ​បាន​ស្កេន ។ "
-"ការ​កំណត់​នេះ​អាស្រ័យ​ទៅលើ​គុណភាព​បង្ហាញ ពណ៌ "
-"និង​ការ​ដំណើរការ​ជាមុន​របស់​ម៉ាស៊ីន​ស្កេន ។"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
-msgid "Width of paper in tenths of a mm"
-msgstr "ទទឹង​ក្រដាស ១/១០ ម.ម"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr "ទទឹង​ក្រដាស ១/១០ ម.ម. (ឬ ០ សម្រាប់​ទិស​ក្រដាស​ស្វ័យប្រវត្តិ) ។"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
-msgid "Height of paper in tenths of a mm"
-msgstr "កម្ពស់​ក្រដាស ១/១០ ម.ម."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr "កម្ពស់​ក្រដាស ១/១០ ម.ម. (ឬ ០ សម្រាប់​ទិស​ក្រដាស​ស្វ័យប្រវត្តិ) ។"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "Brightness of scan"
-msgstr "ពន្លឺ​វិភាគ​រក"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "The brightness adjustment from -100 to 100 (0 being none)."
-msgstr "ការ​កែតម្រូវ​ពន្លឺ​ពី -១០០ ដល់ ១០០ (០ នឹង​គ្មាន)។"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid "Contrast of scan"
-msgstr "កម្រិត​ពណ៌​វិភាគរក"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "The contrast adjustment from -100 to 100 (0 being none)."
-msgstr "ការ​កែតម្រូវ​កម្រិត​ពណ៌​ពី -១០០ ដល់ ១០០ (០ នឹង​គ្មាន)។"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid "Resolution for text scans"
-msgstr "គុណភាព​បង្ហាញ​សម្រាប់​ការ​ស្កេន​អត្ថបទ"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
-msgid "The resolution in dots-per-inch to use when scanning text."
-msgstr ""
-"គុណភាព​បង្ហាញ​គិតជា​ចំណុច​ក្នុង​មួយ​អ៊ិន្ឈ៍ "
-"ដែល​ត្រូវ​ប្រើ​នៅ​ពេល​ស្កេន​អត្ថបទ ។"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
-msgid "Resolution for photo scans"
-msgstr "គុណភាព​បង្ហាញ​សម្រាប់​ការ​ស្កេន​រូបថត"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr ""
-"គុណភាព​បង្ហាញ​គិតជា​ចំណុច​ក្នុង​មួយ​អ៊ិន្ឈ៍ "
-"ដែល​ត្រូវ​ប្រើ​នៅ​ពេល​ស្កេន​រូបថត ។"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
-msgid "Page side to scan"
-msgstr "ចំហៀង​ទំព័រ​ដែល​ត្រូវ​ស្កេន"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
-msgid "The page side to scan."
-msgstr "ចំហៀង​ទំព័រ​ដែល​ត្រូវ​ស្កេន ។"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
-msgid "Directory to save files to"
-msgstr "ថត​ដែល​ត្រូវ​រក្សាទុក​ឯកសារ"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
-msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
-msgstr ""
-"ថត​ដែល​ត្រូវ​រក្សាទុក​ឯកសារ ។ "
-"លំនាំដើម​ទៅកាន់​ថត​ឯកសារ​ប្រសិនបើ​មិន​បាន​កំណត់ ។"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
-msgid "Quality value to use for JPEG compression"
-msgstr "តម្លៃ​គុណភាព​​ប្រើ​សម្រាប់ JPEG compression"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Quality value to use for JPEG compression."
-msgstr "តម្លៃ​គុណភាព​ប្រើ​សម្រាប់ JPEG compression ។"
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+#: data/simple-scan.appdata.xml.in:8
 msgid ""
 "A really easy way to scan both documents and photos. You can crop out the "
 "bad parts of a photo and rotate it if it is the wrong way round. You can "
@@ -416,202 +317,168 @@ msgid ""
 "formats."
 msgstr ""
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+#: data/simple-scan.appdata.xml.in:13
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr "ពុំ​មាន​ម៉ាស៊ីន​ស្កេន​ទេ សូម​តភ្ជាប់​ម៉ាស៊ីន​ស្កេន ។"
 
-#. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "មិន​អាច​តភ្ជាប់​ម៉ាស៊ីន​ស្កេន​បាន​ទេ"
 
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "មិន​អាច​ចាប់ផ្ដើម​ស្កេន​បាន​ទេ"
 
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1236 src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr "កំហុស​ក្នុង​ការ​ទាក់ទង​ទៅកាន់​ម៉ាស៊ីន​ស្កេន"
 
-#. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "បង្ហាញ​កំណែ​ការ​ចេញផ្សាយ"
 
-#. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr "បោះពុម្ព​សារ​បំបាត់​កំហុស"
 
-#: ../src/simple-scan.vala:26
+#: src/simple-scan.vala:26
 msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr ""
 "ជួសជុល​ឯកសារ PDF ដែល​បាន​បង្កើត​ជាមួយ​កំណែ​ចាស់​របស់​ម៉ាស៊ីន​ស្កេន​ធម្មតា"
 
-#. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:391
+#: src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "បាន​បរាជ័យ​ក្នុង​ការ​ស្កេន"
 
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[ឧបករណ៍...] - ការ​ស្កេន​ឧបករណ៍​ប្រើប្រាស់"
 
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "ដំណើរការ '%s --help' ដើម្បី​មើល​បញ្ជី​ពេញលេញ​នៃ​បន្ទាត់​បញ្ជា​ដែល​មាន ។"
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:318 src/ui.vala:1602 src/ui.vala:1887
 msgid "_Close"
 msgstr "បិទ"
 
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:327
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "ទាមទារ​ឈ្មោះ​អ្នកប្រើ និង​ពាក្យសម្ងាត់​ដើម្បី​ចូលដំណើរការ '%s'"
 
-#. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:375
 msgid "No scanners detected"
 msgstr "រក​មិន​ឃើញ​ម៉ាស៊ីន​ស្កេន"
 
-#. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:377
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 "សូម​ពិនិត្យមើល​ម៉ាស៊ីន​ស្កេន​របស់​អ្នក​ថា​តើ​បាន​តភ្ជាប់ "
 "និង​បើក​កុងតាក់​ហើយ​ឬនៅ"
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:382
 msgid "Additional software needed"
 msgstr ""
 
-#. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr ""
 
-#. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:506 src/ui.vala:1843
 msgid "Save As..."
 msgstr "រក្សាទុក​ជា..."
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:509 src/ui.vala:675
 msgid "_Cancel"
 msgstr "បោះបង់"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:510 src/ui.vala:676
 msgid "_Save"
 msgstr "រក្សាទុក"
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "Document.pdf ដែល​បាន​ស្កេន"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:521
 msgid "Image Files"
 msgstr "ឯកសារ​រូបភាព"
 
-#. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:527
 msgid "All Files"
 msgstr "ឯកសារ​ទាំងអស់"
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (ឯកសារ​ច្រើន​ទំព័រ)"
 
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (បាន​បង្ហាប់)"
 
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (គ្មាន​ការ​បាត់បង់)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:557
 msgid "File format:"
 msgstr "ទ្រង់ទ្រាយ​ឯកសារ ៖"
 
-#. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:650
 msgid "Failed to save file"
 msgstr "បាន​បរាជ័យ​ក្នុង​ការ​រក្សាទុក​ឯកសារ"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:673
 msgid "If you don't save, changes will be permanently lost."
 msgstr ""
 "ប្រសិនបើ​អ្នក​មិន​រក្សាទុក​ទេ "
 "ការ​ផ្លាស់ប្ដូរ​ទាំងឡាយ​និង​ត្រូវ​បាន​បាត់បង់​ជា​អចិន្ត្រៃយ៍ ។"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:708
+#: src/ui.vala:708
 msgid "Save current document?"
 msgstr "រក្សាទុក​ឯកសារ​បច្ចុប្បន្ន ?"
 
-#. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:710
 msgid "Discard Changes"
 msgstr "បោះបង់​ការ​ផ្លាស់ប្ដូរ"
 
-#. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "មិន​អាច​រក្សាទុក​រូបភាព​សម្រាប់​ការ​មើល​ជាមុន​បាន​ទេ"
 
-#. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "មិន​អាច​បើក​កម្មវិធី​មើល​រូបភាព​ជាមុន​បាន​ទេ"
 
-#. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1206
 msgid "Combine sides"
 msgstr "ផ្សំភាគី"
 
-#. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr "ផ្សំភាគី (បញ្ច្រាស)"
 
-#. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1226
 msgid "Reverse"
 msgstr "បញ្ច្រាស"
 
-#. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr "រក្សា​ឱ្យមិនមានការ​ផ្លាស់​ប្តូ​រ"
 
-#. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "មិន​អាច​បើក​ឯកសារ​ជំនួយ​បាន​ទេ"
 
-#. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1472
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -640,17 +507,15 @@ msgstr ""
 "ជាមួយ​កម្មវិធី​នេះ ។ ប្រសិនបើ​មិន​បាន​ទទួល​ទេ "
 "សូម​មើល<http://www.gnu.org/licenses/> ។"
 
-#. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "អំពី​ការ​ស្កេន​ធម្មតា"
 
-#. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "ឧបករណ៍​ស្កេន​ធម្មតា"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -659,190 +524,167 @@ msgstr ""
 "  Rockworld https://launchpad.net/~rockrock2222222\n"
 "  Seng Sutha https://launchpad.net/~sutha"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "រក្សាទុក​ឯកសារ​មុន​ពេល​បិទ​ឬ ?"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "បិទ​ដោយ​មិន​រក្សាទុក"
 
-#. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
-#. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1581
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
 msgstr ""
 
-#. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
-#. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1587
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
 msgstr ""
 
-#. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr ""
 
-#. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
-#. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1598
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
 msgstr ""
 
-#. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1602
 msgid "Install drivers"
 msgstr ""
 
-#. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
-#. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr ""
 
-#. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr ""
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr ""
 
-#. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1676
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr ""
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (លំនាំដើម)"
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (ពង្រាង)"
 
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (គុណភាព​បង្ហាញ​ខ្ពស់)"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/ui.vala:1793
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1835
 msgid "New Document"
 msgstr "ឯកសារ​ថ្មី"
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1840
 msgid "Document"
 msgstr "ឯកសារ"
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1844
 msgid "Email..."
 msgstr "អ៊ីមេល..."
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1845
 msgid "Print..."
 msgstr "បោះពុម្ព..."
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1853
 msgid "Help"
 msgstr "ជំនួយ​"
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1854
 msgid "About"
 msgstr "អំពី"
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1855
 msgid "Quit"
 msgstr "ចេញ"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "ប្ដូរ​ម៉ាស៊ីន​ស្កេន"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr ""
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1897
 msgid "Automatic"
 msgstr "ស្វ័យប្រវត្តិ"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1947
 msgid "Darker"
 msgstr "ងងឹត"
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1949
 msgid "Lighter"
 msgstr "ស្រាល"
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:1957
 msgid "Less"
 msgstr "តិចជាង"
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:1959
 msgid "More"
 msgstr "ផ្សេងទៀត"
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:1967
 msgid "Minimum"
 msgstr "អប្បបរមា"
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:1969
 msgid "Maximum"
 msgstr "អតិបរមា"
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2008
 msgid "Saving document..."
 msgstr "កំពុង​រក្សាទុក​ឯកសារ..."
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "រក្សាទុក​ទំព័រ %d ផុត​សម័យ %d"
@@ -859,6 +701,23 @@ msgstr "រក្សាទុក​ទំព័រ %d ផុត​សម័យ %
 #~ msgid "TRUE if the application window is maximized"
 #~ msgstr "ពិត​ប្រសិនបើ​បង្អួច​កម្មវិធី​ត្រូវ​បាន​បង្រួម​អតិបរមា"
 
+#~ msgid "Device to scan from"
+#~ msgstr "ឧបករណ៍​ដែល​ត្រូវ​ស្កេន"
+
+#~ msgid "SANE device to acquire images from."
+#~ msgstr "ឧបករណ៍ SANE ដើម្បី​ទៅ​យក​រូបភាព ។"
+
+#~ msgid "Type of document being scanned"
+#~ msgstr "ប្រភេទ​ឯកសារ​ដែល​កំពុង​ត្រូវ​បាន​ស្កេន"
+
+#~ msgid ""
+#~ "Type of document being scanned. This setting decides on the scan resolution, "
+#~ "colors and post-processing."
+#~ msgstr ""
+#~ "ប្រភេទ​ឯកសារ​ដែល​កំពុង​ត្រូវ​បាន​ស្កេន ។ "
+#~ "ការ​កំណត់​នេះ​អាស្រ័យ​ទៅលើ​គុណភាព​បង្ហាញ ពណ៌ "
+#~ "និង​ការ​ដំណើរការ​ជាមុន​របស់​ម៉ាស៊ីន​ស្កេន ។"
+
 #~ msgid "Direction of scan"
 #~ msgstr "ទិស​នៃ​ការ​ស្កេន"
 
@@ -887,6 +746,22 @@ msgstr "រក្សាទុក​ទំព័រ %d ផុត​សម័យ %
 #~ "តម្លៃ​នេះ​ត្រូវ​បាន​ធ្វើ​បច្ចុប្បន្នភាព​ទៅកាន់​អ្វី​ដែល​ជា​ទំព័រ​ស្កេន​ចុងក្រ"
 #~ "ោយ ។"
 
+#~ msgid "Width of paper in tenths of a mm"
+#~ msgstr "ទទឹង​ក្រដាស ១/១០ ម.ម"
+
+#~ msgid ""
+#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr "ទទឹង​ក្រដាស ១/១០ ម.ម. (ឬ ០ សម្រាប់​ទិស​ក្រដាស​ស្វ័យប្រវត្តិ) ។"
+
+#~ msgid "Height of paper in tenths of a mm"
+#~ msgstr "កម្ពស់​ក្រដាស ១/១០ ម.ម."
+
+#~ msgid ""
+#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr "កម្ពស់​ក្រដាស ១/១០ ម.ម. (ឬ ០ សម្រាប់​ទិស​ក្រដាស​ស្វ័យប្រវត្តិ) ។"
+
 #~ msgid "Resolution of last scanned image"
 #~ msgstr "គុណភាព​បង្ហាញ​សម្រាប់​រូបភាព​ដែល​បាន​ស្កេន​ចុងក្រោយ"
 
@@ -894,6 +769,37 @@ msgstr "រក្សាទុក​ទំព័រ %d ផុត​សម័យ %
 #~ msgstr ""
 #~ "គុណភាព​បង្ហាញ​គិតជា​ចំណុច​ក្នុង​មួយ​អ៊ិន្ឈ៍ នៃ​រូបភាព​ដែល​បាន​ស្កេន​មុន ។"
 
+#~ msgid "Resolution for text scans"
+#~ msgstr "គុណភាព​បង្ហាញ​សម្រាប់​ការ​ស្កេន​អត្ថបទ"
+
+#~ msgid "The resolution in dots-per-inch to use when scanning text."
+#~ msgstr ""
+#~ "គុណភាព​បង្ហាញ​គិតជា​ចំណុច​ក្នុង​មួយ​អ៊ិន្ឈ៍ "
+#~ "ដែល​ត្រូវ​ប្រើ​នៅ​ពេល​ស្កេន​អត្ថបទ ។"
+
+#~ msgid "Resolution for photo scans"
+#~ msgstr "គុណភាព​បង្ហាញ​សម្រាប់​ការ​ស្កេន​រូបថត"
+
+#~ msgid "The resolution in dots-per-inch to use when scanning photos."
+#~ msgstr ""
+#~ "គុណភាព​បង្ហាញ​គិតជា​ចំណុច​ក្នុង​មួយ​អ៊ិន្ឈ៍ "
+#~ "ដែល​ត្រូវ​ប្រើ​នៅ​ពេល​ស្កេន​រូបថត ។"
+
+#~ msgid "Page side to scan"
+#~ msgstr "ចំហៀង​ទំព័រ​ដែល​ត្រូវ​ស្កេន"
+
+#~ msgid "The page side to scan."
+#~ msgstr "ចំហៀង​ទំព័រ​ដែល​ត្រូវ​ស្កេន ។"
+
+#~ msgid "Directory to save files to"
+#~ msgstr "ថត​ដែល​ត្រូវ​រក្សាទុក​ឯកសារ"
+
+#~ msgid ""
+#~ "The directory to save files to. Defaults to the documents directory if unset."
+#~ msgstr ""
+#~ "ថត​ដែល​ត្រូវ​រក្សាទុក​ឯកសារ ។ "
+#~ "លំនាំដើម​ទៅកាន់​ថត​ឯកសារ​ប្រសិនបើ​មិន​បាន​កំណត់ ។"
+
 #~ msgid "Scanned Document"
 #~ msgstr "ឯកសារ​ដែល​បាន​ស្កេន"
 
@@ -905,3 +811,21 @@ msgstr "រក្សាទុក​ទំព័រ %d ផុត​សម័យ %
 
 #~ msgid "Please check your installation"
 #~ msgstr "សូម​ពិនិត្យមើល​ការ​ដំឡើង​របស់​អ្នក"
+
+#~ msgid "Quality value to use for JPEG compression."
+#~ msgstr "តម្លៃ​គុណភាព​ប្រើ​សម្រាប់ JPEG compression ។"
+
+#~ msgid "Quality value to use for JPEG compression"
+#~ msgstr "តម្លៃ​គុណភាព​​ប្រើ​សម្រាប់ JPEG compression"
+
+#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
+#~ msgstr "ការ​កែតម្រូវ​ពន្លឺ​ពី -១០០ ដល់ ១០០ (០ នឹង​គ្មាន)។"
+
+#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
+#~ msgstr "ការ​កែតម្រូវ​កម្រិត​ពណ៌​ពី -១០០ ដល់ ១០០ (០ នឹង​គ្មាន)។"
+
+#~ msgid "Brightness of scan"
+#~ msgstr "ពន្លឺ​វិភាគ​រក"
+
+#~ msgid "Contrast of scan"
+#~ msgstr "កម្រិត​ពណ៌​វិភាគរក"
diff --git a/po/ko.gmo b/po/ko.gmo
new file mode 100644
index 0000000..98e371a
--- /dev/null
+++ b/po/ko.gmo
diff --git a/po/ko.po b/po/ko.po
new file mode 100644
index 0000000..6c639bb
--- /dev/null
+++ b/po/ko.po
@@ -0,0 +1,804 @@
+# Korean translation for simple-scan
+# Copyright (c) 2016 Rosetta Contributors and Canonical Ltd 2016
+# This file is distributed under the same license as the simple-scan package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2016.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: simple-scan\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2016-07-29 12:47+1200\n"
+"PO-Revision-Date: 2016-06-01 06:12+0000\n"
+"Last-Translator: MinSoo Kim <misol@korea.ac.kr>\n"
+"Language-Team: Korean <ko@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
+
+#. Button to submit authorization dialog
+#: data/simple-scan.ui:24
+msgid "_Authorize"
+msgstr "인증(_A)"
+
+#. Label beside username entry
+#: data/simple-scan.ui:102
+msgid "_Username for resource:"
+msgstr "리소스에 대한 사용자 이름(_U):"
+
+#. Label beside password entry
+#: data/simple-scan.ui:117
+msgid "_Password:"
+msgstr "비밀번호(_P):"
+
+#. Combo box label for scanning both sides of a page
+#: data/simple-scan.ui:188
+msgid "Front and Back"
+msgstr "앞뒤"
+
+#. Combo box label for scanning the front side of a page
+#: data/simple-scan.ui:192
+msgid "Front"
+msgstr "앞면"
+
+#. Combo box label for scanning the back side of a page
+#: data/simple-scan.ui:196
+msgid "Back"
+msgstr "뒷면"
+
+#. Title of scan window
+#: data/simple-scan.ui:225 data/simple-scan.ui:809
+#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
+msgid "Simple Scan"
+msgstr "심플 스캔"
+
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: data/simple-scan.ui:241
+msgid "_Document"
+msgstr "문서(_D)"
+
+#. Scan menu item
+#: data/simple-scan.ui:260
+msgid "Sc_an"
+msgstr "스캔(_A)"
+
+#. Scan menu item to scan a single page from the scanner
+#. Toolbar scan menu item to scan a single page from the scanner
+#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+msgid "Single _Page"
+msgstr "단일 페이지(_P)"
+
+#. Scan menu item to scan all pages from a document feeder
+#. Toolbar scan menu item to scan all pages from a document feeder
+#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+msgid "All Pages From _Feeder"
+msgstr "스케너의 모든 페이지(_F)"
+
+#. Menu entry to stop current scan
+#: data/simple-scan.ui:294
+msgid "_Stop Scan"
+msgstr "스캔 중지(_S)"
+
+#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+msgid "Text"
+msgstr "텍스트"
+
+#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+msgid "Photo"
+msgstr "사진"
+
+#. Menu item to reorder pages
+#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
+msgid "Reorder Pages"
+msgstr "페이지 다시 정렬"
+
+#. Label on email menu item
+#: data/simple-scan.ui:367
+msgid "_Email"
+msgstr "이메일(_E)"
+
+#. Page menu (contains action for each page, e.g. delete, crop)
+#: data/simple-scan.ui:430
+msgid "_Page"
+msgstr "페이지(_P)"
+
+#. Menu item to rotate page to left (anti-clockwise)
+#: data/simple-scan.ui:440
+msgid "Rotate _Left"
+msgstr "왼쪽으로 돌리기(_L)"
+
+#. Menu item to rotate page to right (clockwise)
+#: data/simple-scan.ui:450
+msgid "Rotate _Right"
+msgstr "오른쪽으로 돌리기(_R)"
+
+#. Label for page crop submenu
+#: data/simple-scan.ui:460
+msgid "_Crop"
+msgstr "잘라내기(_C)"
+
+#. Radio button for no crop
+#: data/simple-scan.ui:470
+msgid "_None"
+msgstr "없음(_N)"
+
+#. Radio button for cropping page to A4 size
+#: data/simple-scan.ui:481
+msgid "A_4"
+msgstr "A_4"
+
+#. Radio button for cropping page to A5 size
+#: data/simple-scan.ui:492
+msgid "A_5"
+msgstr "A_5"
+
+#. Radio button for cropping page to A6 size
+#: data/simple-scan.ui:503
+msgid "A_6"
+msgstr "A_6"
+
+#. Radio button for cropping page to US letter size
+#: data/simple-scan.ui:514
+msgid "_Letter"
+msgstr "편지(_L)"
+
+#. Radio button for cropping to page to US legal size
+#: data/simple-scan.ui:525
+msgid "Le_gal"
+msgstr "미국  법정 규격(_G)"
+
+#. Radio button for cropping page to 4x6 inch
+#: data/simple-scan.ui:536
+msgid "4×6"
+msgstr "4×6"
+
+#. Radio button for cropping to custom page size
+#: data/simple-scan.ui:547
+msgid "_Custom"
+msgstr "사용자 설정(_C)"
+
+#. Menu item to rotate the crop area
+#: data/simple-scan.ui:565
+msgid "_Rotate Crop"
+msgstr "잘라낸 영역 회전(_R)"
+
+#. Menu item to move the selected page to the left
+#: data/simple-scan.ui:578
+msgid "Move Left"
+msgstr "왼쪽으로 이동"
+
+#. Menu item to move the selected page to the right
+#: data/simple-scan.ui:587
+msgid "Move Right"
+msgstr "오른쪽으로 이동"
+
+#. Label on help menu
+#: data/simple-scan.ui:624
+msgid "_Help"
+msgstr "도움말(_H)"
+
+#. Help|Contents menu
+#: data/simple-scan.ui:632
+msgid "_Contents"
+msgstr "내용(_C)"
+
+#. Tooltip for new document button
+#: data/simple-scan.ui:674 data/simple-scan.ui:885
+msgid "Start a new document"
+msgstr "새 문서 시작"
+
+#: data/simple-scan.ui:675
+msgid "New"
+msgstr "새로 만들기"
+
+#. Tooltip for scan toolbar button
+#: data/simple-scan.ui:689 data/simple-scan.ui:836
+msgid "Scan a single page from the scanner"
+msgstr "스캐너로부터 한 페이지 스캔"
+
+#. Label on scan toolbar item
+#: data/simple-scan.ui:691 data/simple-scan.ui:837
+msgid "Scan"
+msgstr "스캔"
+
+#. Tooltip for save toolbar button
+#: data/simple-scan.ui:707 data/simple-scan.ui:864
+msgid "Save document to a file"
+msgstr "파일로 문서 저장하기"
+
+#: data/simple-scan.ui:709 src/ui.vala:1842
+msgid "Save"
+msgstr "저장"
+
+#. Tooltip for stop button
+#: data/simple-scan.ui:724 data/simple-scan.ui:824
+msgid "Stop the current scan"
+msgstr "현재 스캔 중지"
+
+#: data/simple-scan.ui:725 data/simple-scan.ui:825
+msgid "Stop"
+msgstr "정지"
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: data/simple-scan.ui:749 data/simple-scan.ui:936
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "페이지를 왼쪽으로 회전 (시계 반대 방향)"
+
+#. Label on rotate page left (anti-clockwise) item
+#: data/simple-scan.ui:750
+msgid "Rotate Left"
+msgstr "왼쪽으로 회전"
+
+#. Tooltip for rotate right (clockwise) button
+#: data/simple-scan.ui:764 data/simple-scan.ui:914
+msgid "Rotate the page to the right (clockwise)"
+msgstr "페이지를 오른쪽으로 회전 (시계 방향)"
+
+#. Label on rotate page right (clockwise) item
+#: data/simple-scan.ui:765
+msgid "Rotate Right"
+msgstr "오른쪽으로 회전"
+
+#: data/simple-scan.ui:779 data/simple-scan.ui:963
+msgid "Crop the selected page"
+msgstr "선택한 페이지 자르기"
+
+#: data/simple-scan.ui:781
+msgid "Crop"
+msgstr "잘라내기"
+
+#. Title of preferences dialog
+#: data/simple-scan.ui:997 src/ui.vala:1849
+msgid "Preferences"
+msgstr "기본 설정"
+
+#. Label beside scan source combo box
+#: data/simple-scan.ui:1048
+msgid "Scan S_ource:"
+msgstr "스캔 원본(_O)"
+
+#. Label beside scan source combo box
+#: data/simple-scan.ui:1079
+msgid "_Text Resolution:"
+msgstr "텍스트 해상도(_T)"
+
+#. Label beside scan source combo box
+#: data/simple-scan.ui:1095
+msgid "_Photo Resolution:"
+msgstr "사진 해상도(_P)"
+
+#. Label beside scan side combo box
+#: data/simple-scan.ui:1139
+msgid "Scan Side:"
+msgstr "가장자리 스캔:"
+
+#. Label beside page size combo box
+#: data/simple-scan.ui:1169
+msgid "Page Size:"
+msgstr "페이지 크기:"
+
+#. Label beside brightness scale
+#: data/simple-scan.ui:1199
+msgid "Brightness:"
+msgstr "밝기:"
+
+#. Label beside contrast scale
+#: data/simple-scan.ui:1229
+msgid "Contrast:"
+msgstr "명암:"
+
+#. Label beside quality scale
+#: data/simple-scan.ui:1260
+msgid "Quality:"
+msgstr "품질:"
+
+#: data/simple-scan.desktop.in:4
+msgid "Document Scanner"
+msgstr "문서 스캐너"
+
+#: data/simple-scan.desktop.in:5
+msgid "Scan Documents"
+msgstr "스캔 문서"
+
+#: data/simple-scan.desktop.in:6
+msgid "scan;scanner;flatbed;adf;"
+msgstr "scan;스캔;scanner;스캐너;flatbed;평판 스캐너;adf;"
+
+#: data/simple-scan.desktop.in:8
+msgid "scanner"
+msgstr ""
+
+#: data/simple-scan.appdata.xml.in:8
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+"문서나 사진을 스캐닝하는 쉬운 방법입니다. 사진에서 쓰지 않는 부분을 잘라내거나 방향이 틀리면 돌려서 바로잡을 수 있습니다. 스캐닝한 "
+"것을 출력하거나, pdf 파일로 내보내거나, 여러 가지 형식으로 저장할 수 있습니다."
+
+#: data/simple-scan.appdata.xml.in:13
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr "심플 스캔은 현존하는 거의 모든 스캐너들을 지원하는 SANE 프레임워크를 사용합니다."
+
+#: src/scanner.vala:841
+msgid "No scanners available.  Please connect a scanner."
+msgstr "사용할 수 있는 스캐너가 없습니다. 스캐너를 연결하세요."
+
+#: src/scanner.vala:871
+msgid "Unable to connect to scanner"
+msgstr "스캐너에 연결할 수 없음"
+
+#: src/scanner.vala:1223
+msgid "Unable to start scan"
+msgstr "스캔을 시작할 수 없음"
+
+#: src/scanner.vala:1236 src/scanner.vala:1333
+msgid "Error communicating with scanner"
+msgstr "스캐너와의 통신 에러"
+
+#: src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "릴리즈 버전 보이기"
+
+#: src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "디버깅 메세지 표시"
+
+#: src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+msgstr "이전 버전의 심플 스캔으로 만든 PDF 파일 고치기"
+
+#: src/simple-scan.vala:391
+msgid "Failed to scan"
+msgstr "스캔 실패"
+
+#: src/simple-scan.vala:621
+msgid "[DEVICE...] - Scanning utility"
+msgstr "[장치...] - 스캐닝 도구"
+
+#: src/simple-scan.vala:632
+#, c-format
+msgid "Run '%s --help' to see a full list of available command line options."
+msgstr "사용 가능한 모든 옵션의 목록을 보려면 '%s --help' 명령을 실행하십시오."
+
+#: src/ui.vala:318 src/ui.vala:1602 src/ui.vala:1887
+msgid "_Close"
+msgstr "닫기(_C)"
+
+#: src/ui.vala:327
+#, c-format
+msgid "Username and password required to access '%s'"
+msgstr "'%s'에 접근하려면 사용자 이름과 암호가 필요합니다"
+
+#: src/ui.vala:375
+msgid "No scanners detected"
+msgstr "감지된 스캐너 없음"
+
+#: src/ui.vala:377
+msgid "Please check your scanner is connected and powered on"
+msgstr "스캐너와 연결되어있는지, 전원이 켜져 있는지 확인해 주세요"
+
+#: src/ui.vala:382
+msgid "Additional software needed"
+msgstr "추가 소프트웨어 필요"
+
+#: src/ui.vala:384
+msgid "You need to install driver software for your scanner."
+msgstr "스캐너용 드라이버를 설치해야 합니다."
+
+#: src/ui.vala:506 src/ui.vala:1843
+msgid "Save As..."
+msgstr "다른 이름으로 저장..."
+
+#: src/ui.vala:509 src/ui.vala:675
+msgid "_Cancel"
+msgstr "취소(_C)"
+
+#: src/ui.vala:510 src/ui.vala:676
+msgid "_Save"
+msgstr "저장(_S)"
+
+#: src/ui.vala:516
+msgid "Scanned Document.pdf"
+msgstr "스캔한 문서.pdf"
+
+#: src/ui.vala:521
+msgid "Image Files"
+msgstr "그림 파일"
+
+#: src/ui.vala:527
+msgid "All Files"
+msgstr "모든 파일"
+
+#: src/ui.vala:536
+msgid "PDF (multi-page document)"
+msgstr "PDF (복수 페이지 문서)"
+
+#: src/ui.vala:542
+msgid "JPEG (compressed)"
+msgstr "JPEG (압축된)"
+
+#: src/ui.vala:548
+msgid "PNG (lossless)"
+msgstr "PNG (무손실)"
+
+#: src/ui.vala:557
+msgid "File format:"
+msgstr "파일 형식:"
+
+#: src/ui.vala:650
+msgid "Failed to save file"
+msgstr "파일 저장 실패"
+
+#: src/ui.vala:673
+msgid "If you don't save, changes will be permanently lost."
+msgstr "저장하지 않으면 바뀐 사항을 영영 잃어버립니다."
+
+#: src/ui.vala:708
+msgid "Save current document?"
+msgstr "현재 문서를 저장하시겠습니까?"
+
+#: src/ui.vala:710
+msgid "Discard Changes"
+msgstr "바뀐 내용 버리기"
+
+#: src/ui.vala:992
+msgid "Unable to save image for preview"
+msgstr "미리 보기 그림을 저장할 수 없습니다."
+
+#: src/ui.vala:1004
+msgid "Unable to open image preview application"
+msgstr "그림 미리보기 프로그램을 열 수 없습니다"
+
+#: src/ui.vala:1206
+msgid "Combine sides"
+msgstr "측면 결합"
+
+#: src/ui.vala:1216
+msgid "Combine sides (reverse)"
+msgstr "측면 결합(역순)"
+
+#: src/ui.vala:1226
+msgid "Reverse"
+msgstr "역순"
+
+#: src/ui.vala:1236
+msgid "Keep unchanged"
+msgstr "바꾸지 않은 상태 유지"
+
+#: src/ui.vala:1451
+msgid "Unable to open help file"
+msgstr "도움말 파일을 열 수 없습니다"
+
+#: src/ui.vala:1472
+msgid ""
+"This program is free software: you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation, either version 3 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License\n"
+"along with this program.  If not, see <http://www.gnu.org/licenses/>."
+msgstr ""
+"This program is free software: you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation, either version 3 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License\n"
+"along with this program.  If not, see <http://www.gnu.org/licenses/>."
+
+#: src/ui.vala:1475
+msgid "About Simple Scan"
+msgstr "심플 스캔 소개"
+
+#: src/ui.vala:1478
+msgid "Simple document scanning tool"
+msgstr "간단한 문서 스캐닝 도구"
+
+#: src/ui.vala:1487
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  Bundo https://launchpad.net/~kang-bundo\n"
+"  Jung-Kyu Park https://launchpad.net/~bagjunggyu\n"
+"  KiJune Yoon https://launchpad.net/~kijune\n"
+"  Kim Boram https://launchpad.net/~boramism\n"
+"  Koongchi https://launchpad.net/~kama8644-g\n"
+"  Lyuso https://launchpad.net/~lutinaroa\n"
+"  MinSoo Kim https://launchpad.net/~misol\n"
+"  Seung Soo, Ha https://launchpad.net/~sungsuha-deactivatedaccount\n"
+"  Sunil https://launchpad.net/~sodoetha\n"
+"  atto https://launchpad.net/~kpsman"
+
+#: src/ui.vala:1509
+msgid "Save document before quitting?"
+msgstr "종료하기 전에 문서를 저장하시겠습니까?"
+
+#: src/ui.vala:1511
+msgid "Quit without Saving"
+msgstr "저장하지 않고 종료"
+
+#: src/ui.vala:1579
+msgid "You appear to have a Brother scanner."
+msgstr "Brother 스캐너를 가지고 계신 것 같습니다"
+
+#: src/ui.vala:1581
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.brother.com\">Brother website</a>."
+msgstr ""
+"사용 가능한 드라이버 확인 <a href=\"http://support.brother.com\">Brother website</a>."
+
+#: src/ui.vala:1585
+msgid "You appear to have a Samsung scanner."
+msgstr "삼성 스캐너를 가지고 계신 것 같습니다."
+
+#: src/ui.vala:1587
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://samsung.com/support\">Samsung website</a>."
+msgstr ""
+"사용 가능한 드라이버 확인 <a href=\"http://samsung.com/support\">Samsung website</a>."
+
+#: src/ui.vala:1591
+msgid "You appear to have an HP scanner."
+msgstr "HP 스캐너를 가지고 계신 것 같습니다."
+
+#: src/ui.vala:1596
+msgid "You appear to have an Epson scanner."
+msgstr "Epson 스캐너를 가지고 계신 것 같습니다."
+
+#: src/ui.vala:1598
+msgid ""
+"Drivers for this are available on the <a "
+"href=\"http://support.epson.com\">Epson website</a>."
+msgstr ""
+"사용 가능한 드라이버 확인 <a href=\"http://support.epson.com\">Epson website</a>."
+
+#: src/ui.vala:1602
+msgid "Install drivers"
+msgstr "드라이버 설치"
+
+#: src/ui.vala:1633
+msgid "Once installed you will need to restart Simple Scan."
+msgstr "드라이버 설치 후엔 심플 스캔을  다시 시작해야 합니다."
+
+#: src/ui.vala:1645
+msgid "Installing drivers..."
+msgstr "드라이버를 설치하고 있습니다..."
+
+#: src/ui.vala:1653
+msgid "Drivers installed successfully!"
+msgstr "드라이버를 설치했습니다!"
+
+#: src/ui.vala:1663
+#, c-format
+msgid "Failed to install drivers (error code %d)."
+msgstr "드라이버 설치 실패 (에러 코드 %d)."
+
+#: src/ui.vala:1669
+msgid "Failed to install drivers."
+msgstr "드라이버 설치에 실패했습니다."
+
+#: src/ui.vala:1676
+#, c-format
+msgid "You need to install the %s package(s)."
+msgstr "%s 패키지를 설치해야 합니다."
+
+#: src/ui.vala:1784
+#, c-format
+msgid "%d dpi (default)"
+msgstr "%d dpi (기본값)"
+
+#: src/ui.vala:1787
+#, c-format
+msgid "%d dpi (draft)"
+msgstr "%d dpi (초안)"
+
+#: src/ui.vala:1790
+#, c-format
+msgid "%d dpi (high resolution)"
+msgstr "%d dpi (고해상도)"
+
+#: src/ui.vala:1793
+#, c-format
+msgid "%d dpi"
+msgstr "%d dpi"
+
+#: src/ui.vala:1835
+msgid "New Document"
+msgstr "새 문서"
+
+#: src/ui.vala:1840
+msgid "Document"
+msgstr "문서"
+
+#: src/ui.vala:1844
+msgid "Email..."
+msgstr "이메일..."
+
+#: src/ui.vala:1845
+msgid "Print..."
+msgstr "인쇄..."
+
+#: src/ui.vala:1853
+msgid "Help"
+msgstr "도움말"
+
+#: src/ui.vala:1854
+msgid "About"
+msgstr "소개"
+
+#: src/ui.vala:1855
+msgid "Quit"
+msgstr "끝내기"
+
+#: src/ui.vala:1889
+msgid "Change _Scanner"
+msgstr "스캐너 변경(_S)"
+
+#: src/ui.vala:1891
+msgid "_Install Drivers"
+msgstr "드라이버 설치(_I)"
+
+#: src/ui.vala:1897
+msgid "Automatic"
+msgstr "자동 설정"
+
+#: src/ui.vala:1947
+msgid "Darker"
+msgstr "어둡게"
+
+#: src/ui.vala:1949
+msgid "Lighter"
+msgstr "밝게"
+
+#: src/ui.vala:1957
+msgid "Less"
+msgstr "적게"
+
+#: src/ui.vala:1959
+msgid "More"
+msgstr "많이"
+
+#: src/ui.vala:1967
+msgid "Minimum"
+msgstr "최소"
+
+#: src/ui.vala:1969
+msgid "Maximum"
+msgstr "최대"
+
+#: src/ui.vala:2008
+msgid "Saving document..."
+msgstr "문서 저장..."
+
+#: src/ui.vala:2173
+#, c-format
+msgid "Saving page %d out of %d"
+msgstr "%d 페이지(전체 %d 페이지) 저장 중"
+
+#~ msgid "SANE device to acquire images from."
+#~ msgstr "SANE 장치에서 이미지를 가져옵니다."
+
+#~ msgid "The direction of the scanner across the scanned page."
+#~ msgstr "스캔한 페이지를 가로지르는 스캐너의 방향."
+
+#~ msgid "Window height in pixels"
+#~ msgstr "창 높이 (단위: 픽셀)"
+
+#~ msgid "Window width in pixels"
+#~ msgstr "창 너비 (단위: 픽셀)"
+
+#~ msgid "TRUE if the application window is maximized"
+#~ msgstr "참으로 설정하면 프로그램 창을 최대화합니다."
+
+#~ msgid "Device to scan from"
+#~ msgstr "스캔할 장치"
+
+#~ msgid ""
+#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr "종이의 너비(단위: 0.1mm, 종이 크기를 자동으로 검출하려면 0으로 설정하십시오)."
+
+#~ msgid "Height of scanned image in pixels"
+#~ msgstr "스캔한 그림의 높이(단위: 픽셀)"
+
+#~ msgid ""
+#~ "The width of scanned image in pixels. This value is updated to what the last "
+#~ "scanned page was."
+#~ msgstr "스캔한 그림의 너미(단위: 픽셀)를 설정합니다. 이 값은 마지막으로 스캔한 페이지로 업데이트됩니다."
+
+#~ msgid ""
+#~ "The height of scanned image in pixels. This value is updated to what the "
+#~ "last scanned page was."
+#~ msgstr "스캔한 그림의 높이(단위: 픽셀)를 설정합니다. 이 값은 마지막으로 스캔한 페이지로 업데이트됩니다."
+
+#~ msgid ""
+#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr "종이의 높이(단위: 0.1mm, 종이 크기를 자동으로 검출하려면 0으로 설정하십시오)."
+
+#~ msgid "Height of paper in tenths of a mm"
+#~ msgstr "종이의 높이(단위: 0.1mm)"
+
+#~ msgid "Width of paper in tenths of a mm"
+#~ msgstr "종이의 너비(단위: 0.1mm)"
+
+#~ msgid "Width of scanned image in pixels"
+#~ msgstr "스캔한 그림의 너비(단위: 픽셀)"
+
+#~ msgid "The page side to scan."
+#~ msgstr "스캔할 페이지 방향"
+
+#~ msgid "Page side to scan"
+#~ msgstr "스캔할 페이지 방향"
+
+#~ msgid "The resolution in dots-per-inch of the previously scanned image."
+#~ msgstr "이전에 스캔한 이미지의 해상도(단위: DPI)"
+
+#~ msgid ""
+#~ "The directory to save files to. Defaults to the documents directory if unset."
+#~ msgstr "파일을 저장할 디렉터리입니다. 설정하지 않으면 기본 문서 디렉터리에 저장합니다."
+
+#~ msgid "Directory to save files to"
+#~ msgstr "파일을 저장할 디렉터리"
+
+#~ msgid "Scanned Document"
+#~ msgstr "스캔한 문서"
+
+#~ msgid "Select File _Type"
+#~ msgstr "파일 형식 선택(_T)"
+
+#~ msgid "Brightness of scan"
+#~ msgstr "스캔의 밝기"
+
+#~ msgid "Quality value to use for JPEG compression."
+#~ msgstr "JPEG 압축에 사용할 품질 값입니다."
+
+#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
+#~ msgstr "-100부터 100 사이에서 명암을 조절합니다.(0은 조절안함)"
+
+#~ msgid "Contrast of scan"
+#~ msgstr "스캔의 명암"
+
+#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
+#~ msgstr "-100부터 100 사이에서 밝기를 조절합니다.(0은 조절안함)"
+
+#~ msgid "Quality value to use for JPEG compression"
+#~ msgstr "JPEG 압축에 사용할 품질 값"
+
+#~ msgid ""
+#~ "Type of document being scanned. This setting decides on the scan resolution, "
+#~ "colors and post-processing."
+#~ msgstr "스캐닝한 문서 형식. 이 설정은 스캔 해상도, 색 그리고 후 처리를 결정합니다."
+
+#~ msgid "Type of document being scanned"
+#~ msgstr "스캐닝한 문서 형식"
+
+#~ msgid "Resolution for text scans"
+#~ msgstr "택스트 스캔용 해상도"
+
+#~ msgid "Resolution for photo scans"
+#~ msgstr "사진 스캔용 해상도"
+
+#~ msgid "The resolution in dots-per-inch to use when scanning text."
+#~ msgstr "텍스트를 스캐닝할 때 사용할 해상도(단위: DPI)"
+
+#~ msgid "The resolution in dots-per-inch to use when scanning photos."
+#~ msgstr "사진을 스캐닝할 때 사용할 해상도(단위: DPI)"
diff --git a/po/ky.gmo b/po/ky.gmo
new file mode 100644
index 0000000..c799552
--- /dev/null
+++ b/po/ky.gmo
diff --git a/po/ky.po b/po/ky.po
index 2803b8c..5a78bd9 100644
--- a/po/ky.po
+++ b/po/ky.po
@@ -7,399 +7,309 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-06 14:16+1200\n"
+"POT-Creation-Date: 2016-07-29 12:47+1200\n"
 "PO-Revision-Date: 2012-04-17 06:12+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Kirghiz <ky@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-04-14 05:40+0000\n"
-"X-Generator: Launchpad (build 17990)\n"
+"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 
 #. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:2
+#: data/simple-scan.ui:24
 msgid "_Authorize"
 msgstr ""
 
 #. Label beside username entry
-#: ../data/simple-scan.ui.h:4
+#: data/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr ""
 
 #. Label beside password entry
-#: ../data/simple-scan.ui.h:6
+#: data/simple-scan.ui:117
 msgid "_Password:"
 msgstr ""
 
 #. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:8
+#: data/simple-scan.ui:188
 msgid "Front and Back"
 msgstr ""
 
 #. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:10
+#: data/simple-scan.ui:192
 msgid "Front"
 msgstr ""
 
 #. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:12
+#: data/simple-scan.ui:196
 msgid "Back"
 msgstr ""
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
-#: ../data/appdata/simple-scan.appdata.xml.in.h:1
+#: data/simple-scan.ui:225 data/simple-scan.ui:809
+#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr ""
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:16
+#: data/simple-scan.ui:241
 msgid "_Document"
 msgstr ""
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:18
+#: data/simple-scan.ui:260
 msgid "Sc_an"
 msgstr ""
 
+#. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:20
+#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
 msgid "Single _Page"
 msgstr ""
 
+#. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:22
+#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr ""
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:24
+#: data/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:25
+#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
 msgid "Text"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:26
+#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
 msgid "Photo"
 msgstr ""
 
 #. Menu item to reorder pages
-#. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1183 ../src/ui.vala:1841
+#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr ""
 
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: data/simple-scan.ui:367
 msgid "_Email"
 msgstr ""
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: data/simple-scan.ui:430
 msgid "_Page"
 msgstr ""
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: data/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr ""
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: data/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr ""
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: data/simple-scan.ui:460
 msgid "_Crop"
 msgstr ""
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: data/simple-scan.ui:470
 msgid "_None"
 msgstr ""
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: data/simple-scan.ui:481
 msgid "A_4"
 msgstr ""
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: data/simple-scan.ui:492
 msgid "A_5"
 msgstr ""
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: data/simple-scan.ui:503
 msgid "A_6"
 msgstr ""
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: data/simple-scan.ui:514
 msgid "_Letter"
 msgstr ""
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: data/simple-scan.ui:525
 msgid "Le_gal"
 msgstr ""
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: data/simple-scan.ui:536
 msgid "4×6"
 msgstr ""
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: data/simple-scan.ui:547
 msgid "_Custom"
 msgstr ""
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: data/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr ""
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: data/simple-scan.ui:578
 msgid "Move Left"
 msgstr ""
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: data/simple-scan.ui:587
 msgid "Move Right"
 msgstr ""
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: data/simple-scan.ui:624
 msgid "_Help"
 msgstr ""
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: data/simple-scan.ui:632
 msgid "_Contents"
 msgstr ""
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: data/simple-scan.ui:674 data/simple-scan.ui:885
 msgid "Start a new document"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:67
+#: data/simple-scan.ui:675
 msgid "New"
 msgstr ""
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: data/simple-scan.ui:689 data/simple-scan.ui:836
 msgid "Scan a single page from the scanner"
 msgstr ""
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: data/simple-scan.ui:691 data/simple-scan.ui:837
 msgid "Scan"
 msgstr ""
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: data/simple-scan.ui:707 data/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1842
+#: data/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr ""
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: data/simple-scan.ui:724 data/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:77
+#: data/simple-scan.ui:725 data/simple-scan.ui:825
 msgid "Stop"
 msgstr ""
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: data/simple-scan.ui:749 data/simple-scan.ui:936
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr ""
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: data/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr ""
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: data/simple-scan.ui:764 data/simple-scan.ui:914
 msgid "Rotate the page to the right (clockwise)"
 msgstr ""
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: data/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:86
+#: data/simple-scan.ui:779 data/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:87
+#: data/simple-scan.ui:781
 msgid "Crop"
 msgstr ""
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1849
+#: data/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: data/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: data/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: data/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr ""
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: data/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr ""
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: data/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr ""
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: data/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: data/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: data/simple-scan.ui:1260
 msgid "Quality:"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:2
+#: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:3
+#: data/simple-scan.desktop.in:5
 msgid "Scan Documents"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:4
+#: data/simple-scan.desktop.in:6
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Device to scan from"
+#: data/simple-scan.desktop.in:8
+msgid "scanner"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "SANE device to acquire images from."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "Type of document being scanned"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
-msgid ""
-"Type of document being scanned. This setting decides on the scan resolution, "
-"colors and post-processing."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
-msgid "Width of paper in tenths of a mm"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
-msgid "Height of paper in tenths of a mm"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "Brightness of scan"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "The brightness adjustment from -100 to 100 (0 being none)."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid "Contrast of scan"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "The contrast adjustment from -100 to 100 (0 being none)."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid "Resolution for text scans"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
-msgid "The resolution in dots-per-inch to use when scanning text."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
-msgid "Resolution for photo scans"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
-msgid "Page side to scan"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
-msgid "The page side to scan."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
-msgid "Directory to save files to"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
-msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
-msgid "Quality value to use for JPEG compression"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Quality value to use for JPEG compression."
-msgstr ""
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+#: data/simple-scan.appdata.xml.in:8
 msgid ""
 "A really easy way to scan both documents and photos. You can crop out the "
 "bad parts of a photo and rotate it if it is the wrong way round. You can "
@@ -407,196 +317,162 @@ msgid ""
 "formats."
 msgstr ""
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+#: data/simple-scan.appdata.xml.in:13
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr ""
 
-#. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr ""
 
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr ""
 
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1236 src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr ""
 
-#. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr ""
 
-#. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr ""
 
-#: ../src/simple-scan.vala:26
+#: src/simple-scan.vala:26
 msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr ""
 
-#. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:391
+#: src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr ""
 
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:318 src/ui.vala:1602 src/ui.vala:1887
 msgid "_Close"
 msgstr ""
 
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:327
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr ""
 
-#. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:375
 msgid "No scanners detected"
 msgstr ""
 
-#. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:377
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:382
 msgid "Additional software needed"
 msgstr ""
 
-#. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr ""
 
-#. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:506 src/ui.vala:1843
 msgid "Save As..."
 msgstr ""
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:509 src/ui.vala:675
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:510 src/ui.vala:676
 msgid "_Save"
 msgstr ""
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr ""
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:521
 msgid "Image Files"
 msgstr ""
 
-#. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:527
 msgid "All Files"
 msgstr ""
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr ""
 
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr ""
 
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr ""
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:557
 msgid "File format:"
 msgstr ""
 
-#. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:650
 msgid "Failed to save file"
 msgstr ""
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:673
 msgid "If you don't save, changes will be permanently lost."
 msgstr ""
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:708
+#: src/ui.vala:708
 msgid "Save current document?"
 msgstr ""
 
-#. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:710
 msgid "Discard Changes"
 msgstr ""
 
-#. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr ""
 
-#. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr ""
 
-#. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1206
 msgid "Combine sides"
 msgstr ""
 
-#. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr ""
 
-#. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1226
 msgid "Reverse"
 msgstr ""
 
-#. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr ""
 
-#. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr ""
 
-#. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1472
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -612,206 +488,181 @@ msgid ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
 
-#. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr ""
 
-#. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Saltanat Osmonova https://launchpad.net/~salta007"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr ""
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr ""
 
-#. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
-#. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1581
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
 msgstr ""
 
-#. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
-#. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1587
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
 msgstr ""
 
-#. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr ""
 
-#. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
-#. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1598
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
 msgstr ""
 
-#. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1602
 msgid "Install drivers"
 msgstr ""
 
-#. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
-#. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr ""
 
-#. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr ""
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr ""
 
-#. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1676
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr ""
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/ui.vala:1793
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1835
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1840
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1844
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1845
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1853
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1854
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1855
 msgid "Quit"
 msgstr ""
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr ""
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr ""
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1897
 msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1947
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1949
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:1957
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:1959
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:1967
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:1969
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2008
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/lt.gmo b/po/lt.gmo
new file mode 100644
index 0000000..b743f8e
--- /dev/null
+++ b/po/lt.gmo
diff --git a/po/lt.po b/po/lt.po
index 8cf99b2..b9e2f0b 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -7,601 +7,480 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-06 14:16+1200\n"
-"PO-Revision-Date: 2012-07-23 09:03+0000\n"
-"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
+"POT-Creation-Date: 2016-07-29 12:47+1200\n"
+"PO-Revision-Date: 2016-07-15 16:12+0000\n"
+"Last-Translator: Moo <hazap@hotmail.com>\n"
 "Language-Team: Lithuanian <lt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-04-14 05:40+0000\n"
-"X-Generator: Launchpad (build 17990)\n"
+"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 
 #. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:2
+#: data/simple-scan.ui:24
 msgid "_Authorize"
-msgstr ""
+msgstr "Į_galioti"
 
 #. Label beside username entry
-#: ../data/simple-scan.ui.h:4
+#: data/simple-scan.ui:102
 msgid "_Username for resource:"
-msgstr ""
+msgstr "Ištekliaus na_udotojo vardas:"
 
 #. Label beside password entry
-#: ../data/simple-scan.ui.h:6
+#: data/simple-scan.ui:117
 msgid "_Password:"
-msgstr ""
+msgstr "Sla_ptažodis:"
 
 #. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:8
+#: data/simple-scan.ui:188
 msgid "Front and Back"
-msgstr ""
+msgstr "Abi pusės"
 
 #. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:10
+#: data/simple-scan.ui:192
 msgid "Front"
-msgstr ""
+msgstr "Priekinė pusė"
 
 #. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:12
+#: data/simple-scan.ui:196
 msgid "Back"
-msgstr ""
+msgstr "Galinė pusė"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
-#: ../data/appdata/simple-scan.appdata.xml.in.h:1
+#: data/simple-scan.ui:225 data/simple-scan.ui:809
+#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
-msgstr ""
+msgstr "Paprastas skenavimas"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:16
+#: data/simple-scan.ui:241
 msgid "_Document"
-msgstr ""
+msgstr "_Dokumentas"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:18
+#: data/simple-scan.ui:260
 msgid "Sc_an"
-msgstr ""
+msgstr "S_kenuoti"
 
+#. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:20
+#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
 msgid "Single _Page"
-msgstr ""
+msgstr "Vieną  _puslapį"
 
+#. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:22
+#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
-msgstr ""
+msgstr "Visus puslapius iš _padaviklio"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:24
+#: data/simple-scan.ui:294
 msgid "_Stop Scan"
-msgstr ""
+msgstr "_Stabdyti skenavimą"
 
-#: ../data/simple-scan.ui.h:25
+#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
 msgid "Text"
-msgstr ""
+msgstr "Tekstas"
 
-#: ../data/simple-scan.ui.h:26
+#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
 msgid "Photo"
-msgstr ""
+msgstr "Nuotrauka"
 
 #. Menu item to reorder pages
-#. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1183 ../src/ui.vala:1841
+#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
 msgid "Reorder Pages"
-msgstr ""
+msgstr "Pakeisti puslapių tvarką"
 
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: data/simple-scan.ui:367
 msgid "_Email"
-msgstr ""
+msgstr "_Siųsti el. paštu"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: data/simple-scan.ui:430
 msgid "_Page"
-msgstr ""
+msgstr "_Puslapis"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: data/simple-scan.ui:440
 msgid "Rotate _Left"
-msgstr ""
+msgstr "Pasukti _kairėn"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: data/simple-scan.ui:450
 msgid "Rotate _Right"
-msgstr ""
+msgstr "Pasukti _dešinėn"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: data/simple-scan.ui:460
 msgid "_Crop"
-msgstr ""
+msgstr "_Apkirpti"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: data/simple-scan.ui:470
 msgid "_None"
-msgstr ""
+msgstr "_Nėra"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: data/simple-scan.ui:481
 msgid "A_4"
-msgstr ""
+msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: data/simple-scan.ui:492
 msgid "A_5"
-msgstr ""
+msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: data/simple-scan.ui:503
 msgid "A_6"
-msgstr ""
+msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: data/simple-scan.ui:514
 msgid "_Letter"
-msgstr ""
+msgstr "_Laiškas"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: data/simple-scan.ui:525
 msgid "Le_gal"
-msgstr ""
+msgstr "Tei_sinis"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: data/simple-scan.ui:536
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: data/simple-scan.ui:547
 msgid "_Custom"
-msgstr ""
+msgstr "_Pasirinktinis"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: data/simple-scan.ui:565
 msgid "_Rotate Crop"
-msgstr ""
+msgstr "_Pasukti apkirpimą"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: data/simple-scan.ui:578
 msgid "Move Left"
 msgstr "Perkelti kairėn"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: data/simple-scan.ui:587
 msgid "Move Right"
 msgstr "Perkelti dešinėn"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: data/simple-scan.ui:624
 msgid "_Help"
-msgstr ""
+msgstr "_Žinynas"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: data/simple-scan.ui:632
 msgid "_Contents"
-msgstr ""
+msgstr "_Turinys"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: data/simple-scan.ui:674 data/simple-scan.ui:885
 msgid "Start a new document"
-msgstr ""
+msgstr "Pradėti naują dokumentą"
 
-#: ../data/simple-scan.ui.h:67
+#: data/simple-scan.ui:675
 msgid "New"
-msgstr ""
+msgstr "Naujas"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: data/simple-scan.ui:689 data/simple-scan.ui:836
 msgid "Scan a single page from the scanner"
-msgstr ""
+msgstr "Skenuoti vieną puslapį iš skenerio."
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: data/simple-scan.ui:691 data/simple-scan.ui:837
 msgid "Scan"
-msgstr ""
+msgstr "Skenuoti"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: data/simple-scan.ui:707 data/simple-scan.ui:864
 msgid "Save document to a file"
-msgstr ""
+msgstr "Įrašyti dokumentą į failą"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1842
+#: data/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
-msgstr ""
+msgstr "Įrašyti"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: data/simple-scan.ui:724 data/simple-scan.ui:824
 msgid "Stop the current scan"
-msgstr ""
+msgstr "Stabdyti esamą skenavimą"
 
-#: ../data/simple-scan.ui.h:77
+#: data/simple-scan.ui:725 data/simple-scan.ui:825
 msgid "Stop"
-msgstr ""
+msgstr "Stabdyti"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: data/simple-scan.ui:749 data/simple-scan.ui:936
 msgid "Rotate the page to the left (counter-clockwise)"
-msgstr ""
+msgstr "Pasukti puslapį kairėn (prieš laikrodžio rodyklę)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: data/simple-scan.ui:750
 msgid "Rotate Left"
-msgstr ""
+msgstr "Pasukti kairėn"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: data/simple-scan.ui:764 data/simple-scan.ui:914
 msgid "Rotate the page to the right (clockwise)"
-msgstr ""
+msgstr "Pasukti puslapį dešinėn (pagal laikrodžio rodyklę)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: data/simple-scan.ui:765
 msgid "Rotate Right"
-msgstr ""
+msgstr "Pasukti dešinėn"
 
-#: ../data/simple-scan.ui.h:86
+#: data/simple-scan.ui:779 data/simple-scan.ui:963
 msgid "Crop the selected page"
-msgstr ""
+msgstr "Apkirpti pažymėtą puslapį"
 
-#: ../data/simple-scan.ui.h:87
+#: data/simple-scan.ui:781
 msgid "Crop"
-msgstr ""
+msgstr "Apkirpti"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1849
+#: data/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
-msgstr ""
+msgstr "Nuostatos"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: data/simple-scan.ui:1048
 msgid "Scan S_ource:"
-msgstr "Skaitymo š_altinis:"
+msgstr "Skenavimo š_altinis:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: data/simple-scan.ui:1079
 msgid "_Text Resolution:"
-msgstr ""
+msgstr "_Teksto raiška:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: data/simple-scan.ui:1095
 msgid "_Photo Resolution:"
-msgstr ""
+msgstr "_Nuotraukos raiška:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: data/simple-scan.ui:1139
 msgid "Scan Side:"
-msgstr ""
+msgstr "Skenuojama pusė:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: data/simple-scan.ui:1169
 msgid "Page Size:"
-msgstr ""
+msgstr "Puslapio dydis:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: data/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "Skaistis:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: data/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "Kontrastas:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: data/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "Kokybė:"
 
-#: ../data/simple-scan.desktop.in.h:2
+#: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
-msgstr ""
+msgstr "Dokumentų skeneris"
 
-#: ../data/simple-scan.desktop.in.h:3
+#: data/simple-scan.desktop.in:5
 msgid "Scan Documents"
-msgstr ""
+msgstr "Skenuoti dokumentus"
 
-#: ../data/simple-scan.desktop.in.h:4
+#: data/simple-scan.desktop.in:6
 msgid "scan;scanner;flatbed;adf;"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Device to scan from"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "SANE device to acquire images from."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "Type of document being scanned"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
-msgid ""
-"Type of document being scanned. This setting decides on the scan resolution, "
-"colors and post-processing."
-msgstr ""
-"Nuskaitomo dokumento tipas. Ši nuostata apsprendžia skaitymo skiriamąją "
-"gebą, spalvas ir baigiamąjį apdorojimą."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
-msgid "Width of paper in tenths of a mm"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
-msgid "Height of paper in tenths of a mm"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "Brightness of scan"
-msgstr "Nuskenuoto dokumento skaistis"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "The brightness adjustment from -100 to 100 (0 being none)."
-msgstr "Skaisčio derinimas nuo -100 iki 100 (0 nėra)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid "Contrast of scan"
-msgstr "Nuskenuoto dokumento kontrastas"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "The contrast adjustment from -100 to 100 (0 being none)."
-msgstr "Kontrasto derinimas nuo -100 iki 100 (0 nėra)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid "Resolution for text scans"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
-msgid "The resolution in dots-per-inch to use when scanning text."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
-msgid "Resolution for photo scans"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr ""
+msgstr "skenuoti;nuskaityti;adf;skaitytuvas;plokštuminis;"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
-msgid "Page side to scan"
+#: data/simple-scan.desktop.in:8
+msgid "scanner"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
-msgid "The page side to scan."
-msgstr "Puslapio pusė, kurią nuskaityti."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
-msgid "Directory to save files to"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
-msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
-msgid "Quality value to use for JPEG compression"
-msgstr "Kokybės reikšmė JPEG glaudinimui"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Quality value to use for JPEG compression."
-msgstr "Kokybės reikšmė JPEG glaudinimui."
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+#: data/simple-scan.appdata.xml.in:8
 msgid ""
 "A really easy way to scan both documents and photos. You can crop out the "
 "bad parts of a photo and rotate it if it is the wrong way round. You can "
 "print your scans, export them to pdf, or save them in a range of image "
 "formats."
 msgstr ""
+"Tikrai labai lengvas būdas skenuoti ir dokumentus, ir nuotraukas. Galite "
+"iškirpti blogas nuotraukos puses ir ją pasukti, jei ji neteisingai "
+"atvaizduojama. Galite spausdinti savo skenavimus, eksportuoti juos į pdf, ar "
+"įrašyti juos daugeliu paveikslų formatų."
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+#: data/simple-scan.appdata.xml.in:13
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
+"Paprastas skenavimas naudoja SANE karkasą, kad palaikytų daugelį esamų "
+"skenerių."
 
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
-msgstr ""
+msgstr "Nėra prieinamų skenerių. Prašome prijungti skenerį."
 
-#. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:871
 msgid "Unable to connect to scanner"
-msgstr ""
+msgstr "Nepavyko prisijungti prie skenerio"
 
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1223
 msgid "Unable to start scan"
-msgstr ""
+msgstr "Nepavyko pradėti skenavimo"
 
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1236 src/scanner.vala:1333
 msgid "Error communicating with scanner"
-msgstr ""
+msgstr "Klaida susisiekiant su skeneriu"
 
-#. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
-msgstr "Rodyti leidimo versiją"
+msgstr "Rodyti laidos versiją"
 
-#. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr "Išvesti derinimo pranešimus"
 
-#: ../src/simple-scan.vala:26
+#: src/simple-scan.vala:26
 msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr ""
-"Pataisyti PDF failus sugeneruotus su senesnėmis „Paprasto skenavimo“ "
-"versijomis"
+"Pataisyti PDF failus sukurtus su senesnėmis „Paprasto skenavimo“ versijomis"
 
-#. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:391
+#: src/simple-scan.vala:391
 msgid "Failed to scan"
-msgstr ""
+msgstr "Skenavimas nepavyko"
 
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
-msgstr "[ĮTAISAS...] - skaitymo paslaugų programa"
+msgstr "[ĮRENGINYS...] - Skenavimo paslaugų programa"
 
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Norėdami pamatyti komandų eilutės parametrų sąrašą, paleiskite „%s --help“."
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:318 src/ui.vala:1602 src/ui.vala:1887
 msgid "_Close"
 msgstr "_Užverti"
 
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:327
 #, c-format
 msgid "Username and password required to access '%s'"
-msgstr ""
+msgstr "Naudotojo vardas ir slaptažodis, reikalingas prieigai prie „%s“"
 
-#. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:375
 msgid "No scanners detected"
-msgstr ""
+msgstr "Skenerių neaptikta"
 
-#. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:377
 msgid "Please check your scanner is connected and powered on"
-msgstr ""
+msgstr "Patikrinkite ar skeneris yra prijungtas ir įjungtas"
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:382
 msgid "Additional software needed"
-msgstr ""
+msgstr "Reikalinga papildoma programinė įranga"
 
-#. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:384
 msgid "You need to install driver software for your scanner."
-msgstr ""
+msgstr "Jūs turite savo skeneriui įdiegti tvarkyklę."
 
-#. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:506 src/ui.vala:1843
 msgid "Save As..."
-msgstr ""
+msgstr "Įrašyti kaip..."
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:509 src/ui.vala:675
 msgid "_Cancel"
 msgstr "_Atsisakyti"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:510 src/ui.vala:676
 msgid "_Save"
 msgstr "Į_rašyti"
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:516
 msgid "Scanned Document.pdf"
-msgstr ""
+msgstr "Nuskenuotas dokumentas.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:521
 msgid "Image Files"
-msgstr ""
+msgstr "Paveikslų failai"
 
-#. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:527
 msgid "All Files"
-msgstr ""
+msgstr "Visi failai"
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:536
 msgid "PDF (multi-page document)"
-msgstr ""
+msgstr "PDF (kelių puslapių dokumentas)"
 
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:542
 msgid "JPEG (compressed)"
-msgstr ""
+msgstr "JPEG (suglaudintas)"
 
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:548
 msgid "PNG (lossless)"
-msgstr ""
+msgstr "PNG (nenuostolingasis)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:557
 msgid "File format:"
-msgstr ""
+msgstr "Failo formatas:"
 
-#. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:650
 msgid "Failed to save file"
-msgstr ""
+msgstr "Nepavyko įrašyti failo"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:673
 msgid "If you don't save, changes will be permanently lost."
-msgstr "Jeigu neišsaugosite, pakeitimai bus nesugrąžinamai prarasti."
+msgstr "Jeigu neįrašysite, pakeitimai bus negrįžtamai prarasti."
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:708
+#: src/ui.vala:708
 msgid "Save current document?"
-msgstr "Išsaugoti šį dokumentą?"
+msgstr "Įrašyti šį dokumentą?"
 
-#. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:710
 msgid "Discard Changes"
 msgstr "Atmesti pakeitimus"
 
-#. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:992
 msgid "Unable to save image for preview"
-msgstr "Nepavyko išsaugoti paveikslo peržiūrai"
+msgstr "Nepavyko įrašyti paveikslo peržiūrai"
 
-#. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1004
 msgid "Unable to open image preview application"
-msgstr ""
+msgstr "Nepavyko atverti paveikslų peržiūros programos"
 
-#. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1206
 msgid "Combine sides"
-msgstr ""
+msgstr "Suskirstyti puses"
 
-#. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1216
 msgid "Combine sides (reverse)"
-msgstr ""
+msgstr "Suskirstyti puses (atvirkščiai)"
 
-#. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1226
 msgid "Reverse"
-msgstr ""
+msgstr "Atvirkščiai"
 
-#. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1236
 msgid "Keep unchanged"
-msgstr ""
+msgstr "Palikti nepakeistus"
 
-#. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1451
 msgid "Unable to open help file"
-msgstr ""
+msgstr "Nepavyko atverti žinyno failo"
 
-#. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1472
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -616,18 +495,29 @@ msgid ""
 "You should have received a copy of the GNU General Public License\n"
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
+"Ši programa yra laisva programinė įranga: galite ją platinti ir/ar "
+"modifikuoti\n"
+"GNU bendrosios viešosios licencijos (GPL) sąlygomis, kurios paskelbtos\n"
+"Laisvosios programinės įrangos fondo (FSF), 3-osios arba\n"
+"(jūsų pasirinkimu) bet kurios vėlesnės licencijos versijos sąlygomis.\n"
+"\n"
+"Ši programa yra platinama tikintis, kad ji bus naudinga, tačiau BE JOKIŲ\n"
+"GARANTIJŲ; netgi be numanomų PERKAMUMO ar TINKAMUMO\n"
+"KONKREČIAI UŽDUOČIAI garantijų. Išsamią informaciją rasite\n"
+"GNU bendrojoje viešojoje licencijoje.\n"
+"\n"
+"Jūs turėjote gauti GNU bendrosios viešosios licencijos kopiją kartu su\n"
+"šia programa; jei negavote, žiūrėkite <http://www.gnu.org/licenses/>."
 
-#. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1475
 msgid "About Simple Scan"
-msgstr ""
+msgstr "Apie Paprastą skenavimą"
 
-#. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1478
 msgid "Simple document scanning tool"
-msgstr ""
+msgstr "Paprastas dokumentų skenavimo įrankis"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -635,197 +525,262 @@ msgstr ""
 "  Johnsonas https://launchpad.net/~uran54\n"
 "  Launchpad Translations Administrators https://launchpad.net/~rosetta\n"
 "  Mantas Kriaučiūnas https://launchpad.net/~mantas\n"
+"  Moo https://launchpad.net/~mooo\n"
 "  Rytis Ūsalis https://launchpad.net/~rytis-usalis\n"
 "  Vincas Dargis https://launchpad.net/~talkless\n"
 "  romasg https://launchpad.net/~romasg"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1509
 msgid "Save document before quitting?"
-msgstr "Išsaugoti dokumentą prieš išeinant iš programos?"
+msgstr "Įrašyti dokumentą prieš baigiant programos darbą?"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1511
 msgid "Quit without Saving"
-msgstr "Išeiti neišsaugant"
+msgstr "Baigti neįrašant"
 
-#. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
-msgstr ""
+msgstr "Atrodo, kad turite Brother skenerį."
 
-#. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1581
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
 msgstr ""
+"Tvarkyklės šiam įrenginiui yra prieinamos <a "
+"href=\"http://support.brother.com\">Brother svetainėje</a>."
 
-#. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
-msgstr ""
+msgstr "Atrodo, kad turite Samsung skenerį."
 
-#. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1587
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
 msgstr ""
+"Tvarkyklės šiam įrenginiui yra prieinamos <a "
+"href=\"http://samsung.com/support\">Samsung svetainėje</a>."
 
-#. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1591
 msgid "You appear to have an HP scanner."
-msgstr ""
+msgstr "Atrodo, kad turite HP skenerį."
 
-#. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
-msgstr ""
+msgstr "Atrodo, kad turite Epson skenerį."
 
-#. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1598
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
 msgstr ""
+"Tvarkyklės šiam įrenginiui yra prieinamos <a "
+"href=\"http://support.epson.com\">Epson svetainėje</a>."
 
-#. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1602
 msgid "Install drivers"
-msgstr ""
+msgstr "Įdiegti tvarkykles"
 
-#. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
-msgstr ""
+msgstr "Įdiegę, turėsite iš naujo paleisti Paprastą skenavimą."
 
-#. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1645
 msgid "Installing drivers..."
-msgstr ""
+msgstr "Įdiegiamos tvarkyklės..."
 
-#. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1653
 msgid "Drivers installed successfully!"
-msgstr ""
+msgstr "Tvarkyklės sėkmingai įdiegtos!"
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
-msgstr ""
+msgstr "Nepavyko įdiegti tvarkyklių (klaidos kodas %d)."
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1669
 msgid "Failed to install drivers."
-msgstr ""
+msgstr "Nepavyko įdiegti tvarkyklių."
 
-#. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1676
 #, c-format
 msgid "You need to install the %s package(s)."
-msgstr ""
+msgstr "Jums reikia įdiegti %s paketą(-us)."
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
-msgstr ""
+msgstr "%d tašk./col. (numatytoji)"
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
-msgstr ""
+msgstr "%d tašk./col. (juodraštis)"
 
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
-msgstr ""
+msgstr "%d tašk./col. (didelė raiška)"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/ui.vala:1793
 #, c-format
 msgid "%d dpi"
-msgstr ""
+msgstr "%d tašk./col."
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1835
 msgid "New Document"
-msgstr ""
+msgstr "Naujas dokumentas"
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1840
 msgid "Document"
-msgstr ""
+msgstr "Dokumentas"
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1844
 msgid "Email..."
-msgstr ""
+msgstr "El. paštas..."
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1845
 msgid "Print..."
-msgstr ""
+msgstr "Spausdinti..."
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1853
 msgid "Help"
-msgstr ""
+msgstr "Žinynas"
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1854
 msgid "About"
-msgstr ""
+msgstr "Apie"
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1855
 msgid "Quit"
-msgstr ""
+msgstr "Baigti"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1889
 msgid "Change _Scanner"
-msgstr ""
+msgstr "Keisti _skenerį"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1891
 msgid "_Install Drivers"
-msgstr ""
+msgstr "Į_diegti tvarkykles"
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1897
 msgid "Automatic"
 msgstr "Automatinis"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1947
 msgid "Darker"
 msgstr "Tamsesnis"
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1949
 msgid "Lighter"
 msgstr "Šviesesnis"
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:1957
 msgid "Less"
 msgstr "Mažiau"
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:1959
 msgid "More"
 msgstr "Daugiau"
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:1967
 msgid "Minimum"
-msgstr "Mažiausia"
+msgstr "Žemiausia"
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:1969
 msgid "Maximum"
-msgstr "Didžiausia"
+msgstr "Aukščiausia"
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2008
 msgid "Saving document..."
-msgstr "Saugomas dokumentas..."
+msgstr "Įrašomas dokumentas..."
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
-msgstr "Saugomas puslapis %d iš %d"
+msgstr "Įrašomas puslapis %d iš %d"
 
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "Skaitytuvo kryptis per skaitomą puslapį."
+
+#~ msgid "Contrast of scan"
+#~ msgstr "Nuskenuoto dokumento kontrastas"
+
+#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
+#~ msgstr "Skaisčio derinimas nuo -100 iki 100 (0 nėra)."
+
+#~ msgid "Brightness of scan"
+#~ msgstr "Nuskenuoto dokumento skaistis"
+
+#~ msgid "Quality value to use for JPEG compression"
+#~ msgstr "Kokybės reikšmė JPEG glaudinimui"
+
+#~ msgid ""
+#~ "Type of document being scanned. This setting decides on the scan resolution, "
+#~ "colors and post-processing."
+#~ msgstr ""
+#~ "Skenuojamo dokumento tipas. Šis nustatymas apsprendžia skaitymo raišką, "
+#~ "spalvas ir baigiamąjį apdorojimą."
+
+#~ msgid "Type of document being scanned"
+#~ msgstr "Skenuojamo dokumento tipas"
+
+#~ msgid "Device to scan from"
+#~ msgstr "Skenavimo įrenginys"
+
+#~ msgid "Resolution for text scans"
+#~ msgstr "Teksto skenavimo raiška"
+
+#~ msgid "Resolution for photo scans"
+#~ msgstr "Nuotraukų skenavimo raiška"
+
+#~ msgid "The resolution in dots-per-inch to use when scanning text."
+#~ msgstr "Raiška taškais colyje skenuojant tekstą."
+
+#~ msgid "The resolution in dots-per-inch to use when scanning photos."
+#~ msgstr "Raiška taškais colyje skenuojant nuotraukas."
+
+#~ msgid "Page side to scan"
+#~ msgstr "Skenuojama puslapio pusė"
+
+#~ msgid "The page side to scan."
+#~ msgstr "Puslapio pusė, kurią skenuoti."
+
+#~ msgid ""
+#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr ""
+#~ "Popieriaus aukštis dešimtosiomis milimetro dalimis (arba 0 automatiniam "
+#~ "popieriaus aptikimui)."
+
+#~ msgid "Height of paper in tenths of a mm"
+#~ msgstr "Popieriaus aukštis dešimtosiomis milimetro dalimis"
+
+#~ msgid ""
+#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr ""
+#~ "Popieriaus plotis dešimtosiomis milimetro dalimis (arba 0 automatiniam "
+#~ "popieriaus aptikimui)."
+
+#~ msgid "SANE device to acquire images from."
+#~ msgstr "SANE įrenginys, iš kurio gauti paveikslus."
+
+#~ msgid "Width of paper in tenths of a mm"
+#~ msgstr "Popieriaus plotis dešimtosiomis milimetro dalimis"
+
+#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
+#~ msgstr "Kontrasto reguliavimas nuo -100 iki 100 (0 nėra)."
+
+#~ msgid ""
+#~ "The directory to save files to. Defaults to the documents directory if unset."
+#~ msgstr ""
+#~ "Katalogas failams įrašyti. Jei nenustatyta, numatytoji reikšmė yra dokumentų "
+#~ "katalogas."
+
+#~ msgid "Directory to save files to"
+#~ msgstr "Katalogas, į kurį įrašyti failus"
+
+#~ msgid "Quality value to use for JPEG compression."
+#~ msgstr "Kokybės reikšmė, naudojama JPEG glaudinimui."
diff --git a/po/lv.gmo b/po/lv.gmo
new file mode 100644
index 0000000..d510706
--- /dev/null
+++ b/po/lv.gmo
diff --git a/po/lv.po b/po/lv.po
index 4b69cb1..7f576de 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -7,406 +7,309 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-06 14:16+1200\n"
+"POT-Creation-Date: 2016-07-29 12:47+1200\n"
 "PO-Revision-Date: 2012-10-07 21:28+0000\n"
 "Last-Translator: Rūdolfs Mazurs <Unknown>\n"
 "Language-Team: Latvian <lv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-04-14 05:40+0000\n"
-"X-Generator: Launchpad (build 17990)\n"
+"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 
 #. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:2
+#: data/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_Autorizēties"
 
 #. Label beside username entry
-#: ../data/simple-scan.ui.h:4
+#: data/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "Res_ursa lietotājvārds:"
 
 #. Label beside password entry
-#: ../data/simple-scan.ui.h:6
+#: data/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Parole:"
 
 #. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:8
+#: data/simple-scan.ui:188
 msgid "Front and Back"
 msgstr "Priekšpuse un aizmugure"
 
 #. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:10
+#: data/simple-scan.ui:192
 msgid "Front"
 msgstr "Priekšpuse"
 
 #. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:12
+#: data/simple-scan.ui:196
 msgid "Back"
 msgstr "Aizmugure"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
-#: ../data/appdata/simple-scan.appdata.xml.in.h:1
+#: data/simple-scan.ui:225 data/simple-scan.ui:809
+#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr "Vienkārša skenēšana"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:16
+#: data/simple-scan.ui:241
 msgid "_Document"
 msgstr "_Dokuments"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:18
+#: data/simple-scan.ui:260
 msgid "Sc_an"
 msgstr "Sk_enēt"
 
+#. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:20
+#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
 msgid "Single _Page"
 msgstr "Viena la_pa"
 
+#. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:22
+#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr "Visas lapas no _padeves"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:24
+#: data/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "Apturēt _skenēšanu"
 
-#: ../data/simple-scan.ui.h:25
+#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
 msgid "Text"
 msgstr "Teksts"
 
-#: ../data/simple-scan.ui.h:26
+#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
 msgid "Photo"
 msgstr "Foto"
 
 #. Menu item to reorder pages
-#. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1183 ../src/ui.vala:1841
+#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr ""
 
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: data/simple-scan.ui:367
 msgid "_Email"
 msgstr "_E-pasts"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: data/simple-scan.ui:430
 msgid "_Page"
 msgstr "La_pa"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: data/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "Pagriezt pa _kreisi"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: data/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "Pag_riezt pa labi"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: data/simple-scan.ui:460
 msgid "_Crop"
 msgstr "Ap_cirst"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: data/simple-scan.ui:470
 msgid "_None"
 msgstr "_Bez"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: data/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: data/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: data/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: data/simple-scan.ui:514
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: data/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: data/simple-scan.ui:536
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: data/simple-scan.ui:547
 msgid "_Custom"
 msgstr "_Pielāgots"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: data/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr "Pag_riezt apciršanu"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: data/simple-scan.ui:578
 msgid "Move Left"
 msgstr "Pārvietot pa kreisi"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: data/simple-scan.ui:587
 msgid "Move Right"
 msgstr "Pārvietot pa labi"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: data/simple-scan.ui:624
 msgid "_Help"
 msgstr "_Palīdzība"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: data/simple-scan.ui:632
 msgid "_Contents"
 msgstr "_Saturs"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: data/simple-scan.ui:674 data/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "Sākt jaunu dokumentu"
 
-#: ../data/simple-scan.ui.h:67
+#: data/simple-scan.ui:675
 msgid "New"
 msgstr "Jauns"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: data/simple-scan.ui:689 data/simple-scan.ui:836
 msgid "Scan a single page from the scanner"
 msgstr "Ieskenēt vienu lapu no skenera"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: data/simple-scan.ui:691 data/simple-scan.ui:837
 msgid "Scan"
 msgstr "Skenēt"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: data/simple-scan.ui:707 data/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "Saglabāt dokumentu datnē"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1842
+#: data/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "Saglabāt"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: data/simple-scan.ui:724 data/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "Apturēt pašreizējo skenēšanu"
 
-#: ../data/simple-scan.ui.h:77
+#: data/simple-scan.ui:725 data/simple-scan.ui:825
 msgid "Stop"
 msgstr "Apturēt"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: data/simple-scan.ui:749 data/simple-scan.ui:936
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Pagriezt lapu pa kreisi (pretēji pulksteņa rādītāja virzienam)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: data/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "Pagriezt pa kreisi"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: data/simple-scan.ui:764 data/simple-scan.ui:914
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Pagriezt lapu pa labi (pulksteņa rādītāja virzienā)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: data/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "Pagriezt pa labi"
 
-#: ../data/simple-scan.ui.h:86
+#: data/simple-scan.ui:779 data/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "Apcirst izvēlēto lapu"
 
-#: ../data/simple-scan.ui.h:87
+#: data/simple-scan.ui:781
 msgid "Crop"
 msgstr "Apcirst"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1849
+#: data/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "Iestatījumi"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: data/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "Skenēšanas av_ots:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: data/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "_Teksta izšķirtspēja:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: data/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "Fotogrāfijas izšķirts_pēja:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: data/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "Skenējamā puse:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: data/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "Lapas izmērs:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: data/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "Gaišums:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: data/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "Kontrasts:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: data/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "Kvalitāte:"
 
-#: ../data/simple-scan.desktop.in.h:2
+#: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:3
+#: data/simple-scan.desktop.in:5
 msgid "Scan Documents"
 msgstr "Skenēt dokumentus"
 
-#: ../data/simple-scan.desktop.in.h:4
+#: data/simple-scan.desktop.in:6
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Device to scan from"
-msgstr "Ierīce, no kuras skenēt"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "SANE device to acquire images from."
-msgstr "SANE ierīce, no kuras iegūt attēlus."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "Type of document being scanned"
-msgstr "Skenējamā dokumenta veids"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
-msgid ""
-"Type of document being scanned. This setting decides on the scan resolution, "
-"colors and post-processing."
+#: data/simple-scan.desktop.in:8
+msgid "scanner"
 msgstr ""
-"Skenējamā dokumenta veids. Šīs iestatījums nosaka skenēšanas izšķirtspēju, "
-"krāsas un pēcapstrādi."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
-msgid "Width of paper in tenths of a mm"
-msgstr "Papīra platums mm desmitdaļās"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-"Papīra platums mm desmitdaļās (vai 0 automātiskai papīra biezuma "
-"noteikšanai)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
-msgid "Height of paper in tenths of a mm"
-msgstr "Papīra garums mm desmitdaļās"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-"Papīra garums mm desmitdaļās (vai 0 automātiskai papīra biezuma noteikšanai)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "Brightness of scan"
-msgstr "Skenējuma gaišums"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "The brightness adjustment from -100 to 100 (0 being none)."
-msgstr "Gaišuma pielāgojums no -100 līdz 100 (0 nozīmē nekāds)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid "Contrast of scan"
-msgstr "Skenējuma kontrasts"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "The contrast adjustment from -100 to 100 (0 being none)."
-msgstr "Kontrasta pielāgojums no -100 līdz 100 (0 nozīmē nekāds)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid "Resolution for text scans"
-msgstr "Teksta skenējumu izšķirtspēja"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
-msgid "The resolution in dots-per-inch to use when scanning text."
-msgstr "Izšķirtspēja punktos/collā, skenējot tekstu."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
-msgid "Resolution for photo scans"
-msgstr "Fotogrāfiju skenējumu izšķirtspēja"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr "Izšķirtspēja punktos/collā, skenējot fotogrāfijas."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
-msgid "Page side to scan"
-msgstr "Skenējamā lapas puse"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
-msgid "The page side to scan."
-msgstr "Skenējamās lapas puse."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
-msgid "Directory to save files to"
-msgstr "Direktorija, kurā saglabāt datnes"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
-msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
-msgstr ""
-"Direktorija, kurā saglabāt datnes. Pēc noklusējuma datnes tiks glabātas "
-"dokumentu direktorijā."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
-msgid "Quality value to use for JPEG compression"
-msgstr "Kvalitātes vērtība, ko izmantot JPEG saspiešanai"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Quality value to use for JPEG compression."
-msgstr "Kvalitātes vērtība, ko izmantot JPEG saspiešanai."
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+#: data/simple-scan.appdata.xml.in:8
 msgid ""
 "A really easy way to scan both documents and photos. You can crop out the "
 "bad parts of a photo and rotate it if it is the wrong way round. You can "
@@ -414,198 +317,164 @@ msgid ""
 "formats."
 msgstr ""
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+#: data/simple-scan.appdata.xml.in:13
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Skeneris nav atrasts. Lūdzu, pievienojiet skeneri."
 
-#. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "Neizdevās savienoties ar skeneri"
 
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "Neizdevās sākt skenēšanu"
 
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1236 src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr "Kļūda, sazinoties ar skeneri"
 
-#. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "Rādīt laidiena versiju"
 
-#. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr "Drukāt atkļūdošanas ziņojumus"
 
-#: ../src/simple-scan.vala:26
+#: src/simple-scan.vala:26
 msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr "Salabot PDF datnes, kas ir veidotas ar vecākām Simple Scan versijām"
 
-#. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:391
+#: src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Neizdevās skenēt"
 
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[IERĪCE...] - skenēšanas utilītprogramma"
 
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Palaidiet “%s --help”, lai redzētu pilnu pieejamo komandrindas opciju "
 "sarakstu."
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:318 src/ui.vala:1602 src/ui.vala:1887
 msgid "_Close"
 msgstr "_Aizvērt"
 
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:327
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Lai piekļūtu “%s”, ir vajadzīgs lietotājvārds un parole"
 
-#. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:375
 msgid "No scanners detected"
 msgstr "Nav atrasts neviens skeneris"
 
-#. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:377
 msgid "Please check your scanner is connected and powered on"
 msgstr "Lūdzu, pārbaudiet, vai skeneris ir pievienots un ieslēgts"
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:382
 msgid "Additional software needed"
 msgstr ""
 
-#. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr ""
 
-#. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:506 src/ui.vala:1843
 msgid "Save As..."
 msgstr "Saglabāt kā..."
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:509 src/ui.vala:675
 msgid "_Cancel"
 msgstr "At_celt"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:510 src/ui.vala:676
 msgid "_Save"
 msgstr "_Saglabāt"
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "Ieskenēts Dokuments.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:521
 msgid "Image Files"
 msgstr "Attēlu datnes"
 
-#. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:527
 msgid "All Files"
 msgstr "Visas datnes"
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (vairāku lapu dokuments)"
 
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (saspiests)"
 
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (bez zudumiem)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:557
 msgid "File format:"
 msgstr ""
 
-#. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:650
 msgid "Failed to save file"
 msgstr "Neizdevās saglabāt datni"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:673
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Ja nesaglabāsiet, izmaiņas neatgriezeniski pazudīs."
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:708
+#: src/ui.vala:708
 msgid "Save current document?"
 msgstr "Saglabāt šo dokumentu?"
 
-#. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:710
 msgid "Discard Changes"
 msgstr "Izmest izmaiņas"
 
-#. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "Nevar saglabāt attēlu priekšskatīšanai"
 
-#. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "Neizdevās atvērt attēlu priekšskatīšanas lietotni"
 
-#. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1206
 msgid "Combine sides"
 msgstr ""
 
-#. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr ""
 
-#. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1226
 msgid "Reverse"
 msgstr "Pagriezt"
 
-#. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr "Paturēt nemainīti"
 
-#. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "Nevar atvērt palīdzības datni"
 
-#. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1472
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -630,17 +499,15 @@ msgstr ""
 "GNU Vispārējās publiskās licences kopiju kopā ar šo programmu; ja jūs to "
 "nesaņēmāt, skatiet <http://www.gnu.org/licenses/>."
 
-#. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "Par Simple Scan"
 
-#. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "Vienkāršs dokumentu skenēšanas rīks"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -649,190 +516,167 @@ msgstr ""
 "  Rihards Pfeifle https://launchpad.net/~spr1nt3r\n"
 "  Rūdolfs Mazurs https://launchpad.net/~rudolfs-mazurs"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "Pirms iziešanas saglabāt dokumentu?"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "Iziet nesaglabājot"
 
-#. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
-#. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1581
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
 msgstr ""
 
-#. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
-#. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1587
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
 msgstr ""
 
-#. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr ""
 
-#. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
-#. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1598
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
 msgstr ""
 
-#. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1602
 msgid "Install drivers"
 msgstr ""
 
-#. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
-#. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr ""
 
-#. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr ""
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr ""
 
-#. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1676
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr ""
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (noklusējuma)"
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (melraksts)"
 
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (augsta izšķirtspēja)"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/ui.vala:1793
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1835
 msgid "New Document"
 msgstr "Jauns dokuments"
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1840
 msgid "Document"
 msgstr "Dokuments"
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1844
 msgid "Email..."
 msgstr "Epasts..."
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1845
 msgid "Print..."
 msgstr "Drukāt..."
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1853
 msgid "Help"
 msgstr "Palīdzība"
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1854
 msgid "About"
 msgstr "Par"
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1855
 msgid "Quit"
 msgstr "Iziet"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "Mainīt _skeneri"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr ""
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1897
 msgid "Automatic"
 msgstr "Automātiski"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1947
 msgid "Darker"
 msgstr "Tumšāks"
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1949
 msgid "Lighter"
 msgstr "Gaišāks"
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:1957
 msgid "Less"
 msgstr "Mazāk"
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:1959
 msgid "More"
 msgstr "Vairāk"
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:1967
 msgid "Minimum"
 msgstr "Minimums"
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:1969
 msgid "Maximum"
 msgstr "Maksimums"
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2008
 msgid "Saving document..."
 msgstr "Saglabā dokumentu..."
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Saglabā lapu %d no %d"
@@ -840,6 +684,9 @@ msgstr "Saglabā lapu %d no %d"
 #~ msgid "4&#xD7;6"
 #~ msgstr "4&#xD7;6"
 
+#~ msgid "Device to scan from"
+#~ msgstr "Ierīce, no kuras skenēt"
+
 #~ msgid "Direction of scan"
 #~ msgstr "Skenēšanas virziens"
 
@@ -865,6 +712,15 @@ msgstr "Saglabā lapu %d no %d"
 #~ msgid "Please check your installation"
 #~ msgstr "Lūdzu, pārbaudiet instalāciju"
 
+#~ msgid "SANE device to acquire images from."
+#~ msgstr "SANE ierīce, no kuras iegūt attēlus."
+
+#~ msgid "Resolution for photo scans"
+#~ msgstr "Fotogrāfiju skenējumu izšķirtspēja"
+
+#~ msgid "Resolution for text scans"
+#~ msgstr "Teksta skenējumu izšķirtspēja"
+
 #~ msgid "Resolution of last scanned image"
 #~ msgstr "Pēdējā skenētā attēla izšķirtspēja"
 
@@ -875,20 +731,88 @@ msgstr "Saglabā lapu %d no %d"
 #~ "Skenētā attēla augstums pikseļos. Šī vērtība tiek atjaunināta, ņemot vērā "
 #~ "pēdējo skenēto lapu."
 
+#~ msgid "The resolution in dots-per-inch to use when scanning photos."
+#~ msgstr "Izšķirtspēja punktos/collā, skenējot fotogrāfijas."
+
+#~ msgid "The resolution in dots-per-inch to use when scanning text."
+#~ msgstr "Izšķirtspēja punktos/collā, skenējot tekstu."
+
 #~ msgid "The resolution in dots-per-inch of the previously scanned image."
 #~ msgstr "Iepriekšēji skenētā attēla izšķirtspēja punktos/collā."
 
 #~ msgid "Scanned Document"
 #~ msgstr "Skenēts dokuments"
 
+#~ msgid ""
+#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr ""
+#~ "Papīra garums mm desmitdaļās (vai 0 automātiskai papīra biezuma noteikšanai)."
+
+#~ msgid "Page side to scan"
+#~ msgstr "Skenējamā lapas puse"
+
+#~ msgid "Height of paper in tenths of a mm"
+#~ msgstr "Papīra garums mm desmitdaļās"
+
+#~ msgid ""
+#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr ""
+#~ "Papīra platums mm desmitdaļās (vai 0 automātiskai papīra biezuma "
+#~ "noteikšanai)."
+
+#~ msgid "Width of paper in tenths of a mm"
+#~ msgstr "Papīra platums mm desmitdaļās"
+
+#~ msgid "The page side to scan."
+#~ msgstr "Skenējamās lapas puse."
+
+#~ msgid ""
+#~ "Type of document being scanned. This setting decides on the scan resolution, "
+#~ "colors and post-processing."
+#~ msgstr ""
+#~ "Skenējamā dokumenta veids. Šīs iestatījums nosaka skenēšanas izšķirtspēju, "
+#~ "krāsas un pēcapstrādi."
+
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "Skenera virziens pāri skenējamai lapai."
 
 #~ msgid "TRUE if the application window is maximized"
 #~ msgstr "PATIESS, ja lietotnes logs ir maksimizēts"
 
+#~ msgid "Type of document being scanned"
+#~ msgstr "Skenējamā dokumenta veids"
+
+#~ msgid "Directory to save files to"
+#~ msgstr "Direktorija, kurā saglabāt datnes"
+
+#~ msgid ""
+#~ "The directory to save files to. Defaults to the documents directory if unset."
+#~ msgstr ""
+#~ "Direktorija, kurā saglabāt datnes. Pēc noklusējuma datnes tiks glabātas "
+#~ "dokumentu direktorijā."
+
 #~ msgid "Select File _Type"
 #~ msgstr "Norādīt datnes _tipu"
 
 #~ msgid "Files missing"
 #~ msgstr "Pietrūkst datņu"
+
+#~ msgid "Quality value to use for JPEG compression."
+#~ msgstr "Kvalitātes vērtība, ko izmantot JPEG saspiešanai."
+
+#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
+#~ msgstr "Kontrasta pielāgojums no -100 līdz 100 (0 nozīmē nekāds)."
+
+#~ msgid "Contrast of scan"
+#~ msgstr "Skenējuma kontrasts"
+
+#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
+#~ msgstr "Gaišuma pielāgojums no -100 līdz 100 (0 nozīmē nekāds)."
+
+#~ msgid "Brightness of scan"
+#~ msgstr "Skenējuma gaišums"
+
+#~ msgid "Quality value to use for JPEG compression"
+#~ msgstr "Kvalitātes vērtība, ko izmantot JPEG saspiešanai"
diff --git a/po/mhr.gmo b/po/mhr.gmo
new file mode 100644
index 0000000..a4ab5d0
--- /dev/null
+++ b/po/mhr.gmo
diff --git a/po/mhr.po b/po/mhr.po
index 2094e33..bc75add 100644
--- a/po/mhr.po
+++ b/po/mhr.po
@@ -7,399 +7,309 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-06 14:16+1200\n"
+"POT-Creation-Date: 2016-07-29 12:47+1200\n"
 "PO-Revision-Date: 2012-04-17 06:12+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Mari (Meadow) <mhr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-04-14 05:40+0000\n"
-"X-Generator: Launchpad (build 17990)\n"
+"X-Launchpad-Export-Date: 2016-07-30 05:46+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 
 #. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:2
+#: data/simple-scan.ui:24
 msgid "_Authorize"
 msgstr ""
 
 #. Label beside username entry
-#: ../data/simple-scan.ui.h:4
+#: data/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr ""
 
 #. Label beside password entry
-#: ../data/simple-scan.ui.h:6
+#: data/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Шолыпмут:"
 
 #. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:8
+#: data/simple-scan.ui:188
 msgid "Front and Back"
 msgstr ""
 
 #. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:10
+#: data/simple-scan.ui:192
 msgid "Front"
 msgstr "Шрифт"
 
 #. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:12
+#: data/simple-scan.ui:196
 msgid "Back"
 msgstr ""
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
-#: ../data/appdata/simple-scan.appdata.xml.in.h:1
+#: data/simple-scan.ui:225 data/simple-scan.ui:809
+#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr "Simple Scan"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:16
+#: data/simple-scan.ui:241
 msgid "_Document"
 msgstr "_Документ"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:18
+#: data/simple-scan.ui:260
 msgid "Sc_an"
 msgstr ""
 
+#. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:20
+#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
 msgid "Single _Page"
 msgstr "Ик _лаштык"
 
+#. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:22
+#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr ""
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:24
+#: data/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:25
+#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
 msgid "Text"
 msgstr "Текст"
 
-#: ../data/simple-scan.ui.h:26
+#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
 msgid "Photo"
 msgstr "Фотосӱрет"
 
 #. Menu item to reorder pages
-#. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1183 ../src/ui.vala:1841
+#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr ""
 
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: data/simple-scan.ui:367
 msgid "_Email"
 msgstr ""
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: data/simple-scan.ui:430
 msgid "_Page"
 msgstr "_Лаштык"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: data/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr ""
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: data/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr ""
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: data/simple-scan.ui:460
 msgid "_Crop"
 msgstr "_Лектыш"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: data/simple-scan.ui:470
 msgid "_None"
 msgstr "_Иктат"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: data/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: data/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: data/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: data/simple-scan.ui:514
 msgid "_Letter"
 msgstr "_Серыш"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: data/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "US Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: data/simple-scan.ui:536
 msgid "4×6"
 msgstr ""
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: data/simple-scan.ui:547
 msgid "_Custom"
 msgstr "_Йӱла"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: data/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr ""
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: data/simple-scan.ui:578
 msgid "Move Left"
 msgstr "Шола"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: data/simple-scan.ui:587
 msgid "Move Right"
 msgstr "Пурла"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: data/simple-scan.ui:624
 msgid "_Help"
 msgstr "_Полышык"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: data/simple-scan.ui:632
 msgid "_Contents"
 msgstr "_Содержаний"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: data/simple-scan.ui:674 data/simple-scan.ui:885
 msgid "Start a new document"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:67
+#: data/simple-scan.ui:675
 msgid "New"
 msgstr "У"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: data/simple-scan.ui:689 data/simple-scan.ui:836
 msgid "Scan a single page from the scanner"
 msgstr ""
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: data/simple-scan.ui:691 data/simple-scan.ui:837
 msgid "Scan"
 msgstr ""
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: data/simple-scan.ui:707 data/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1842
+#: data/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "Аныклаш"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: data/simple-scan.ui:724 data/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:77
+#: data/simple-scan.ui:725 data/simple-scan.ui:825
 msgid "Stop"
 msgstr "Шогалташ"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: data/simple-scan.ui:749 data/simple-scan.ui:936
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr ""
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: data/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr ""
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: data/simple-scan.ui:764 data/simple-scan.ui:914
 msgid "Rotate the page to the right (clockwise)"
 msgstr ""
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: data/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:86
+#: data/simple-scan.ui:779 data/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:87
+#: data/simple-scan.ui:781
 msgid "Crop"
 msgstr "Лектыш"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1849
+#: data/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "Келыштарымаш-влак"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: data/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: data/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: data/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr ""
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: data/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr ""
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: data/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "Лаштыкын кугыт"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: data/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: data/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: data/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "Ыштыш-кучыш:"
 
-#: ../data/simple-scan.desktop.in.h:2
+#: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:3
+#: data/simple-scan.desktop.in:5
 msgid "Scan Documents"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:4
+#: data/simple-scan.desktop.in:6
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Device to scan from"
+#: data/simple-scan.desktop.in:8
+msgid "scanner"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "SANE device to acquire images from."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "Type of document being scanned"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
-msgid ""
-"Type of document being scanned. This setting decides on the scan resolution, "
-"colors and post-processing."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
-msgid "Width of paper in tenths of a mm"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
-msgid "Height of paper in tenths of a mm"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "Brightness of scan"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "The brightness adjustment from -100 to 100 (0 being none)."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid "Contrast of scan"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "The contrast adjustment from -100 to 100 (0 being none)."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid "Resolution for text scans"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
-msgid "The resolution in dots-per-inch to use when scanning text."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
-msgid "Resolution for photo scans"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
-msgid "Page side to scan"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
-msgid "The page side to scan."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
-msgid "Directory to save files to"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
-msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
-msgid "Quality value to use for JPEG compression"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Quality value to use for JPEG compression."
-msgstr ""
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+#: data/simple-scan.appdata.xml.in:8
 msgid ""
 "A really easy way to scan both documents and photos. You can crop out the "
 "bad parts of a photo and rotate it if it is the wrong way round. You can "
@@ -407,196 +317,162 @@ msgid ""
 "formats."
 msgstr ""
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+#: data/simple-scan.appdata.xml.in:13
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr ""
 
-#. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr ""
 
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr ""
 
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1236 src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr ""
 
-#. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr ""
 
-#. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr ""
 
-#: ../src/simple-scan.vala:26
+#: src/simple-scan.vala:26
 msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr ""
 
-#. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:391
+#: src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr ""
 
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:318 src/ui.vala:1602 src/ui.vala:1887
 msgid "_Close"
 msgstr ""
 
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:327
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr ""
 
-#. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:375
 msgid "No scanners detected"
 msgstr ""
 
-#. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:377
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:382
 msgid "Additional software needed"
 msgstr ""
 
-#. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr ""
 
-#. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:506 src/ui.vala:1843
 msgid "Save As..."
 msgstr ""
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:509 src/ui.vala:675
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:510 src/ui.vala:676
 msgid "_Save"
 msgstr ""
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr ""
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:521
 msgid "Image Files"
 msgstr ""
 
-#. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:527
 msgid "All Files"
 msgstr ""
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr ""
 
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr ""
 
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr ""
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:557
 msgid "File format:"
 msgstr ""
 
-#. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:650
 msgid "Failed to save file"
 msgstr ""
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:673
 msgid "If you don't save, changes will be permanently lost."
 msgstr ""
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:708
+#: src/ui.vala:708
 msgid "Save current document?"
 msgstr ""
 
-#. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:710
 msgid "Discard Changes"
 msgstr ""
 
-#. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr ""
 
-#. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr ""
 
-#. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1206
 msgid "Combine sides"
 msgstr ""
 
-#. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr ""
 
-#. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1226
 msgid "Reverse"
 msgstr ""
 
-#. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr ""
 
-#. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr ""
 
-#. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1472
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -612,207 +488,182 @@ msgid ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
 
-#. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr ""
 
-#. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Max Romanov https://launchpad.net/~dr-max-romanov\n"
 "  Снежана https://launchpad.net/~snezhana-yandemerova-94"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr ""
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr ""
 
-#. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
-#. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1581
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
 msgstr ""
 
-#. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
-#. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1587
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
 msgstr ""
 
-#. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr ""
 
-#. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
-#. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1598
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
 msgstr ""
 
-#. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1602
 msgid "Install drivers"
 msgstr ""
 
-#. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
-#. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr ""
 
-#. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr ""
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr ""
 
-#. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1676
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr ""
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/ui.vala:1793
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1835
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1840
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1844
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1845
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1853
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1854
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1855
 msgid "Quit"
 msgstr ""
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr ""
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr ""
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1897
 msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1947
 msgid "Darker"
 msgstr "Пычкемышрак"
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1949
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:1957
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:1959
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:1967
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:1969
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2008
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/ms.gmo b/po/ms.gmo
new file mode 100644
index 0000000..9f5ccaf
--- /dev/null
+++ b/po/ms.gmo
diff --git a/po/ms.po b/po/ms.po
index 4091466..1533fd9 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -7,407 +7,309 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-06 14:16+1200\n"
+"POT-Creation-Date: 2016-07-29 12:47+1200\n"
 "PO-Revision-Date: 2012-07-23 09:04+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Malay <ms@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-04-14 05:40+0000\n"
-"X-Generator: Launchpad (build 17990)\n"
+"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 
 #. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:2
+#: data/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_Benarkan"
 
 #. Label beside username entry
-#: ../data/simple-scan.ui.h:4
+#: data/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "_Nama pengguna untuk sumber:"
 
 #. Label beside password entry
-#: ../data/simple-scan.ui.h:6
+#: data/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Kata Laluan:"
 
 #. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:8
+#: data/simple-scan.ui:188
 msgid "Front and Back"
 msgstr "Hadapan dan Belakang"
 
 #. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:10
+#: data/simple-scan.ui:192
 msgid "Front"
 msgstr "Hadapan"
 
 #. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:12
+#: data/simple-scan.ui:196
 msgid "Back"
 msgstr "Ke belakang"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
-#: ../data/appdata/simple-scan.appdata.xml.in.h:1
+#: data/simple-scan.ui:225 data/simple-scan.ui:809
+#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr "Pengimbas Ringkas"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:16
+#: data/simple-scan.ui:241
 msgid "_Document"
 msgstr "_Dokumen"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:18
+#: data/simple-scan.ui:260
 msgid "Sc_an"
 msgstr "I_mbas"
 
+#. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:20
+#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
 msgid "Single _Page"
 msgstr "_Halaman Tunggal"
 
+#. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:22
+#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr "Semua Halaman Dari _Suapan"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:24
+#: data/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "_Henti Imbas"
 
-#: ../data/simple-scan.ui.h:25
+#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
 msgid "Text"
 msgstr "Teks"
 
-#: ../data/simple-scan.ui.h:26
+#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
 msgid "Photo"
 msgstr "Foto"
 
 #. Menu item to reorder pages
-#. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1183 ../src/ui.vala:1841
+#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr "Tertib Semula Halaman"
 
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: data/simple-scan.ui:367
 msgid "_Email"
 msgstr "_Emel"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: data/simple-scan.ui:430
 msgid "_Page"
 msgstr "_Halaman"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: data/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "Putar Ke Ki_ri"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: data/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "Putar Ke Ka_nan"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: data/simple-scan.ui:460
 msgid "_Crop"
 msgstr "_Crop"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: data/simple-scan.ui:470
 msgid "_None"
 msgstr "_Tiada"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: data/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: data/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: data/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: data/simple-scan.ui:514
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: data/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: data/simple-scan.ui:536
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: data/simple-scan.ui:547
 msgid "_Custom"
 msgstr "_Tersendiri"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: data/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr "_Putar & Kerat"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: data/simple-scan.ui:578
 msgid "Move Left"
 msgstr "Alih Ke Kiri"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: data/simple-scan.ui:587
 msgid "Move Right"
 msgstr "ALih Ke Kanan"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: data/simple-scan.ui:624
 msgid "_Help"
 msgstr "_Bantuan"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: data/simple-scan.ui:632
 msgid "_Contents"
 msgstr "_Kandungan"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: data/simple-scan.ui:674 data/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "Mulakan dokumen baru"
 
-#: ../data/simple-scan.ui.h:67
+#: data/simple-scan.ui:675
 msgid "New"
 msgstr "Baru"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: data/simple-scan.ui:689 data/simple-scan.ui:836
 msgid "Scan a single page from the scanner"
 msgstr "Imbas halaman tunggal dari pengimbas"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: data/simple-scan.ui:691 data/simple-scan.ui:837
 msgid "Scan"
 msgstr "Imbas"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: data/simple-scan.ui:707 data/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "Simpan dokumen ke fail"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1842
+#: data/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "Simpan"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: data/simple-scan.ui:724 data/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "Hentikan Imbasan semasa"
 
-#: ../data/simple-scan.ui.h:77
+#: data/simple-scan.ui:725 data/simple-scan.ui:825
 msgid "Stop"
 msgstr "Henti"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: data/simple-scan.ui:749 data/simple-scan.ui:936
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Putar halaman ke kiri (lawan-jam)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: data/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "Putar Ke Kiri"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: data/simple-scan.ui:764 data/simple-scan.ui:914
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Putar halaman ke kanan (arah-jam)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: data/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "Putar Ke Kanan"
 
-#: ../data/simple-scan.ui.h:86
+#: data/simple-scan.ui:779 data/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "Kerat halaman pilihan"
 
-#: ../data/simple-scan.ui.h:87
+#: data/simple-scan.ui:781
 msgid "Crop"
 msgstr "Kerat"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1849
+#: data/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "Keutamaan"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: data/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "Imbas Su_mber:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: data/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "Resolusi _Teks:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: data/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "Resolusi _Foto:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: data/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "Imbas Sisi:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: data/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "Saiz Halaman:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: data/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "Kecerahan:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: data/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "Beza Jelas:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: data/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "Kualiti:"
 
-#: ../data/simple-scan.desktop.in.h:2
+#: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr "Pengimbas dokumen"
 
-#: ../data/simple-scan.desktop.in.h:3
+#: data/simple-scan.desktop.in:5
 msgid "Scan Documents"
 msgstr "Imbas Dokumen"
 
-#: ../data/simple-scan.desktop.in.h:4
+#: data/simple-scan.desktop.in:6
 msgid "scan;scanner;flatbed;adf;"
 msgstr "imbs;pengimbas;rata;adf;"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Device to scan from"
-msgstr "Peranti untuk diimbas dari"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "SANE device to acquire images from."
-msgstr "Peranti SANE untuk memperoleh imej dari."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "Type of document being scanned"
-msgstr "Jenis dokumen yang diimbas"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
-msgid ""
-"Type of document being scanned. This setting decides on the scan resolution, "
-"colors and post-processing."
+#: data/simple-scan.desktop.in:8
+msgid "scanner"
 msgstr ""
-"Jenis dokumen yang akan diimbas. Tetapan ini menentukan resolusi, warna dan "
-"post-pemproses imbasan."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
-msgid "Width of paper in tenths of a mm"
-msgstr "Lebar kertas dalam persepuluh mm"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-"Lebar kertas dalam persepuluh mm (atau 0 untuk pengesanan kertas secara "
-"automatik)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
-msgid "Height of paper in tenths of a mm"
-msgstr "Tinggi ketar dalam persepuluh mm"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-"Tinggi kertas dalam persepuluh mm (atau 0 untuk pengesanan kertas secara "
-"automatik)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "Brightness of scan"
-msgstr "Kecerahan imbasan"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "The brightness adjustment from -100 to 100 (0 being none)."
-msgstr "Pelarasan kecerahan dari -100 hingga 100 (0 tiada perubahan)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid "Contrast of scan"
-msgstr "Beza jelas imbasan"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "The contrast adjustment from -100 to 100 (0 being none)."
-msgstr "Pelarasan beza jelas dari -100 hingga 100 (0 tiada perubahan)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid "Resolution for text scans"
-msgstr "Resolusi untuk imbasan teks"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
-msgid "The resolution in dots-per-inch to use when scanning text."
-msgstr "Resolusi dalam titik-se-inci yang digunakan semasa mengimbas teks."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
-msgid "Resolution for photo scans"
-msgstr "Resolusi untuk imbasan foto"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr "Resolusi dalam titik-se-inci yang digunakan semasa mengimbas foto."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
-msgid "Page side to scan"
-msgstr "Sisi halaman untuk diimbaskan"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
-msgid "The page side to scan."
-msgstr "Sisi halaman untuk diimbas."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
-msgid "Directory to save files to"
-msgstr "Direktori untuk menyimpan fail ke"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
-msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
-msgstr ""
-"Direktori untuk menyimpan fail. Nilai lalai direktori dokumen jika tidak "
-"ditetapkan."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
-msgid "Quality value to use for JPEG compression"
-msgstr "Nilai kualiti yang digunakan untuk pemampatan JPEG"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Quality value to use for JPEG compression."
-msgstr "Nilai kualiti yang digunakan untuk pemampatan JPEG."
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+#: data/simple-scan.appdata.xml.in:8
 msgid ""
 "A really easy way to scan both documents and photos. You can crop out the "
 "bad parts of a photo and rotate it if it is the wrong way round. You can "
@@ -419,200 +321,166 @@ msgstr ""
 "kedudukan yang salah. Anda boleh cetak imbasan anda, eksport ia ke pdf, atau "
 "simpan ia dengan sejumlah besar format imej."
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+#: data/simple-scan.appdata.xml.in:13
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 "Pengimbas Ringkas menggunakan bingkai kerja SANE untuk menyokong kebanyakan "
 "pengimbas sedia ada."
 
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Tiada pengimbas hadir. Sila sambungkan pengimbas."
 
-#. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "Tidak boleh menyambung kepada pengimbas"
 
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "Tidak boleh memulakan imbasan"
 
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1236 src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr "Ralat berkomunikasi dengan pengimbas"
 
-#. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "Papar versi keluaran"
 
-#. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr "Papar mesej penyahpepijatan"
 
-#: ../src/simple-scan.vala:26
+#: src/simple-scan.vala:26
 msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr "Baiki fail PDF yang dijana dengan versi lama Pengimbas Ringkas"
 
-#. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:391
+#: src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Gagal mengimbas"
 
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DEVICE...] - Utiliti mengimbas"
 
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Jalankan '%s --help' untuk melihat senarai penuh pilihan baris perintah yang "
 "ada."
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:318 src/ui.vala:1602 src/ui.vala:1887
 msgid "_Close"
 msgstr "_Tutup"
 
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:327
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Nama pengguna dan kata laluan diperlukan untuk mencapai '%s'"
 
-#. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:375
 msgid "No scanners detected"
 msgstr "Tiada pengimbas dikesan"
 
-#. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:377
 msgid "Please check your scanner is connected and powered on"
 msgstr "Sila semak pengimbas anda sama ada ia bersambung dan dihidupkan"
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:382
 msgid "Additional software needed"
 msgstr "Perisian tambahan diperlukan"
 
-#. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr "Anda perlu pasang perisian pemacu untuk pengimbas anda."
 
-#. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:506 src/ui.vala:1843
 msgid "Save As..."
 msgstr "Simpan Sebagai..."
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:509 src/ui.vala:675
 msgid "_Cancel"
 msgstr "_Batal"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:510 src/ui.vala:676
 msgid "_Save"
 msgstr "_Simpan"
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "Dokumen Diimbas.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:521
 msgid "Image Files"
 msgstr "Fail Imej"
 
-#. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:527
 msgid "All Files"
 msgstr "Semua Fail"
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (dokumen berbilang-halaman)"
 
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (termampat)"
 
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (tidak hilang)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:557
 msgid "File format:"
 msgstr "Format fail:"
 
-#. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:650
 msgid "Failed to save file"
 msgstr "Gagal menyimpan fail"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:673
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Jika anda tidak simpan, semua perubahan akan hilang."
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:708
+#: src/ui.vala:708
 msgid "Save current document?"
 msgstr "Simpan dokumen semasa"
 
-#. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:710
 msgid "Discard Changes"
 msgstr "Abai Perubahan"
 
-#. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "Tidak boleh menyimpan imej untuk pratonton"
 
-#. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "Tidak boleh membuka aplikasi partonton imej"
 
-#. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1206
 msgid "Combine sides"
 msgstr "Gabung sisi"
 
-#. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr "Gabung sisi (songsang)"
 
-#. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1226
 msgid "Reverse"
 msgstr "Songsang"
 
-#. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr "Kekal tidak berubah"
 
-#. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "Tidak boleh membuka fail bantuan"
 
-#. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1472
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -640,17 +508,15 @@ msgstr ""
 "pengurus skrip Nautilus; jika tidak, laporkannya ke Free Software "
 "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "Mengenai Pengimbas Ringkas"
 
-#. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "Alat mengimbas dokumen mudah"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -661,23 +527,19 @@ msgstr ""
 "  ahmad akmal bin mohd idris https://launchpad.net/~mamahopsk87\n"
 "  dequan https://launchpad.net/~dequan"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "Simpan dokumen sebelum keluar?"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "Keluar tanpa Menyimpan"
 
-#. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr "Anda kelihatan mempunyai pengimbas Brother."
 
-#. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1581
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
@@ -685,13 +547,11 @@ msgstr ""
 "Pemacunya tersedia di <a href=\"http://support.brother.com\">laman sesawang "
 "Brother</a>."
 
-#. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr "Anda kelihatan mempunyai pengimbas Samsung."
 
-#. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1587
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
@@ -699,18 +559,15 @@ msgstr ""
 "Pemacunya tersedia di <a href=\"http://samsung.com/support\">laman sesawang "
 "Samsung</a>."
 
-#. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr "Anda kelihatan mempunyai pengimbas HP."
 
-#. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr "Anda kelihatan mempunyai pengimbas Epson."
 
-#. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1598
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
@@ -718,139 +575,125 @@ msgstr ""
 "Pemacu untuknya tersedia di <a href=\"http://support.epson.com\">laman "
 "sesawang Epson</a>."
 
-#. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1602
 msgid "Install drivers"
 msgstr "Pasang pemacu"
 
-#. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "Setelah dipasang anda perlu mulakan semula Pengimbas Ringkas."
 
-#. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr "Memasng pemacu..."
 
-#. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr "Pemacu berjaya dipasangkan!"
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Gagal memasang pemacu (kod ralat %d)."
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr "Gagal memasang pemacu."
 
-#. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1676
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr "Anda perlu pasang pakej(s) %s."
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (tersedia)"
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (draf)"
 
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (resolusi tinggi)"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/ui.vala:1793
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1835
 msgid "New Document"
 msgstr "Dokumen Baharu"
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1840
 msgid "Document"
 msgstr "Dokumen"
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1844
 msgid "Email..."
 msgstr "Emel..."
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1845
 msgid "Print..."
 msgstr "Cetak..."
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1853
 msgid "Help"
 msgstr "Bantuan"
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1854
 msgid "About"
 msgstr "Perihal"
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1855
 msgid "Quit"
 msgstr "Keluar"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "Ubah _Pengimbas"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr "_Pasang Pemacu"
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1897
 msgid "Automatic"
 msgstr "Automatik"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1947
 msgid "Darker"
 msgstr "Lebih Gelap"
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1949
 msgid "Lighter"
 msgstr "Lebih Cerah"
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:1957
 msgid "Less"
 msgstr "Kurang"
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:1959
 msgid "More"
 msgstr "Lagi"
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:1967
 msgid "Minimum"
 msgstr "Minimum"
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:1969
 msgid "Maximum"
 msgstr "Maksimum"
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2008
 msgid "Saving document..."
 msgstr "Menyimpan dokumen..."
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Menyimpan halaman %d daripada %d"
@@ -858,12 +701,33 @@ msgstr "Menyimpan halaman %d daripada %d"
 #~ msgid "4&#xD7;6"
 #~ msgstr "4&#xD7;6"
 
+#~ msgid "Device to scan from"
+#~ msgstr "Peranti untuk diimbas dari"
+
 #~ msgid "Direction of scan"
 #~ msgstr "Arah imbasan"
 
+#~ msgid "Directory to save files to"
+#~ msgstr "Direktori untuk menyimpan fail ke"
+
+#~ msgid "SANE device to acquire images from."
+#~ msgstr "Peranti SANE untuk memperoleh imej dari."
+
 #~ msgid "TRUE if the application window is maximized"
 #~ msgstr "BENAR jika tetingkap aplikasi dimaksimakan"
 
+#~ msgid "Resolution for photo scans"
+#~ msgstr "Resolusi untuk imbasan foto"
+
+#~ msgid "Resolution for text scans"
+#~ msgstr "Resolusi untuk imbasan teks"
+
+#~ msgid "Page side to scan"
+#~ msgstr "Sisi halaman untuk diimbaskan"
+
+#~ msgid "Height of paper in tenths of a mm"
+#~ msgstr "Tinggi ketar dalam persepuluh mm"
+
 #~ msgid "Resolution of last scanned image"
 #~ msgstr "Resolusi imej terakhir yang diimbas"
 
@@ -883,6 +747,9 @@ msgstr "Menyimpan halaman %d daripada %d"
 #~ msgid "Width of scanned image in pixels"
 #~ msgstr "Lebar imej terimbas dalam piksel"
 
+#~ msgid "Width of paper in tenths of a mm"
+#~ msgstr "Lebar kertas dalam persepuluh mm"
+
 #~ msgid "Window width in pixels"
 #~ msgstr "Lebar tetingkap dalam piksel"
 
@@ -906,6 +773,9 @@ msgstr "Menyimpan halaman %d daripada %d"
 #~ msgid "Files missing"
 #~ msgstr "Fail hilang"
 
+#~ msgid "The resolution in dots-per-inch to use when scanning text."
+#~ msgstr "Resolusi dalam titik-se-inci yang digunakan semasa mengimbas teks."
+
 #~ msgid ""
 #~ "The width of scanned image in pixels. This value is updated to what the last "
 #~ "scanned page was."
@@ -920,12 +790,35 @@ msgstr "Menyimpan halaman %d daripada %d"
 #~ "Tinggi imej yang diimbas dalam piksel. Nilai ini dikemaskini merujuk pada "
 #~ "halaman yang terakhir diimbas."
 
+#~ msgid "The resolution in dots-per-inch to use when scanning photos."
+#~ msgstr "Resolusi dalam titik-se-inci yang digunakan semasa mengimbas foto."
+
 #~ msgid ""
 #~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
 #~ msgstr ""
 #~ "Sisi halaman untuk diimbaskan. ia boleh salah satu seperti berikut: 'kedua-"
 #~ "dua' 'hadapan' 'belakang'"
 
+#~ msgid ""
+#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr ""
+#~ "Tinggi kertas dalam persepuluh mm (atau 0 untuk pengesanan kertas secara "
+#~ "automatik)."
+
+#~ msgid ""
+#~ "The directory to save files to. Defaults to the documents directory if unset."
+#~ msgstr ""
+#~ "Direktori untuk menyimpan fail. Nilai lalai direktori dokumen jika tidak "
+#~ "ditetapkan."
+
+#~ msgid ""
+#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr ""
+#~ "Lebar kertas dalam persepuluh mm (atau 0 untuk pengesanan kertas secara "
+#~ "automatik)."
+
 #~ msgid "The resolution in dots-per-inch of the previously scanned image."
 #~ msgstr "Resolusi dalam titik-se-inci imej yang terdahulu diimbas."
 
@@ -945,6 +838,9 @@ msgstr "Menyimpan halaman %d daripada %d"
 #~ "  --help-all Papar semua pilihan bantuan\n"
 #~ "  --help-gtk Papar pilihan GTK+"
 
+#~ msgid "Type of document being scanned"
+#~ msgstr "Jenis dokumen yang diimbas"
+
 #~ msgid ""
 #~ "Type of document being scanned. 'text' for text documents, 'photo' for "
 #~ "photos. This setting decides on the scan resolution, colors and post-"
@@ -973,5 +869,33 @@ msgstr "Menyimpan halaman %d daripada %d"
 #~ "  --gtk-module=MODULES Muat modul GTK+ tambahan\n"
 #~ "  --g-fatal-warnings Jadikan semua amaran mati"
 
+#~ msgid "The page side to scan."
+#~ msgstr "Sisi halaman untuk diimbas."
+
+#~ msgid ""
+#~ "Type of document being scanned. This setting decides on the scan resolution, "
+#~ "colors and post-processing."
+#~ msgstr ""
+#~ "Jenis dokumen yang akan diimbas. Tetapan ini menentukan resolusi, warna dan "
+#~ "post-pemproses imbasan."
+
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "Arah pengimbas merentasi halaman terimbas."
+
+#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
+#~ msgstr "Pelarasan beza jelas dari -100 hingga 100 (0 tiada perubahan)."
+
+#~ msgid "Contrast of scan"
+#~ msgstr "Beza jelas imbasan"
+
+#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
+#~ msgstr "Pelarasan kecerahan dari -100 hingga 100 (0 tiada perubahan)."
+
+#~ msgid "Brightness of scan"
+#~ msgstr "Kecerahan imbasan"
+
+#~ msgid "Quality value to use for JPEG compression."
+#~ msgstr "Nilai kualiti yang digunakan untuk pemampatan JPEG."
+
+#~ msgid "Quality value to use for JPEG compression"
+#~ msgstr "Nilai kualiti yang digunakan untuk pemampatan JPEG"
diff --git a/po/my.gmo b/po/my.gmo
new file mode 100644
index 0000000..042a29a
--- /dev/null
+++ b/po/my.gmo
diff --git a/po/my.po b/po/my.po
index dc2121e..9ae85c5 100644
--- a/po/my.po
+++ b/po/my.po
@@ -7,406 +7,309 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-06 14:16+1200\n"
+"POT-Creation-Date: 2016-07-29 12:47+1200\n"
 "PO-Revision-Date: 2012-04-17 06:12+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Burmese <my@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-04-14 05:39+0000\n"
-"X-Generator: Launchpad (build 17990)\n"
+"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 
 #. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:2
+#: data/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_A ခွင့်ပြုခြင်း"
 
 #. Label beside username entry
-#: ../data/simple-scan.ui.h:4
+#: data/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "_Username for resource:"
 
 #. Label beside password entry
-#: ../data/simple-scan.ui.h:6
+#: data/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Pစကားဝှက်"
 
 #. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:8
+#: data/simple-scan.ui:188
 msgid "Front and Back"
 msgstr "အရှေ့နှင့်အနောက်"
 
 #. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:10
+#: data/simple-scan.ui:192
 msgid "Front"
 msgstr "အရှေ့"
 
 #. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:12
+#: data/simple-scan.ui:196
 msgid "Back"
 msgstr "နောက်သို့"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
-#: ../data/appdata/simple-scan.appdata.xml.in.h:1
+#: data/simple-scan.ui:225 data/simple-scan.ui:809
+#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr "ရိုးရိုး Scan ဖတ်ခြင်း"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:16
+#: data/simple-scan.ui:241
 msgid "_Document"
 msgstr "_Dစာရွက်စာတမ်း"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:18
+#: data/simple-scan.ui:260
 msgid "Sc_an"
 msgstr "Sc_an"
 
+#. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:20
+#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
 msgid "Single _Page"
 msgstr "_P ရိုးရိုး Scan ဖတ်ခြင်း"
 
+#. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:22
+#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr "_F Feeder မှ စာမျက်နှာအားလုံး"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:24
+#: data/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "_S Scan ရပ်မည်။"
 
-#: ../data/simple-scan.ui.h:25
+#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
 msgid "Text"
 msgstr "စာ"
 
-#: ../data/simple-scan.ui.h:26
+#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
 msgid "Photo"
 msgstr "ဓာတ်ပုံ"
 
 #. Menu item to reorder pages
-#. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1183 ../src/ui.vala:1841
+#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr ""
 
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: data/simple-scan.ui:367
 msgid "_Email"
 msgstr "_Eအီးမေး"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: data/simple-scan.ui:430
 msgid "_Page"
 msgstr "_Pစာမျက်နှာ"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: data/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "_L ဘယ်ဖက်လှည့်ပါ။"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: data/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "_R ညာဖက်သို့လှည့်မည်။"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: data/simple-scan.ui:460
 msgid "_Crop"
 msgstr "_C ဖြတ်ပါ။"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: data/simple-scan.ui:470
 msgid "_None"
 msgstr "_Nဘာမှမဟုတ်"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: data/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: data/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: data/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: data/simple-scan.ui:514
 msgid "_Letter"
 msgstr "_L စာ"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: data/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: data/simple-scan.ui:536
 msgid "4×6"
 msgstr ""
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: data/simple-scan.ui:547
 msgid "_Custom"
 msgstr "_Custom"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: data/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr "_Rotate Crop"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: data/simple-scan.ui:578
 msgid "Move Left"
 msgstr "ဘယ်ဖက်သို့ရွှေ့ပါ။"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: data/simple-scan.ui:587
 msgid "Move Right"
 msgstr "ညာဖက်သို့ရွှေ့ပါ။"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: data/simple-scan.ui:624
 msgid "_Help"
 msgstr "_H အကူအညီ"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: data/simple-scan.ui:632
 msgid "_Contents"
 msgstr "_  C ခေါင်းစဉ်"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: data/simple-scan.ui:674 data/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "အသစ်စတင်ရန်"
 
-#: ../data/simple-scan.ui.h:67
+#: data/simple-scan.ui:675
 msgid "New"
 msgstr "အသစ်"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: data/simple-scan.ui:689 data/simple-scan.ui:836
 msgid "Scan a single page from the scanner"
 msgstr "Scanner ထဲမှ စာမျက်နှာ တစ်ရွက်တည်းကို Scan ဖတ်မည်။"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: data/simple-scan.ui:691 data/simple-scan.ui:837
 msgid "Scan"
 msgstr "Scan"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: data/simple-scan.ui:707 data/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "ဖိုင် တစ်ခုထဲသို့ စာရွက်စာတမ်း ကိုသိမ်းပါ။"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1842
+#: data/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "သိမ်းဆည်းပါ"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: data/simple-scan.ui:724 data/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "ယခု Scan ဖတ်နေခြင်းကိုရပ်မည်။"
 
-#: ../data/simple-scan.ui.h:77
+#: data/simple-scan.ui:725 data/simple-scan.ui:825
 msgid "Stop"
 msgstr "ရပ်မည်"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: data/simple-scan.ui:749 data/simple-scan.ui:936
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "စာမျက်နှာကို ဘယ်ဖက်သို့လှည့်ပါ။(နာရီလက်တံပြောင်းပြန်)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: data/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "ဘယ်ဖက် လှည့်ပါ။"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: data/simple-scan.ui:764 data/simple-scan.ui:914
 msgid "Rotate the page to the right (clockwise)"
 msgstr "စာမျက်နှာကို ညာဖက်သို့လှည့်ပါ။ (နာရီလက်တံ)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: data/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "ညာဖက်လှည့်ပါ။"
 
-#: ../data/simple-scan.ui.h:86
+#: data/simple-scan.ui:779 data/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "ရွေးချယ်ထားသောစာမျက်နှာကို ဖြတ်ပါ။"
 
-#: ../data/simple-scan.ui.h:87
+#: data/simple-scan.ui:781
 msgid "Crop"
 msgstr "ဖြတ်ပါ။"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1849
+#: data/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "Preferences"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: data/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "Scan S_ource:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: data/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "_Text Resolution:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: data/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "_Pဓာတ်ပုံ resolution-"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: data/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "Scan Side:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: data/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "စာရွက်အရွယ်အစား"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: data/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: data/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: data/simple-scan.ui:1260
 msgid "Quality:"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:2
+#: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:3
+#: data/simple-scan.desktop.in:5
 msgid "Scan Documents"
 msgstr "Scan Documents"
 
-#: ../data/simple-scan.desktop.in.h:4
+#: data/simple-scan.desktop.in:6
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Device to scan from"
-msgstr "ဘယ်ကိရိယာမှ Scan ဖတ်မည်..."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "SANE device to acquire images from."
-msgstr "SANE device to acquire images from."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "Type of document being scanned"
-msgstr "Scan ဖတ်မည့် စာရွက်စာတမ်း အမျိုးအစား"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
-msgid ""
-"Type of document being scanned. This setting decides on the scan resolution, "
-"colors and post-processing."
-msgstr ""
-"Type of document being scanned. This setting decides on the scan resolution, "
-"colors and post-processing."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
-msgid "Width of paper in tenths of a mm"
-msgstr "Width of paper in tenths of a mm"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
-msgid "Height of paper in tenths of a mm"
-msgstr "Height of paper in tenths of a mm"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "Brightness of scan"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "The brightness adjustment from -100 to 100 (0 being none)."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid "Contrast of scan"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "The contrast adjustment from -100 to 100 (0 being none)."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid "Resolution for text scans"
-msgstr "Resolution for text scans"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
-msgid "The resolution in dots-per-inch to use when scanning text."
-msgstr "The resolution in dots-per-inch to use when scanning text."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
-msgid "Resolution for photo scans"
-msgstr "Resolution for photo scans"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr "The resolution in dots-per-inch to use when scanning photos."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
-msgid "Page side to scan"
-msgstr "Page side to scan"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
-msgid "The page side to scan."
-msgstr "The page side to scan."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
-msgid "Directory to save files to"
-msgstr "ဖိုင်ကိုသိမ်းရန်အတွက်နေရာ"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
-msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
-msgstr ""
-"The directory to save files to. Defaults to the documents directory if unset."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
-msgid "Quality value to use for JPEG compression"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Quality value to use for JPEG compression."
+#: data/simple-scan.desktop.in:8
+msgid "scanner"
 msgstr ""
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+#: data/simple-scan.appdata.xml.in:8
 msgid ""
 "A really easy way to scan both documents and photos. You can crop out the "
 "bad parts of a photo and rotate it if it is the wrong way round. You can "
@@ -414,198 +317,164 @@ msgid ""
 "formats."
 msgstr ""
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+#: data/simple-scan.appdata.xml.in:13
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Scanner နှင့်ချိတ်ဆက်ထားခြင်းမရှိပါ။ Scanner နှင့်ချိတ်ဆက်ပါ။"
 
-#. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "Scanner နှင့်မချိတ်ဆက်နိုင်ပါ။"
 
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "Scan မစတင်နိုင်ပါ။"
 
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1236 src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr "Scanner နှင့်ချိတ်ဆက်ရင်းအမှားအယွင်းဖြစ်ခဲ့သည်။"
 
-#. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "ထုတ်လုပ်သော ဗားရှင်းကို ပြပါ"
 
-#. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr "Debugging messages ကိုစာရွက်ထုတ်မည်။"
 
-#: ../src/simple-scan.vala:26
+#: src/simple-scan.vala:26
 msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr "Fix PDF files generated with older versions of Simple Scan"
 
-#. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:391
+#: src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Scan မဖတ်ဖြစ်ပါ။"
 
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DEVICE...] - Scanning utility"
 
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr "အမိန့်ပေး စာရင်း အပြည့်အစုံမြင်ရရန်  '%s--help' ဖြင့် ခိုင်းပါ"
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:318 src/ui.vala:1602 src/ui.vala:1887
 msgid "_Close"
 msgstr ""
 
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:327
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "'%s' ကိုသုံးရန်အတွက်သုံးစွဲသူအမည်နှင့် စကားဝှက်လိုအပ်ပါသည်။"
 
-#. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:375
 msgid "No scanners detected"
 msgstr "Scanner ရှာမတွေ့ပါ။"
 
-#. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:377
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 "သင်၏ Scanner ကိုချိတ်ဆက်ပြီးကြောင်း၊ "
 "ပါဝါဖွင့်ထားကြောင်းသေချာအောင်ပြန်လည်စစ်ဆေးပါ။"
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:382
 msgid "Additional software needed"
 msgstr ""
 
-#. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr ""
 
-#. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:506 src/ui.vala:1843
 msgid "Save As..."
 msgstr "Save As..."
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:509 src/ui.vala:675
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:510 src/ui.vala:676
 msgid "_Save"
 msgstr ""
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "Scanned Document.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:521
 msgid "Image Files"
 msgstr "Image Files"
 
-#. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:527
 msgid "All Files"
 msgstr "ဖိုင်အလုံးစုံ"
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (multi-page document)"
 
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (compressed)"
 
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (lossless)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:557
 msgid "File format:"
 msgstr ""
 
-#. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:650
 msgid "Failed to save file"
 msgstr "ဖိုင်ကိုမသိမ်းဖြစ်ပါ။"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:673
 msgid "If you don't save, changes will be permanently lost."
 msgstr "မသိမ်းပါက၊ ပြောင်းလဲမူများသည် လုံးဝပျက်သွားပါလိမ့်မည်။"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:708
+#: src/ui.vala:708
 msgid "Save current document?"
 msgstr "ယခုစာရွက်စာတမ်းကိုသိမ်းမလား။"
 
-#. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:710
 msgid "Discard Changes"
 msgstr "Discard Changes"
 
-#. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "ကြည့်ရူရန်အတွက် ပုံများကိုမသိမ်းနိုင်ပါ။"
 
-#. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "Unable to open image preview application"
 
-#. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1206
 msgid "Combine sides"
 msgstr ""
 
-#. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr ""
 
-#. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1226
 msgid "Reverse"
 msgstr ""
 
-#. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr ""
 
-#. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "အကူအညီဖိုင်ကို မဖွင့်နိုင်ပါ။"
 
-#. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1472
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -633,207 +502,182 @@ msgstr ""
 "You should have received a copy of the GNU General Public License\n"
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 
-#. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "ရိုးရှင်းစွာ Scan ဖတ်ခြင်းအကြောင်း"
 
-#. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "Simple document scanning tool"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Bone Pyae Sone https://launchpad.net/~bonepyaesone\n"
 "  Pyae Sone https://launchpad.net/~gipsyhnh"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "မပိတ်ခင် စာရွက်စာတမ်းများကိုသိမ်းမလား။"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "မသိမ်းပဲနှင့်ထွက်မည်။"
 
-#. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
-#. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1581
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
 msgstr ""
 
-#. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
-#. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1587
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
 msgstr ""
 
-#. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr ""
 
-#. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
-#. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1598
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
 msgstr ""
 
-#. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1602
 msgid "Install drivers"
 msgstr ""
 
-#. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
-#. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr ""
 
-#. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr ""
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr ""
 
-#. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1676
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr ""
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (default)"
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (draft)"
 
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (high resolution)"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/ui.vala:1793
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1835
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1840
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1844
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1845
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1853
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1854
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1855
 msgid "Quit"
 msgstr ""
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "Change _Scanner"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr ""
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1897
 msgid "Automatic"
 msgstr "အလိုအလျှောက်"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1947
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1949
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:1957
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:1959
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:1967
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:1969
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2008
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
@@ -841,12 +685,34 @@ msgstr ""
 #~ msgid "4&#xD7;6"
 #~ msgstr "4&#xD7;6"
 
+#~ msgid "Page side to scan"
+#~ msgstr "Page side to scan"
+
+#~ msgid "Height of paper in tenths of a mm"
+#~ msgstr "Height of paper in tenths of a mm"
+
 #~ msgid "Height of scanned image in pixels"
 #~ msgstr "Height of scanned image in pixels"
 
+#~ msgid "Device to scan from"
+#~ msgstr "ဘယ်ကိရိယာမှ Scan ဖတ်မည်..."
+
 #~ msgid "Direction of scan"
 #~ msgstr "Scan ၏ လားရာ"
 
+#~ msgid "Directory to save files to"
+#~ msgstr "ဖိုင်ကိုသိမ်းရန်အတွက်နေရာ"
+
+#~ msgid ""
+#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr ""
+#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+
+#~ msgid "The page side to scan."
+#~ msgstr "The page side to scan."
+
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "The direction of the scanner across the scanned page."
 
@@ -860,9 +726,40 @@ msgstr ""
 #~ "The height of scanned image in pixels. This value is updated to what the "
 #~ "last scanned page was."
 
+#~ msgid "SANE device to acquire images from."
+#~ msgstr "SANE device to acquire images from."
+
+#~ msgid "Resolution for text scans"
+#~ msgstr "Resolution for text scans"
+
+#~ msgid "Resolution for photo scans"
+#~ msgstr "Resolution for photo scans"
+
 #~ msgid "Resolution of last scanned image"
 #~ msgstr "Resolution of last scanned image"
 
+#~ msgid ""
+#~ "The directory to save files to. Defaults to the documents directory if unset."
+#~ msgstr ""
+#~ "The directory to save files to. Defaults to the documents directory if unset."
+
+#~ msgid ""
+#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr ""
+#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+
+#~ msgid ""
+#~ "Type of document being scanned. This setting decides on the scan resolution, "
+#~ "colors and post-processing."
+#~ msgstr ""
+#~ "Type of document being scanned. This setting decides on the scan resolution, "
+#~ "colors and post-processing."
+
+#~ msgid "Type of document being scanned"
+#~ msgstr "Scan ဖတ်မည့် စာရွက်စာတမ်း အမျိုးအစား"
+
 #~ msgid "Window height in pixels"
 #~ msgstr "Window height in pixels"
 
@@ -876,9 +773,18 @@ msgstr ""
 #~ msgid "The resolution in dots-per-inch of the previously scanned image."
 #~ msgstr "The resolution in dots-per-inch of the previously scanned image."
 
+#~ msgid "The resolution in dots-per-inch to use when scanning text."
+#~ msgstr "The resolution in dots-per-inch to use when scanning text."
+
+#~ msgid "The resolution in dots-per-inch to use when scanning photos."
+#~ msgstr "The resolution in dots-per-inch to use when scanning photos."
+
 #~ msgid "Width of scanned image in pixels"
 #~ msgstr "Width of scanned image in pixels"
 
+#~ msgid "Width of paper in tenths of a mm"
+#~ msgstr "Width of paper in tenths of a mm"
+
 #~ msgid "Window width in pixels"
 #~ msgstr "Window width in pixels"
 
diff --git a/po/nb.gmo b/po/nb.gmo
new file mode 100644
index 0000000..e4b5481
--- /dev/null
+++ b/po/nb.gmo
diff --git a/po/nb.po b/po/nb.po
index 98c6abc..eb88b67 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -7,405 +7,309 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-06 14:16+1200\n"
+"POT-Creation-Date: 2016-07-29 12:47+1200\n"
 "PO-Revision-Date: 2014-09-02 16:41+0000\n"
 "Last-Translator: Kjetil Birkeland Moe <kjetil@skifremme.no>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-04-14 05:40+0000\n"
-"X-Generator: Launchpad (build 17990)\n"
+"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 
 #. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:2
+#: data/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_Autoriser"
 
 #. Label beside username entry
-#: ../data/simple-scan.ui.h:4
+#: data/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "_Brukernavn for ressurs:"
 
 #. Label beside password entry
-#: ../data/simple-scan.ui.h:6
+#: data/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Passord:"
 
 #. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:8
+#: data/simple-scan.ui:188
 msgid "Front and Back"
 msgstr "For- og bakside"
 
 #. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:10
+#: data/simple-scan.ui:192
 msgid "Front"
 msgstr "Forside"
 
 #. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:12
+#: data/simple-scan.ui:196
 msgid "Back"
 msgstr "Bakside"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
-#: ../data/appdata/simple-scan.appdata.xml.in.h:1
+#: data/simple-scan.ui:225 data/simple-scan.ui:809
+#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr "Simple Scan"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:16
+#: data/simple-scan.ui:241
 msgid "_Document"
 msgstr "_Dokument"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:18
+#: data/simple-scan.ui:260
 msgid "Sc_an"
 msgstr "Sk_ann"
 
+#. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:20
+#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
 msgid "Single _Page"
 msgstr "Enkel _side"
 
+#. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:22
+#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr "Alle sider fra papirmater"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:24
+#: data/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "_Stopp skanning"
 
-#: ../data/simple-scan.ui.h:25
+#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
 msgid "Text"
 msgstr "Tekst"
 
-#: ../data/simple-scan.ui.h:26
+#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
 msgid "Photo"
 msgstr "Bilde"
 
 #. Menu item to reorder pages
-#. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1183 ../src/ui.vala:1841
+#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr "Omplasser sider"
 
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: data/simple-scan.ui:367
 msgid "_Email"
 msgstr "_E-post"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: data/simple-scan.ui:430
 msgid "_Page"
 msgstr "_Side"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: data/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "Roter mot _venstre"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: data/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "Roter mot _høyre"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: data/simple-scan.ui:460
 msgid "_Crop"
 msgstr "_Beskjær"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: data/simple-scan.ui:470
 msgid "_None"
 msgstr "_Ingen"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: data/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: data/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: data/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: data/simple-scan.ui:514
 msgid "_Letter"
 msgstr "US _Letter"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: data/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "US Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: data/simple-scan.ui:536
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: data/simple-scan.ui:547
 msgid "_Custom"
 msgstr "E_gendefinert"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: data/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr "_Roter beskjæringsområdet"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: data/simple-scan.ui:578
 msgid "Move Left"
 msgstr "Flytt til venstre"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: data/simple-scan.ui:587
 msgid "Move Right"
 msgstr "Flytt til høyre"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: data/simple-scan.ui:624
 msgid "_Help"
 msgstr "_Hjelp"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: data/simple-scan.ui:632
 msgid "_Contents"
 msgstr "_Innhold"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: data/simple-scan.ui:674 data/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "Begynn et nytt dokument"
 
-#: ../data/simple-scan.ui.h:67
+#: data/simple-scan.ui:675
 msgid "New"
 msgstr "Ny"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: data/simple-scan.ui:689 data/simple-scan.ui:836
 msgid "Scan a single page from the scanner"
 msgstr "Skann én enkel side fra skanneren"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: data/simple-scan.ui:691 data/simple-scan.ui:837
 msgid "Scan"
 msgstr "Skann"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: data/simple-scan.ui:707 data/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "Lagre dokument til fil"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1842
+#: data/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "Lagre"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: data/simple-scan.ui:724 data/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "Stopp skanning"
 
-#: ../data/simple-scan.ui.h:77
+#: data/simple-scan.ui:725 data/simple-scan.ui:825
 msgid "Stop"
 msgstr "Stopp"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: data/simple-scan.ui:749 data/simple-scan.ui:936
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Roter siden til venstre (mot urviseren)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: data/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "Roter mot venstre"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: data/simple-scan.ui:764 data/simple-scan.ui:914
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Roter siden til høyre (med urviseren)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: data/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "Roter mot høyre"
 
-#: ../data/simple-scan.ui.h:86
+#: data/simple-scan.ui:779 data/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "Beskjær valgt side"
 
-#: ../data/simple-scan.ui.h:87
+#: data/simple-scan.ui:781
 msgid "Crop"
 msgstr "Beskjær"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1849
+#: data/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "Innstillinger"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: data/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "Hent fra:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: data/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "_Tekstoppløsning"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: data/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "_Bildeoppløsning:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: data/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "Skann side:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: data/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "Sidestørrelse:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: data/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "Lysstyrke:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: data/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "Kontrast:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: data/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "Kvalitet:"
 
-#: ../data/simple-scan.desktop.in.h:2
+#: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr "Dokumentskanner"
 
-#: ../data/simple-scan.desktop.in.h:3
+#: data/simple-scan.desktop.in:5
 msgid "Scan Documents"
 msgstr "Skann dokumenter"
 
-#: ../data/simple-scan.desktop.in.h:4
+#: data/simple-scan.desktop.in:6
 msgid "scan;scanner;flatbed;adf;"
 msgstr "skan;skanner;plan;adf;"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Device to scan from"
-msgstr "Enhet det skal skannes fra"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "SANE device to acquire images from."
-msgstr "SANE-enhet som bilder skal hentes fra."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "Type of document being scanned"
-msgstr "Dokumenttype som skannes"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
-msgid ""
-"Type of document being scanned. This setting decides on the scan resolution, "
-"colors and post-processing."
+#: data/simple-scan.desktop.in:8
+msgid "scanner"
 msgstr ""
-"Dokumenttype som skal scannes. Denne innstillingen endrer oppløsning, farger "
-"og etterbehandling."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
-msgid "Width of paper in tenths of a mm"
-msgstr "Papirbredde i tiendels millimeter"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-"Papirbredden i tiendels millimeter (eller 0 for automatisk gjenkjenning)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
-msgid "Height of paper in tenths of a mm"
-msgstr "Papirhøyde i tiendels millimeter"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-"Papirhøyde i tiendels millimeter (eller 0 for automatisk gjenkjenning)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "Brightness of scan"
-msgstr "Skanningens ysstyrke"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "The brightness adjustment from -100 to 100 (0 being none)."
-msgstr "Justering av lysstyrke fra -100 til 100 (0 betyr ingen lys)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid "Contrast of scan"
-msgstr "Skanningens kontrastforsterkning"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "The contrast adjustment from -100 to 100 (0 being none)."
-msgstr ""
-"Justering av kontrast fra -100 til 100 (en verdi på 0 gir ingen "
-"forsterkning)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid "Resolution for text scans"
-msgstr "Oppløsning for tekstskanning"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
-msgid "The resolution in dots-per-inch to use when scanning text."
-msgstr "Oppløsningen i punkter-per-tomme for skanning av tekst."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
-msgid "Resolution for photo scans"
-msgstr "Oppløsning for bildeskanning"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr "Oppløsning i punkter-per-tomme for skanning av bilder."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
-msgid "Page side to scan"
-msgstr "Side som skal skannes"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
-msgid "The page side to scan."
-msgstr "Siden som skal scannes."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
-msgid "Directory to save files to"
-msgstr "Lagre filer i mappe"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
-msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
-msgstr "Mappen filer skal lagres til. Standard er dokumentmappen."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
-msgid "Quality value to use for JPEG compression"
-msgstr "Kvalitetsverdi som skal brukes til JPEG-komprimering"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Quality value to use for JPEG compression."
-msgstr "Kvalitetsverdi som skal brukes til JPEG-komprimering"
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+#: data/simple-scan.appdata.xml.in:8
 msgid ""
 "A really easy way to scan both documents and photos. You can crop out the "
 "bad parts of a photo and rotate it if it is the wrong way round. You can "
@@ -416,199 +320,165 @@ msgstr ""
 "deler og rotere bilder hvis de skannes inn feil vei. Skannede elementer kan "
 "skrives ut, eksporteres i pdf-format og lagres i ulike bildeformater."
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+#: data/simple-scan.appdata.xml.in:13
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 "Simple Scan bruker rammeverket SANE til å støtte de vanligste skannerne."
 
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Ingen skanner tilgjengelig. Koble til en skanner."
 
-#. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "Klarte ikke å koble til skanneren"
 
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "Klarte ikke å sette i gang skanneren"
 
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1236 src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr "Det oppsto en kommunikasjonsfeil mellom skanneren og datamaskinen"
 
-#. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "Vis utgivelsesversjon"
 
-#. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr "Vis feilsøkingsmeldinger"
 
-#: ../src/simple-scan.vala:26
+#: src/simple-scan.vala:26
 msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr ""
 "Reparer PDF-filer som er opprettet med eldre versjoner av Simple Scan"
 
-#. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:391
+#: src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Klarte ikke å utføre skanningen"
 
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[ENHET...] - Scanneutstyr"
 
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Kjør «%s --help» for å se en full liste over tilgjengelige kommandolinjevalg."
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:318 src/ui.vala:1602 src/ui.vala:1887
 msgid "_Close"
 msgstr "_Lukk"
 
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:327
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Behøver brukernavn og passord for å få tilgang til '%s'"
 
-#. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:375
 msgid "No scanners detected"
 msgstr "Fant ingen skannere"
 
-#. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:377
 msgid "Please check your scanner is connected and powered on"
 msgstr "Undersøk om skanneren er riktig tilkoblet, og at den er slått på"
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:382
 msgid "Additional software needed"
 msgstr "Tilleggsprogram må installeres"
 
-#. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr "Du må installere en driver for denne skanneren."
 
-#. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:506 src/ui.vala:1843
 msgid "Save As..."
 msgstr "Lagre som..."
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:509 src/ui.vala:675
 msgid "_Cancel"
 msgstr "_Avbryt"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:510 src/ui.vala:676
 msgid "_Save"
 msgstr "_Lagre"
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "Skannet_dokument.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:521
 msgid "Image Files"
 msgstr "Bildefiler"
 
-#. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:527
 msgid "All Files"
 msgstr "Alle Filer"
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (flersidig dokument)"
 
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (komprimert)"
 
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (tapsfri)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:557
 msgid "File format:"
 msgstr "Filformat:"
 
-#. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:650
 msgid "Failed to save file"
 msgstr "Lagring av fil mislyktes"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:673
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Hvis du ikke lagrer vil endringene gå tapt."
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:708
+#: src/ui.vala:708
 msgid "Save current document?"
 msgstr "Lagre gjeldende dokument?"
 
-#. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:710
 msgid "Discard Changes"
 msgstr "Forkast endringer"
 
-#. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "Klarte ikke å lagre forhåndsvisning"
 
-#. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "Åpning av forhåndsvisning mislyktes"
 
-#. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1206
 msgid "Combine sides"
 msgstr "Kombiner sider"
 
-#. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr "Kombiner sider (omvendt)"
 
-#. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1226
 msgid "Reverse"
 msgstr "Omvendt"
 
-#. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr "Behold uendret"
 
-#. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "Klarte ikke å åpne hjelpefil"
 
-#. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1472
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -636,17 +506,15 @@ msgstr ""
 "You should have received a copy of the GNU General Public License\n"
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 
-#. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "Om Simple Scan"
 
-#. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "Enkelt verktøy for å skanne dokumenter"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -658,23 +526,19 @@ msgstr ""
 "  kingu https://launchpad.net/~comradekingu\n"
 "  Åka Sikrom https://launchpad.net/~akrosikam"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "Lagre dokumentet før du avslutter?"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "Avslutt uten å lagre"
 
-#. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr "Det ser ut som at du har en Brother-skanner."
 
-#. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1581
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
@@ -682,13 +546,11 @@ msgstr ""
 "Du skal kunne finne drivere på <a "
 "href=\"http://support.brother.com\">Brothers nettsider</a>."
 
-#. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr "Det ser ut som at du har en Samsung-skanner."
 
-#. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1587
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
@@ -696,18 +558,15 @@ msgstr ""
 "Du skal kunne finne drivere på <a "
 "href=\"http://samsung.com/support\">Samsungs nettsider</a>."
 
-#. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr "Det ser ut som at du har en HP-skanner."
 
-#. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr "Det ser ut som at du har en Epson-skanner."
 
-#. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1598
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
@@ -715,139 +574,125 @@ msgstr ""
 "Drivere er tilgjengelig på <a href=\"http://support.epson.com\">Epson</a>s "
 "nettside."
 
-#. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1602
 msgid "Install drivers"
 msgstr "Installer drivere"
 
-#. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "Start Simple Scan på nytt når driveren er installert."
 
-#. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr "Installerer drivere …"
 
-#. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr "Driverne er nå installert."
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Klarte ikke å installere drivere (feilkode %d)."
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr "Klarte ikke å installere drivere."
 
-#. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1676
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr "Du må installere pakka/pakkene for %s."
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (standard)"
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (kladd)"
 
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (høy oppløsning)"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/ui.vala:1793
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1835
 msgid "New Document"
 msgstr "Nytt dokument"
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1840
 msgid "Document"
 msgstr "Dokument"
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1844
 msgid "Email..."
 msgstr "E-post …"
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1845
 msgid "Print..."
 msgstr "Skriv ut …"
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1853
 msgid "Help"
 msgstr "Hjelp"
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1854
 msgid "About"
 msgstr "Om"
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1855
 msgid "Quit"
 msgstr "Avslutt"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "Bytt _skanner"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr "_Installer drivere"
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1897
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1947
 msgid "Darker"
 msgstr "Mørkere"
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1949
 msgid "Lighter"
 msgstr "Lysere"
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:1957
 msgid "Less"
 msgstr "Mindre"
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:1959
 msgid "More"
 msgstr "Mer"
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:1967
 msgid "Minimum"
 msgstr "Minimum"
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:1969
 msgid "Maximum"
 msgstr "Maksimum"
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2008
 msgid "Saving document..."
 msgstr "Lagrer dokument …"
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Lagrer side nr. %d av %d"
@@ -861,12 +706,27 @@ msgstr "Lagrer side nr. %d av %d"
 #~ msgid "Height of scanned image in pixels"
 #~ msgstr "Høyde på skannede bilder, i pixler"
 
+#~ msgid "Resolution for photo scans"
+#~ msgstr "Oppløsning for bildeskanning"
+
+#~ msgid "Resolution for text scans"
+#~ msgstr "Oppløsning for tekstskanning"
+
+#~ msgid "Device to scan from"
+#~ msgstr "Enhet det skal skannes fra"
+
+#~ msgid "SANE device to acquire images from."
+#~ msgstr "SANE-enhet som bilder skal hentes fra."
+
 #~ msgid "Direction of scan"
 #~ msgstr "Skanneretning"
 
 #~ msgid "Resolution of last scanned image"
 #~ msgstr "Oppløsning på sist skannede bilde"
 
+#~ msgid "Directory to save files to"
+#~ msgstr "Lagre filer i mappe"
+
 #~ msgid ""
 #~ "The direction of the scanner across the scanned page. It can be one of the "
 #~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
@@ -874,6 +734,9 @@ msgstr "Lagrer side nr. %d av %d"
 #~ "Retning skanneren skal gjøre over siden. Den kan være en av følgende: 'topp-"
 #~ "til-bunn' 'bunn-til-topp' 'venstre-til-høyre' 'høyre-til-venstre'"
 
+#~ msgid "Type of document being scanned"
+#~ msgstr "Dokumenttype som skannes"
+
 #~ msgid ""
 #~ "Type of document being scanned. 'text' for text documents, 'photo' for "
 #~ "photos. This setting decides on the scan resolution, colors and post-"
@@ -902,6 +765,16 @@ msgstr "Lagrer side nr. %d av %d"
 #~ msgid "The resolution in dots-per-inch of the previously scanned image."
 #~ msgstr "Oppløsning i punkter-per-tomme til sist utførte skanning."
 
+#~ msgid "The resolution in dots-per-inch to use when scanning text."
+#~ msgstr "Oppløsningen i punkter-per-tomme for skanning av tekst."
+
+#~ msgid "The resolution in dots-per-inch to use when scanning photos."
+#~ msgstr "Oppløsning i punkter-per-tomme for skanning av bilder."
+
+#~ msgid ""
+#~ "The directory to save files to. Defaults to the documents directory if unset."
+#~ msgstr "Mappen filer skal lagres til. Standard er dokumentmappen."
+
 #~ msgid "Window height in pixels"
 #~ msgstr "Vindushøyde i pixler"
 
@@ -972,5 +845,56 @@ msgstr "Lagrer side nr. %d av %d"
 #~ "Siden som skal skannes. Det kan være én av følgende: 'begge' 'forside' "
 #~ "'bakside'"
 
+#~ msgid "Page side to scan"
+#~ msgstr "Side som skal skannes"
+
+#~ msgid "Height of paper in tenths of a mm"
+#~ msgstr "Papirhøyde i tiendels millimeter"
+
+#~ msgid ""
+#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr ""
+#~ "Papirhøyde i tiendels millimeter (eller 0 for automatisk gjenkjenning)."
+
+#~ msgid ""
+#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr ""
+#~ "Papirbredden i tiendels millimeter (eller 0 for automatisk gjenkjenning)."
+
+#~ msgid "Width of paper in tenths of a mm"
+#~ msgstr "Papirbredde i tiendels millimeter"
+
+#~ msgid "The page side to scan."
+#~ msgstr "Siden som skal scannes."
+
+#~ msgid ""
+#~ "Type of document being scanned. This setting decides on the scan resolution, "
+#~ "colors and post-processing."
+#~ msgstr ""
+#~ "Dokumenttype som skal scannes. Denne innstillingen endrer oppløsning, farger "
+#~ "og etterbehandling."
+
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "Retningen til scanneren over den scannede siden."
+
+#~ msgid "Quality value to use for JPEG compression."
+#~ msgstr "Kvalitetsverdi som skal brukes til JPEG-komprimering"
+
+#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
+#~ msgstr ""
+#~ "Justering av kontrast fra -100 til 100 (en verdi på 0 gir ingen "
+#~ "forsterkning)."
+
+#~ msgid "Contrast of scan"
+#~ msgstr "Skanningens kontrastforsterkning"
+
+#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
+#~ msgstr "Justering av lysstyrke fra -100 til 100 (0 betyr ingen lys)."
+
+#~ msgid "Brightness of scan"
+#~ msgstr "Skanningens ysstyrke"
+
+#~ msgid "Quality value to use for JPEG compression"
+#~ msgstr "Kvalitetsverdi som skal brukes til JPEG-komprimering"
diff --git a/po/nl.gmo b/po/nl.gmo
new file mode 100644
index 0000000..f20007f
--- /dev/null
+++ b/po/nl.gmo
diff --git a/po/nl.po b/po/nl.po
index b7d32b9..e9d865c 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,411 +7,309 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-06 14:16+1200\n"
+"POT-Creation-Date: 2016-07-29 12:47+1200\n"
 "PO-Revision-Date: 2012-07-23 09:04+0000\n"
 "Last-Translator: Robert Ancell <robert.ancell@canonical.com>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-04-14 05:39+0000\n"
-"X-Generator: Launchpad (build 17990)\n"
+"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 
 #. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:2
+#: data/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "M_achtigen"
 
 #. Label beside username entry
-#: ../data/simple-scan.ui.h:4
+#: data/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "Gebr_uikersnaam voor bron:"
 
 #. Label beside password entry
-#: ../data/simple-scan.ui.h:6
+#: data/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Wachtwoord:"
 
 #. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:8
+#: data/simple-scan.ui:188
 msgid "Front and Back"
 msgstr "Voor- en achterzijde"
 
 #. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:10
+#: data/simple-scan.ui:192
 msgid "Front"
 msgstr "Voorzijde"
 
 #. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:12
+#: data/simple-scan.ui:196
 msgid "Back"
 msgstr "Achterzijde"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
-#: ../data/appdata/simple-scan.appdata.xml.in.h:1
+#: data/simple-scan.ui:225 data/simple-scan.ui:809
+#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr "Scannen"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:16
+#: data/simple-scan.ui:241
 msgid "_Document"
 msgstr "_Document"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:18
+#: data/simple-scan.ui:260
 msgid "Sc_an"
 msgstr "Sc_annen"
 
+#. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:20
+#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
 msgid "Single _Page"
 msgstr "Enkele _pagina"
 
+#. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:22
+#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr "Alle pagina's van in_voer"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:24
+#: data/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "_Scannen staken"
 
-#: ../data/simple-scan.ui.h:25
+#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
 msgid "Text"
 msgstr "Tekst"
 
-#: ../data/simple-scan.ui.h:26
+#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
 msgid "Photo"
 msgstr "Foto"
 
 #. Menu item to reorder pages
-#. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1183 ../src/ui.vala:1841
+#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr "Bladzijden herschikken"
 
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: data/simple-scan.ui:367
 msgid "_Email"
 msgstr "_E-mailen"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: data/simple-scan.ui:430
 msgid "_Page"
 msgstr "_Pagina"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: data/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "_Linksom draaien"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: data/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "_Rechtsom draaien"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: data/simple-scan.ui:460
 msgid "_Crop"
 msgstr "_Bijsnijden"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: data/simple-scan.ui:470
 msgid "_None"
 msgstr "_Geen"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: data/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: data/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: data/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: data/simple-scan.ui:514
 msgid "_Letter"
 msgstr "VS _Letter"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: data/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "VS Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: data/simple-scan.ui:536
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: data/simple-scan.ui:547
 msgid "_Custom"
 msgstr "_Aangepast"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: data/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr "Bijsnijden d_raaien"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: data/simple-scan.ui:578
 msgid "Move Left"
 msgstr "Naar links verplaatsen"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: data/simple-scan.ui:587
 msgid "Move Right"
 msgstr "Naar rechts verplaatsen"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: data/simple-scan.ui:624
 msgid "_Help"
 msgstr "_Hulp"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: data/simple-scan.ui:632
 msgid "_Contents"
 msgstr "_Inhoud"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: data/simple-scan.ui:674 data/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "Een nieuw document beginnen"
 
-#: ../data/simple-scan.ui.h:67
+#: data/simple-scan.ui:675
 msgid "New"
 msgstr "Nieuw"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: data/simple-scan.ui:689 data/simple-scan.ui:836
 msgid "Scan a single page from the scanner"
 msgstr "Een enkele pagina scannen"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: data/simple-scan.ui:691 data/simple-scan.ui:837
 msgid "Scan"
 msgstr "Scannen"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: data/simple-scan.ui:707 data/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "Document naar een bestand opslaan"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1842
+#: data/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "Opslaan"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: data/simple-scan.ui:724 data/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "De huidige scan stoppen"
 
-#: ../data/simple-scan.ui.h:77
+#: data/simple-scan.ui:725 data/simple-scan.ui:825
 msgid "Stop"
 msgstr "Stoppen"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: data/simple-scan.ui:749 data/simple-scan.ui:936
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "De pagina linksom draaien (tegen de klok in)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: data/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "Linksom draaien"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: data/simple-scan.ui:764 data/simple-scan.ui:914
 msgid "Rotate the page to the right (clockwise)"
 msgstr "De pagina rechtsom draaien (met de klok mee)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: data/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "Rechtsom draaien"
 
-#: ../data/simple-scan.ui.h:86
+#: data/simple-scan.ui:779 data/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "De geselecteerde pagina bijsnijden"
 
-#: ../data/simple-scan.ui.h:87
+#: data/simple-scan.ui:781
 msgid "Crop"
 msgstr "Bijsnijden"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1849
+#: data/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "Voorkeuren"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: data/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "Scanner:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: data/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "_Tekstresolutie:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: data/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "_Fotoresolutie:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: data/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "Scangrootte:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: data/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "Paginagrootte:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: data/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "Helderheid:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: data/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "Contrast:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: data/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "Kwaliteit:"
 
-#: ../data/simple-scan.desktop.in.h:2
+#: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr "Documentenscanner"
 
-#: ../data/simple-scan.desktop.in.h:3
+#: data/simple-scan.desktop.in:5
 msgid "Scan Documents"
 msgstr "Documenten scannen"
 
-#: ../data/simple-scan.desktop.in.h:4
+#: data/simple-scan.desktop.in:6
 msgid "scan;scanner;flatbed;adf;"
 msgstr "scan;scanner;flatbed;adf;"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Device to scan from"
-msgstr "Te gebruiken scanapparaat"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "SANE device to acquire images from."
-msgstr "SANE-apparaat om beeld van te ontvangen"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "Type of document being scanned"
-msgstr "Type document dat gescand wordt"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
-msgid ""
-"Type of document being scanned. This setting decides on the scan resolution, "
-"colors and post-processing."
-msgstr ""
-"Het type document dat gescand wordt. Deze instelling bepaalt de te scannen "
-"resolutie, kleuren en nabewerking."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
-msgid "Width of paper in tenths of a mm"
-msgstr "Breedte van het papier in tienden van een mm"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
+#: data/simple-scan.desktop.in:8
+msgid "scanner"
 msgstr ""
-"De breedte van het papier in tienden van een mm (of 0 voor automatische "
-"papierdetectie)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
-msgid "Height of paper in tenths of a mm"
-msgstr "Hoogte van het papier in tienden van een mm"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-"De hoogte van het papier in tienden van een mm (of 0 voor automatische "
-"papierdetectie)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "Brightness of scan"
-msgstr "Helderheid van de scan"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "The brightness adjustment from -100 to 100 (0 being none)."
-msgstr "Aanpassing van de helderheid van -100 tot 100 (0 is geen)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid "Contrast of scan"
-msgstr "Contrast van de scan"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "The contrast adjustment from -100 to 100 (0 being none)."
-msgstr "Aanpassing van het contrast van -100 tot 100 (0 is geen)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid "Resolution for text scans"
-msgstr "Resolutie voor gescande tekst"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
-msgid "The resolution in dots-per-inch to use when scanning text."
-msgstr ""
-"De te gebruiken resolutie in punten-per-inch (dtp) tijdens het scannen van "
-"tekst."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
-msgid "Resolution for photo scans"
-msgstr "Resolutie voor gescande foto's"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr ""
-"De te gebruiken resolutie in punten-per-inch (dtp) tijdens het scannen van "
-"foto's."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
-msgid "Page side to scan"
-msgstr "Te scannen paginazijde"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
-msgid "The page side to scan."
-msgstr "De paginazijde om te scannen."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
-msgid "Directory to save files to"
-msgstr "Map om bestanden in op te slaan"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
-msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
-msgstr ""
-"De map waarin bestanden worden opgeslagen. Dit is standaard de map "
-"Documenten indien niet ingesteld."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
-msgid "Quality value to use for JPEG compression"
-msgstr "De kwaliteitswaarde die gebruikt zal worden voor JPEG-compressie"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Quality value to use for JPEG compression."
-msgstr "De kwaliteitswaarde die gebruikt zal worden voor JPEG-compressie."
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+#: data/simple-scan.appdata.xml.in:8
 msgid ""
 "A really easy way to scan both documents and photos. You can crop out the "
 "bad parts of a photo and rotate it if it is the wrong way round. You can "
@@ -423,204 +321,170 @@ msgstr ""
 "staat. U kunt uw scans afdrukken, exporteren naar pdf, of opslaan in een "
 "reeks afbeeldingsbestandsoorten."
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+#: data/simple-scan.appdata.xml.in:13
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 "Simple Scan gebruikt het SANE-kader om de meeste scanners te kunnen "
 "gebruiken."
 
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr ""
 "Geen scanners beschikbaar. Sluit een scanner aan om dit programma te "
 "gebruiken."
 
-#. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "Kan niet verbinden met de scanner"
 
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "Kan de scan niet starten"
 
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1236 src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr "Fout tijdens het communiceren met de scanner"
 
-#. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "Uitgaveversie tonen"
 
-#. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr "Debugberichten weergeven"
 
-#: ../src/simple-scan.vala:26
+#: src/simple-scan.vala:26
 msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr ""
 "PDF-bestanden repareren die gegenereerd zijn door oudere versies van Simple "
 "Scan"
 
-#. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:391
+#: src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Scannen is mislukt"
 
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[APPARAAT...] - Hulpmiddel voor scannen"
 
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Voer ‘%s --help’ uit om een volledige lijst van alle opdrachtregelopties te "
 "zien."
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:318 src/ui.vala:1602 src/ui.vala:1887
 msgid "_Close"
 msgstr "_Sluiten"
 
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:327
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Gebruikersnaam en wachtwoord vereist om toegang te krijgen tot  '%s'"
 
-#. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:375
 msgid "No scanners detected"
 msgstr "Geen scanners gevonden"
 
-#. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:377
 msgid "Please check your scanner is connected and powered on"
 msgstr "Controleer of uw scanner is aangesloten en is ingeschakeld"
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:382
 msgid "Additional software needed"
 msgstr "Extra programmatuur vereist"
 
-#. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr "U dient een stuurprogramma te installeren voor uw scanner."
 
-#. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:506 src/ui.vala:1843
 msgid "Save As..."
 msgstr "Opslaan als..."
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:509 src/ui.vala:675
 msgid "_Cancel"
 msgstr "_Annuleren"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:510 src/ui.vala:676
 msgid "_Save"
 msgstr "_Opslaan"
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "Gescand document.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:521
 msgid "Image Files"
 msgstr "Afbeeldingsbestanden"
 
-#. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:527
 msgid "All Files"
 msgstr "Alle bestanden"
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (document met meerdere pagina's)"
 
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (gecomprimeerd)"
 
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (lossless)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:557
 msgid "File format:"
 msgstr "Bestandsformaat:"
 
-#. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:650
 msgid "Failed to save file"
 msgstr "Bestand opslaan mislukt"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:673
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Als u niet opslaat, zullen wijzigingen permanent verloren gaan."
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:708
+#: src/ui.vala:708
 msgid "Save current document?"
 msgstr "Huidige document opslaan?"
 
-#. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:710
 msgid "Discard Changes"
 msgstr "Wijzigingen negeren"
 
-#. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "Opslaan van afbeelding voor voorvertoning mislukt"
 
-#. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "Kan toepassing voor voorvertoning van afbeelding niet openen"
 
-#. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1206
 msgid "Combine sides"
 msgstr "Zijden samenvoegen"
 
-#. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr "Zijden samenvoegen (omgekeerd)"
 
-#. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1226
 msgid "Reverse"
 msgstr "Omgekeerd"
 
-#. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr "Onveranderd laten"
 
-#. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "Kon hulpbestand niet openen"
 
-#. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1472
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -650,24 +514,22 @@ msgstr ""
 "ontvangen samen met dit programma. Als dat niet het geval is, zie\n"
 "<http://www.gnu.org/licenses/>."
 
-#. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "Info over Scanhulpmiddel"
 
-#. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "Eenvoudig hulpmiddel voor het scannen van documenten"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Elco https://launchpad.net/~eajnab\n"
 "  Hannie Dumoleyn https://launchpad.net/~lafeber-dumoleyn\n"
 "  Jeroen Hoek https://launchpad.net/~mail-jeroenhoek\n"
-"  Joren Laschet https://launchpad.net/~laschet\n"
+"  Joren https://launchpad.net/~jorenn\n"
 "  Justin https://launchpad.net/~jusgje\n"
 "  Martijn Bastiaan https://launchpad.net/~hmb1\n"
 "  Michaël Van Dorpe https://launchpad.net/~michael-vandorpe\n"
@@ -684,23 +546,19 @@ msgstr ""
 "  kay van der Zander https://launchpad.net/~kay20\n"
 "  rob https://launchpad.net/~rvdb"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "Document opslaan voor afsluiten?"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "Afsluiten zonder opslaan"
 
-#. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr "U lijkt een Brother-scanner te hebben."
 
-#. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1581
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
@@ -708,13 +566,11 @@ msgstr ""
 "Stuurprogramma's hiervoor zijn beschikbaar op de <a "
 "href=\"http://support.brother.com\">website van Brother</a>."
 
-#. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr "U lijkt een Samsung-scanner te hebben."
 
-#. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1587
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
@@ -722,18 +578,15 @@ msgstr ""
 "Stuurprogramma's hiervoor zijn beschikbaar op de <a "
 "href=\"http://samsung.com/support\">website van Samsung</a>."
 
-#. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr "U lijkt een HP-scanner te hebben."
 
-#. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr "U lijkt een Epson-scanner te hebben."
 
-#. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1598
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
@@ -741,139 +594,125 @@ msgstr ""
 "Stuurprogramma's hiervoor zijn beschikbaar op de <a "
 "href=\"http://support.epson.com\">Epson-website</a>."
 
-#. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1602
 msgid "Install drivers"
 msgstr "Stuurprogramma's installeren"
 
-#. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "Eenmaal geïnstalleerd, zult u Simple Scan moeten herstarten."
 
-#. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr "Stuurprogramma's aan het installeren..."
 
-#. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr "Stuurprogramma's met succes geïnstalleerd!"
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Kon geen stuurprogramma's installeren (foutcode %d)."
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr "Kon geen stuurprogramma's installeren."
 
-#. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1676
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr "U moet de %s pakket(ten) installeren"
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (standaard)"
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (klad)"
 
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (hoge resolutie)"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/ui.vala:1793
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1835
 msgid "New Document"
 msgstr "Nieuw document"
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1840
 msgid "Document"
 msgstr "Document"
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1844
 msgid "Email..."
 msgstr "E-mail..."
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1845
 msgid "Print..."
 msgstr "Afdrukken..."
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1853
 msgid "Help"
 msgstr "Hulp"
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1854
 msgid "About"
 msgstr "Over"
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1855
 msgid "Quit"
 msgstr "Afsluiten"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "_Scanner wijzigen"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr "Stuurprogramma's _installeren"
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1897
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1947
 msgid "Darker"
 msgstr "Donkerder"
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1949
 msgid "Lighter"
 msgstr "Lichter"
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:1957
 msgid "Less"
 msgstr "Minder"
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:1959
 msgid "More"
 msgstr "Meer"
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:1967
 msgid "Minimum"
 msgstr "Minimum"
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:1969
 msgid "Maximum"
 msgstr "Maximum"
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2008
 msgid "Saving document..."
 msgstr "Bezig met opslaan van document..."
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Bezig met opslaan van pagina %d van %d"
@@ -920,9 +759,18 @@ msgstr "Bezig met opslaan van pagina %d van %d"
 #~ msgid "TRUE if the application window is maximized"
 #~ msgstr "TRUE als het programmavenster gemaximaliseerd is"
 
+#~ msgid "Device to scan from"
+#~ msgstr "Te gebruiken scanapparaat"
+
+#~ msgid "SANE device to acquire images from."
+#~ msgstr "SANE-apparaat om beeld van te ontvangen"
+
 #~ msgid "Direction of scan"
 #~ msgstr "Scanrichting"
 
+#~ msgid "Type of document being scanned"
+#~ msgstr "Type document dat gescand wordt"
+
 #~ msgid "Window height in pixels"
 #~ msgstr "Vensterhoogte in pixels"
 
@@ -971,6 +819,12 @@ msgstr "Bezig met opslaan van pagina %d van %d"
 #~ "De hoogte van de gescande afbeelding in pixels. Deze waarde representeert de "
 #~ "laatst gescande pagina."
 
+#~ msgid "Resolution for text scans"
+#~ msgstr "Resolutie voor gescande tekst"
+
+#~ msgid "Resolution for photo scans"
+#~ msgstr "Resolutie voor gescande foto's"
+
 #~ msgid "The resolution in dots-per-inch of the previously scanned image."
 #~ msgstr ""
 #~ "De resolutie in punten-per-inch (dtp) van de vorige gescande afbeelding."
@@ -979,12 +833,31 @@ msgstr "Bezig met opslaan van pagina %d van %d"
 #~ msgstr "Resolutie van laatste gescande afbeelding"
 
 #~ msgid ""
+#~ "The directory to save files to. Defaults to the documents directory if unset."
+#~ msgstr ""
+#~ "De map waarin bestanden worden opgeslagen. Dit is standaard de map "
+#~ "Documenten indien niet ingesteld."
+
+#~ msgid "Directory to save files to"
+#~ msgstr "Map om bestanden in op te slaan"
+
+#~ msgid ""
 #~ "The width of scanned image in pixels. This value is updated to what the last "
 #~ "scanned page was."
 #~ msgstr ""
 #~ "De breedte van de gescande afbeelding in pixels. Deze waarde representeert "
 #~ "de laatst gescande pagina."
 
+#~ msgid "The resolution in dots-per-inch to use when scanning text."
+#~ msgstr ""
+#~ "De te gebruiken resolutie in punten-per-inch (dtp) tijdens het scannen van "
+#~ "tekst."
+
+#~ msgid "The resolution in dots-per-inch to use when scanning photos."
+#~ msgstr ""
+#~ "De te gebruiken resolutie in punten-per-inch (dtp) tijdens het scannen van "
+#~ "foto's."
+
 #~ msgid "Width of scanned image in pixels"
 #~ msgstr "Breedte van gescande afbeelding in pixels"
 
@@ -994,10 +867,61 @@ msgstr "Bezig met opslaan van pagina %d van %d"
 #~ msgid "Select File _Type"
 #~ msgstr "Bestands_type selecteren"
 
+#~ msgid "Page side to scan"
+#~ msgstr "Te scannen paginazijde"
+
+#~ msgid ""
+#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr ""
+#~ "De hoogte van het papier in tienden van een mm (of 0 voor automatische "
+#~ "papierdetectie)."
+
+#~ msgid "Height of paper in tenths of a mm"
+#~ msgstr "Hoogte van het papier in tienden van een mm"
+
+#~ msgid ""
+#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr ""
+#~ "De breedte van het papier in tienden van een mm (of 0 voor automatische "
+#~ "papierdetectie)."
+
+#~ msgid "Width of paper in tenths of a mm"
+#~ msgstr "Breedte van het papier in tienden van een mm"
+
 #~ msgid ""
 #~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
 #~ msgstr ""
 #~ "De te scannen paginazijde. Mogelijke waarden zijn ‘both’, ‘front’ en ‘back’."
 
+#~ msgid "The page side to scan."
+#~ msgstr "De paginazijde om te scannen."
+
+#~ msgid ""
+#~ "Type of document being scanned. This setting decides on the scan resolution, "
+#~ "colors and post-processing."
+#~ msgstr ""
+#~ "Het type document dat gescand wordt. Deze instelling bepaalt de te scannen "
+#~ "resolutie, kleuren en nabewerking."
+
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "De richting van de scanner over de te scannen pagina."
+
+#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
+#~ msgstr "Aanpassing van het contrast van -100 tot 100 (0 is geen)."
+
+#~ msgid "Contrast of scan"
+#~ msgstr "Contrast van de scan"
+
+#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
+#~ msgstr "Aanpassing van de helderheid van -100 tot 100 (0 is geen)."
+
+#~ msgid "Brightness of scan"
+#~ msgstr "Helderheid van de scan"
+
+#~ msgid "Quality value to use for JPEG compression."
+#~ msgstr "De kwaliteitswaarde die gebruikt zal worden voor JPEG-compressie."
+
+#~ msgid "Quality value to use for JPEG compression"
+#~ msgstr "De kwaliteitswaarde die gebruikt zal worden voor JPEG-compressie"
diff --git a/po/oc.gmo b/po/oc.gmo
new file mode 100644
index 0000000..bf75c9a
--- /dev/null
+++ b/po/oc.gmo
diff --git a/po/oc.po b/po/oc.po
index e7c4e20..a176c87 100644
--- a/po/oc.po
+++ b/po/oc.po
@@ -7,412 +7,310 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-06 14:16+1200\n"
+"POT-Creation-Date: 2016-07-29 12:47+1200\n"
 "PO-Revision-Date: 2013-10-15 16:43+0000\n"
 "Last-Translator: Cédric VALMARY (Tot en òc) <cvalmary@yahoo.fr>\n"
 "Language-Team: Occitan (post 1500) <oc@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-04-14 05:40+0000\n"
-"X-Generator: Launchpad (build 17990)\n"
+"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 
 #. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:2
+#: data/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_Autorizar"
 
 #. Label beside username entry
-#: ../data/simple-scan.ui.h:4
+#: data/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "_Utilizaire :"
 
 #. Label beside password entry
-#: ../data/simple-scan.ui.h:6
+#: data/simple-scan.ui:117
 msgid "_Password:"
 msgstr "Sen_hal :"
 
 #. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:8
+#: data/simple-scan.ui:188
 msgid "Front and Back"
 msgstr "Recto verso"
 
 #. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:10
+#: data/simple-scan.ui:192
 msgid "Front"
 msgstr "Fàcia"
 
 #. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:12
+#: data/simple-scan.ui:196
 msgid "Back"
 msgstr "Precedenta"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
-#: ../data/appdata/simple-scan.appdata.xml.in.h:1
+#: data/simple-scan.ui:225 data/simple-scan.ui:809
+#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr "Aisina de numerizacion simpla"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:16
+#: data/simple-scan.ui:241
 msgid "_Document"
 msgstr "_Document"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:18
+#: data/simple-scan.ui:260
 msgid "Sc_an"
 msgstr "Nu_merizar"
 
+#. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:20
+#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
 msgid "Single _Page"
 msgstr "_Pagina unica"
 
+#. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:22
+#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr "Totas las paginas del _nauc"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:24
+#: data/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "_Arrestar la numerizacion"
 
-#: ../data/simple-scan.ui.h:25
+#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
 msgid "Text"
 msgstr "Tèxte"
 
-#: ../data/simple-scan.ui.h:26
+#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
 msgid "Photo"
 msgstr "Fòto"
 
 #. Menu item to reorder pages
-#. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1183 ../src/ui.vala:1841
+#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr ""
 
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: data/simple-scan.ui:367
 msgid "_Email"
 msgstr "_Corrièl"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: data/simple-scan.ui:430
 msgid "_Page"
 msgstr "_Pagina"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: data/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "Pivotar cap a es_quèrra"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: data/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "Pivotar cap a _drecha"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: data/simple-scan.ui:460
 msgid "_Crop"
 msgstr "Re_quadrar"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: data/simple-scan.ui:470
 msgid "_None"
 msgstr "_Pas cap"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: data/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: data/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: data/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: data/simple-scan.ui:514
 msgid "_Letter"
 msgstr "_Letter (US)"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: data/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "_Legal (US)"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: data/simple-scan.ui:536
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: data/simple-scan.ui:547
 msgid "_Custom"
 msgstr "_Personalizar"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: data/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr "Pivota_r la seleccion"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: data/simple-scan.ui:578
 msgid "Move Left"
 msgstr "Se desplaçar cap a esquèrra"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: data/simple-scan.ui:587
 msgid "Move Right"
 msgstr "Se desplaçar cap a drecha"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: data/simple-scan.ui:624
 msgid "_Help"
 msgstr "_Ajuda"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: data/simple-scan.ui:632
 msgid "_Contents"
 msgstr "_Ensenhador"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: data/simple-scan.ui:674 data/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "Crear un document novèl"
 
-#: ../data/simple-scan.ui.h:67
+#: data/simple-scan.ui:675
 msgid "New"
 msgstr "Novèl"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: data/simple-scan.ui:689 data/simple-scan.ui:836
 msgid "Scan a single page from the scanner"
 msgstr "Numerizar una sola pagina dempuèi lo scanner"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: data/simple-scan.ui:691 data/simple-scan.ui:837
 msgid "Scan"
 msgstr "Numerizar"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: data/simple-scan.ui:707 data/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "Enregistrar lo document dins un fichièr"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1842
+#: data/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "Enregistrar"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: data/simple-scan.ui:724 data/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "Arrestar la numerizacion en cors"
 
-#: ../data/simple-scan.ui.h:77
+#: data/simple-scan.ui:725 data/simple-scan.ui:825
 msgid "Stop"
 msgstr "Arrèsta"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: data/simple-scan.ui:749 data/simple-scan.ui:936
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr ""
 "Pivotar la pagina cap a esquèrra (sens invèrse de las agulhas d'una mòstra)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: data/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "Rotacion a esquèrra"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: data/simple-scan.ui:764 data/simple-scan.ui:914
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Pivotar la pagina cap a drecha (sens de las agulhas d'una mòstra)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: data/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "Rotacion a drecha"
 
-#: ../data/simple-scan.ui.h:86
+#: data/simple-scan.ui:779 data/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "Requadrar la pagina seleccionada"
 
-#: ../data/simple-scan.ui.h:87
+#: data/simple-scan.ui:781
 msgid "Crop"
 msgstr "Requadrar"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1849
+#: data/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "Preferéncias"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: data/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "F_ont de numerizacion :"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: data/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "Resolucion del _Tèxte :"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: data/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "Resolucion de la _fòto :"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: data/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "Fàcia de numerizar :"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: data/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "Talha de la pagina :"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: data/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "Luminositat :"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: data/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "Contraste :"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: data/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "Qualitat :"
 
-#: ../data/simple-scan.desktop.in.h:2
+#: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:3
+#: data/simple-scan.desktop.in:5
 msgid "Scan Documents"
 msgstr "Numerizar de documents"
 
-#: ../data/simple-scan.desktop.in.h:4
+#: data/simple-scan.desktop.in:6
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Device to scan from"
-msgstr "Numerizar dempuèi"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "SANE device to acquire images from."
-msgstr "Periferic SANE d'utilizar per l'aquisicion dels imatges."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "Type of document being scanned"
-msgstr "Natura del document que va èsser numerizat"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
-msgid ""
-"Type of document being scanned. This setting decides on the scan resolution, "
-"colors and post-processing."
-msgstr ""
-"Tipe de document numerizat. Aqueste reglatge definís la resolucion de "
-"numerizacion, las colors e lo post-tractament."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
-msgid "Width of paper in tenths of a mm"
-msgstr "Largor del papièr en desens de mm."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
+#: data/simple-scan.desktop.in:8
+msgid "scanner"
 msgstr ""
-"La largor del papièr en desens de mm (o 0 per una deteccion automatica del "
-"papièr)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
-msgid "Height of paper in tenths of a mm"
-msgstr "Nautor del papièr en desens de mm"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-"La nautor del papièr en desens de mm (o 0 per una deteccion automatica del "
-"papièr)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "Brightness of scan"
-msgstr "Luminositat de la numerizacion"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "The brightness adjustment from -100 to 100 (0 being none)."
-msgstr "Ajustament de la luminositat de -100 a 100 (0 per pas cap)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid "Contrast of scan"
-msgstr "Contraste de la numerizacion"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "The contrast adjustment from -100 to 100 (0 being none)."
-msgstr "Ajustament del contraste de -100 a 100 (0 per pas cap)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid "Resolution for text scans"
-msgstr "Resolucion per de numerizacions de tèxtes"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
-msgid "The resolution in dots-per-inch to use when scanning text."
-msgstr ""
-"La resolucion en punts per poce d'utilizar al moment de la numerizacion de "
-"tèxte."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
-msgid "Resolution for photo scans"
-msgstr "Resolucion per de numerizacions de fòtos"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr ""
-"La resolucion en punts per poce d'utilizar al moment de la numerizacion de "
-"fòtos."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
-msgid "Page side to scan"
-msgstr "Fàcia(s) de la pagina de numerizar"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
-msgid "The page side to scan."
-msgstr "Lo costat de la pagina de numerizar."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
-msgid "Directory to save files to"
-msgstr "Dorsièr ont los fichièrs son enregistrats"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
-msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
-msgstr ""
-"Lo dorsièr ont los fichièrs son enregistrats. S'es pas definit, lo dorsièr "
-"documents serà utilizat per defaut."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
-msgid "Quality value to use for JPEG compression"
-msgstr "Taus de qualitat d'utilizar per la compression JPEG"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Quality value to use for JPEG compression."
-msgstr "Taus de qualitat d'utilizar per la compression JPEG."
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+#: data/simple-scan.appdata.xml.in:8
 msgid ""
 "A really easy way to scan both documents and photos. You can crop out the "
 "bad parts of a photo and rotate it if it is the wrong way round. You can "
@@ -420,199 +318,165 @@ msgid ""
 "formats."
 msgstr ""
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+#: data/simple-scan.appdata.xml.in:13
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Cap de periferic de numerizacion pas disponible. Connectatz-ne un."
 
-#. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "Impossible de se connectar al scanner"
 
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "Impossible d'aviar la numerizacion"
 
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1236 src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr "Error de comunicacion amb lo scanner"
 
-#. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "Aficha la version del logicial"
 
-#. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr "Afichar los messatges de desbugatge"
 
-#: ../src/simple-scan.vala:26
+#: src/simple-scan.vala:26
 msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr ""
 "Corregir los fichièrs PDF generats amb las ancianas versions de Simple Scan"
 
-#. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:391
+#: src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Fracàs de la numerizacion"
 
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DEVICE...] - Aisina de numerizacion"
 
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Aviatz « %s --help » per veire la lista completa de opcions disponiblas en "
 "linha de comanda"
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:318 src/ui.vala:1602 src/ui.vala:1887
 msgid "_Close"
 msgstr "_Tampar"
 
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:327
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Nom d'utilizaire e senhal necessaris per accedir a « %s »"
 
-#. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:375
 msgid "No scanners detected"
 msgstr "Cap de scanner es pas estat detectat"
 
-#. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:377
 msgid "Please check your scanner is connected and powered on"
 msgstr "Verificatz que vòstre scanner es connectat e jos tension"
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:382
 msgid "Additional software needed"
 msgstr ""
 
-#. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr ""
 
-#. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:506 src/ui.vala:1843
 msgid "Save As..."
 msgstr "Enregistrar jos..."
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:509 src/ui.vala:675
 msgid "_Cancel"
 msgstr "A_nullar"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:510 src/ui.vala:676
 msgid "_Save"
 msgstr "_Salvar"
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "Document.pdf numerizat"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:521
 msgid "Image Files"
 msgstr "Fichièrs imatges"
 
-#. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:527
 msgid "All Files"
 msgstr "Totes los fichièrs"
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (document multipaginas)"
 
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (compressat)"
 
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (sens pèrda)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:557
 msgid "File format:"
 msgstr "Format del fichièr :"
 
-#. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:650
 msgid "Failed to save file"
 msgstr "Impossible d'enregistrar lo fichièr"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:673
 msgid "If you don't save, changes will be permanently lost."
 msgstr "S'enregistratz pas, las modificacions seràn perdudas definitivament."
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:708
+#: src/ui.vala:708
 msgid "Save current document?"
 msgstr "Enregistrar lo document actual ?"
 
-#. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:710
 msgid "Discard Changes"
 msgstr "Abandonar las modificacions"
 
-#. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "Impossible d'enregistrar l'imatge per lo previsualizar"
 
-#. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "Impossible de dobrir l'aplicacion de previsualizacion d'imatge"
 
-#. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1206
 msgid "Combine sides"
 msgstr ""
 
-#. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr ""
 
-#. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1226
 msgid "Reverse"
 msgstr "Inversar"
 
-#. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr ""
 
-#. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "Impossible de dobrir lo fichièr d'ajuda"
 
-#. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1472
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -641,207 +505,182 @@ msgstr ""
 "al meteis temps qu'aqueste programa ; s'es pas lo cas, consultatz\n"
 "<http://www.gnu.org/licenses/>."
 
-#. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "A prepaus de Simple Scan"
 
-#. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "Numerizar simplament vòstres documents"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Cédric VALMARY (Tot en òc) https://launchpad.net/~cvalmary\n"
 "  Quentin Pagès https://launchpad.net/~kwentin"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "Enregistrar lo document abans de quitar ?"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "Quitar sens enregistrar"
 
-#. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
-#. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1581
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
 msgstr ""
 
-#. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
-#. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1587
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
 msgstr ""
 
-#. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr ""
 
-#. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
-#. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1598
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
 msgstr ""
 
-#. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1602
 msgid "Install drivers"
 msgstr ""
 
-#. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
-#. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr ""
 
-#. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr ""
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr ""
 
-#. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1676
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr ""
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d ppp (per defaut)"
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d ppp (borrolhon)"
 
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d ppp (nauta resolucion)"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/ui.vala:1793
 #, c-format
 msgid "%d dpi"
 msgstr "%d ppp"
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1835
 msgid "New Document"
 msgstr "Document novèl"
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1840
 msgid "Document"
 msgstr "Document"
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1844
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1845
 msgid "Print..."
 msgstr "Imprimir..."
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1853
 msgid "Help"
 msgstr "Ajuda"
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1854
 msgid "About"
 msgstr "A prepaus"
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1855
 msgid "Quit"
 msgstr "Quitar"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "Cambiar de _scanner"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr ""
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1897
 msgid "Automatic"
 msgstr "Automatic"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1947
 msgid "Darker"
 msgstr "Mai escur"
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1949
 msgid "Lighter"
 msgstr "Mai clar"
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:1957
 msgid "Less"
 msgstr "Mens"
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:1959
 msgid "More"
 msgstr "Mai"
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:1967
 msgid "Minimum"
 msgstr "Minimum"
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:1969
 msgid "Maximum"
 msgstr "Maximum"
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2008
 msgid "Saving document..."
 msgstr "Enregistrament del document..."
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Enregistrament de la pagina %d sus %d"
@@ -852,12 +691,27 @@ msgstr "Enregistrament de la pagina %d sus %d"
 #~ msgid "Height of scanned image in pixels"
 #~ msgstr "Nautor de l'imatge numerizat en pixèls"
 
+#~ msgid "Resolution for photo scans"
+#~ msgstr "Resolucion per de numerizacions de fòtos"
+
+#~ msgid "Device to scan from"
+#~ msgstr "Numerizar dempuèi"
+
+#~ msgid "SANE device to acquire images from."
+#~ msgstr "Periferic SANE d'utilizar per l'aquisicion dels imatges."
+
 #~ msgid "Direction of scan"
 #~ msgstr "Sens de numerizacion"
 
+#~ msgid "Resolution for text scans"
+#~ msgstr "Resolucion per de numerizacions de tèxtes"
+
 #~ msgid "Resolution of last scanned image"
 #~ msgstr "Resolucion del darrièr imatge numerizat"
 
+#~ msgid "Directory to save files to"
+#~ msgstr "Dorsièr ont los fichièrs son enregistrats"
+
 #~ msgid ""
 #~ "The direction of the scanner across the scanned page. It can be one of the "
 #~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
@@ -866,6 +720,9 @@ msgstr "Enregistrament de la pagina %d sus %d"
 #~ "pòt èsser : d'amont cap aval ; d'aval cap amont ; d'esquèrra cap a drecha ; "
 #~ "de drecha cap a esquèrra"
 
+#~ msgid "Type of document being scanned"
+#~ msgstr "Natura del document que va èsser numerizat"
+
 #~ msgid ""
 #~ "Type of document being scanned. 'text' for text documents, 'photo' for "
 #~ "photos. This setting decides on the scan resolution, colors and post-"
@@ -888,6 +745,22 @@ msgstr "Enregistrament de la pagina %d sus %d"
 #~ msgid "The resolution in dots-per-inch of the previously scanned image."
 #~ msgstr "La resolucion del darrièr imatge numerizat en punts per poce."
 
+#~ msgid "The resolution in dots-per-inch to use when scanning text."
+#~ msgstr ""
+#~ "La resolucion en punts per poce d'utilizar al moment de la numerizacion de "
+#~ "tèxte."
+
+#~ msgid ""
+#~ "The directory to save files to. Defaults to the documents directory if unset."
+#~ msgstr ""
+#~ "Lo dorsièr ont los fichièrs son enregistrats. S'es pas definit, lo dorsièr "
+#~ "documents serà utilizat per defaut."
+
+#~ msgid "The resolution in dots-per-inch to use when scanning photos."
+#~ msgstr ""
+#~ "La resolucion en punts per poce d'utilizar al moment de la numerizacion de "
+#~ "fòtos."
+
 #~ msgid ""
 #~ "The width of scanned image in pixels. This value is updated to what the last "
 #~ "scanned page was."
@@ -962,10 +835,61 @@ msgstr "Enregistrament de la pagina %d sus %d"
 #~ msgstr "Verificatz vòstra installacion"
 
 #~ msgid ""
+#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr ""
+#~ "La nautor del papièr en desens de mm (o 0 per una deteccion automatica del "
+#~ "papièr)."
+
+#~ msgid "Page side to scan"
+#~ msgstr "Fàcia(s) de la pagina de numerizar"
+
+#~ msgid ""
 #~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
 #~ msgstr ""
 #~ "La o las fàcias de la pagina de numerizar. Aquò pòt èsser : « Recto verso », "
 #~ "« Recto » o « Verso »"
 
+#~ msgid ""
+#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr ""
+#~ "La largor del papièr en desens de mm (o 0 per una deteccion automatica del "
+#~ "papièr)."
+
+#~ msgid "Width of paper in tenths of a mm"
+#~ msgstr "Largor del papièr en desens de mm."
+
+#~ msgid "The page side to scan."
+#~ msgstr "Lo costat de la pagina de numerizar."
+
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "Lo sens de l'escanèr per rapòrt a la pagina numerizada."
+
+#~ msgid ""
+#~ "Type of document being scanned. This setting decides on the scan resolution, "
+#~ "colors and post-processing."
+#~ msgstr ""
+#~ "Tipe de document numerizat. Aqueste reglatge definís la resolucion de "
+#~ "numerizacion, las colors e lo post-tractament."
+
+#~ msgid "Height of paper in tenths of a mm"
+#~ msgstr "Nautor del papièr en desens de mm"
+
+#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
+#~ msgstr "Ajustament del contraste de -100 a 100 (0 per pas cap)."
+
+#~ msgid "Contrast of scan"
+#~ msgstr "Contraste de la numerizacion"
+
+#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
+#~ msgstr "Ajustament de la luminositat de -100 a 100 (0 per pas cap)."
+
+#~ msgid "Brightness of scan"
+#~ msgstr "Luminositat de la numerizacion"
+
+#~ msgid "Quality value to use for JPEG compression."
+#~ msgstr "Taus de qualitat d'utilizar per la compression JPEG."
+
+#~ msgid "Quality value to use for JPEG compression"
+#~ msgstr "Taus de qualitat d'utilizar per la compression JPEG"
diff --git a/po/pa.gmo b/po/pa.gmo
new file mode 100644
index 0000000..4a7cd3f
--- /dev/null
+++ b/po/pa.gmo
diff --git a/po/pa.po b/po/pa.po
index 4fa3f23..78e3598 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -7,401 +7,309 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-06 14:16+1200\n"
+"POT-Creation-Date: 2016-07-29 12:47+1200\n"
 "PO-Revision-Date: 2012-04-17 06:12+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Punjabi <pa@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-04-14 05:40+0000\n"
-"X-Generator: Launchpad (build 17990)\n"
+"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 
 #. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:2
+#: data/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "ਪਰਮਾਣਿਤ(_A)"
 
 #. Label beside username entry
-#: ../data/simple-scan.ui.h:4
+#: data/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "ਸਰੋਤ ਲਈ ਯੂਜ਼ਰ-ਨਾਂ(_U):"
 
 #. Label beside password entry
-#: ../data/simple-scan.ui.h:6
+#: data/simple-scan.ui:117
 msgid "_Password:"
 msgstr "ਪਾਸਵਰਡ(_P):"
 
 #. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:8
+#: data/simple-scan.ui:188
 msgid "Front and Back"
 msgstr "ਅੱਗੇ ਅਤੇ ਪਿੱਛੇ"
 
 #. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:10
+#: data/simple-scan.ui:192
 msgid "Front"
 msgstr "ਅੱਗੇ"
 
 #. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:12
+#: data/simple-scan.ui:196
 msgid "Back"
 msgstr "ਪਿੱਛੇ"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
-#: ../data/appdata/simple-scan.appdata.xml.in.h:1
+#: data/simple-scan.ui:225 data/simple-scan.ui:809
+#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr "ਸੌਖਾ ਸਕੈਨ"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:16
+#: data/simple-scan.ui:241
 msgid "_Document"
 msgstr "ਡੌਕੂਮੈਂਟ(_D)"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:18
+#: data/simple-scan.ui:260
 msgid "Sc_an"
 msgstr "ਸਕੈਨ ਕਰੋ(_a)"
 
+#. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:20
+#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
 msgid "Single _Page"
 msgstr "ਇੱਕਲਾ ਸਫ਼ਾ(_P)"
 
+#. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:22
+#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr "ਫੀਡਰ ਤੋਂ ਸਭ ਸਫ਼ੇ(_F)"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:24
+#: data/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "ਸਕੈਨ ਨੂੰ ਰੋਕੋ(_S)"
 
-#: ../data/simple-scan.ui.h:25
+#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
 msgid "Text"
 msgstr "ਟੈਕਸਟ"
 
-#: ../data/simple-scan.ui.h:26
+#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
 msgid "Photo"
 msgstr "ਫੋਟੋ"
 
 #. Menu item to reorder pages
-#. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1183 ../src/ui.vala:1841
+#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr ""
 
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: data/simple-scan.ui:367
 msgid "_Email"
 msgstr "ਈਮੇਲ(_E)"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: data/simple-scan.ui:430
 msgid "_Page"
 msgstr "ਸਫ਼ਾ(_P)"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: data/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "ਖੱਬੇ ਘੁੰਮਾਓ(_L)"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: data/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "ਸੱਜੇ ਘੁੰਮਾਓ(_R)"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: data/simple-scan.ui:460
 msgid "_Crop"
 msgstr "ਕਰੋਪ ਕਰੋ(_C)"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: data/simple-scan.ui:470
 msgid "_None"
 msgstr "ਕੁਝ ਨਹੀਂ(_N)"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: data/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: data/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: data/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: data/simple-scan.ui:514
 msgid "_Letter"
 msgstr "ਪੱਤਰ(_L)"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: data/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "ਲੀਗਲ(_g)"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: data/simple-scan.ui:536
 msgid "4×6"
 msgstr ""
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: data/simple-scan.ui:547
 msgid "_Custom"
 msgstr "ਕਸਟਮ(_C)"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: data/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr "ਕਰੋਪ ਨੂੰ ਘੁੰਮਾਓ(_R)"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: data/simple-scan.ui:578
 msgid "Move Left"
 msgstr ""
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: data/simple-scan.ui:587
 msgid "Move Right"
 msgstr ""
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: data/simple-scan.ui:624
 msgid "_Help"
 msgstr "ਮੱਦਦ(_H)"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: data/simple-scan.ui:632
 msgid "_Contents"
 msgstr "ਸਮੱਗਰੀ(_C)"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: data/simple-scan.ui:674 data/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "ਨਵਾਂ ਡੌਕੂਮੈਂਟ ਸ਼ੁਰੂ ਕਰੋ"
 
-#: ../data/simple-scan.ui.h:67
+#: data/simple-scan.ui:675
 msgid "New"
 msgstr "ਨਵਾਂ"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: data/simple-scan.ui:689 data/simple-scan.ui:836
 msgid "Scan a single page from the scanner"
 msgstr "ਸਕੈਨਰ ਤੋਂ ਇੱਕਲਾ ਸਫ਼ਾ ਸਕੈਨ ਕਰੋ"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: data/simple-scan.ui:691 data/simple-scan.ui:837
 msgid "Scan"
 msgstr "ਸਕੈਨ"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: data/simple-scan.ui:707 data/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "ਡੌਕੂਮੈਂਟ ਫਾਇਲ ਵਿੱਚ ਸੰਭਾਲੋ"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1842
+#: data/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "ਸੰਭਾਲੋ"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: data/simple-scan.ui:724 data/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "ਮੌਜੂਦਾ ਸਕੈਨ ਰੋਕੋ"
 
-#: ../data/simple-scan.ui.h:77
+#: data/simple-scan.ui:725 data/simple-scan.ui:825
 msgid "Stop"
 msgstr "ਰੋਕੋ"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: data/simple-scan.ui:749 data/simple-scan.ui:936
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "ਸਫ਼ੇ ਨੂੰ ਖੱਬੇ ਘੁੰਮਾਉ (ਘੜੀ ਦੀ ਉਲਟ ਦਿਸ਼ਾ ਵਿੱਚ)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: data/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "ਖੱਬੇ ਘੁੰਮਾਓ"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: data/simple-scan.ui:764 data/simple-scan.ui:914
 msgid "Rotate the page to the right (clockwise)"
 msgstr "ਸਫ਼ੇ ਨੂੰ ਸੱਜੇ ਘੁੰਮਾਉ (ਘੜੀ ਦੀ ਦਿਸ਼ਾ ਵਿੱਚ)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: data/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "ਸੱਜੇ ਘੁੰਮਾਓ"
 
-#: ../data/simple-scan.ui.h:86
+#: data/simple-scan.ui:779 data/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "ਚੁਣੇ ਸਫ਼ੇ ਨੂੰ ਕਰੋਪ ਕਰੋ"
 
-#: ../data/simple-scan.ui.h:87
+#: data/simple-scan.ui:781
 msgid "Crop"
 msgstr "ਕਰੋਪ ਕਰੋ"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1849
+#: data/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "ਮੇਰੀ ਪਸੰਦ"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: data/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "ਸਕੈਨ ਸਰੋਤ(_o):"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: data/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "ਟੈਕਸਟ ਰੈਜ਼ੋਲੂਸ਼ਨ(_T):"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: data/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "ਫੋਟੋ ਰੈਜ਼ੋਲੂਸ਼ਨ(_P):"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: data/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "ਸਕੈਨ ਸਾਈਡ"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: data/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "ਸਫਾ ਆਕਾਰ:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: data/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: data/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: data/simple-scan.ui:1260
 msgid "Quality:"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:2
+#: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:3
+#: data/simple-scan.desktop.in:5
 msgid "Scan Documents"
 msgstr "ਸਕੈਨ ਕੀਤੇ ਡੌਕੂਮੈਂਟ"
 
-#: ../data/simple-scan.desktop.in.h:4
+#: data/simple-scan.desktop.in:6
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Device to scan from"
-msgstr "ਸਕੈਨ ਕਰਨ ਲਈ ਜੰਤਰ"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "SANE device to acquire images from."
-msgstr "ਚਿੱਤਰ ਲੈਣ ਲਈ ਸੈਨ (SANE) ਜੰਤਰ"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "Type of document being scanned"
-msgstr "ਸਕੈਨ ਕੀਤੇ ਜਾਣ ਵਾਲੇ ਡੌਕੂਮੈਂਟ ਦੀ ਕਿਸਮ"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
-msgid ""
-"Type of document being scanned. This setting decides on the scan resolution, "
-"colors and post-processing."
+#: data/simple-scan.desktop.in:8
+msgid "scanner"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
-msgid "Width of paper in tenths of a mm"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
-msgid "Height of paper in tenths of a mm"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "Brightness of scan"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "The brightness adjustment from -100 to 100 (0 being none)."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid "Contrast of scan"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "The contrast adjustment from -100 to 100 (0 being none)."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid "Resolution for text scans"
-msgstr "ਟੈਕਸਟ ਸਕੈਨ ਲਈ ਰੈਜ਼ੋਲੂਸ਼ਨ"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
-msgid "The resolution in dots-per-inch to use when scanning text."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
-msgid "Resolution for photo scans"
-msgstr "ਫੋਟੋ ਸਕੈਨ ਲਈ ਰੈਜੋਲੂਸ਼ਨ"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
-msgid "Page side to scan"
-msgstr "ਸਕੈਨ ਕਰਨ ਲਈ ਸਫ਼ੇ ਦਾ ਪਾਸਾ"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
-msgid "The page side to scan."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
-msgid "Directory to save files to"
-msgstr "ਫਾਇਲਾਂ ਸੰਭਾਲਣ ਲਈ ਡਾਇਰੈਕਟਰੀ"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
-msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
-msgstr ""
-"ਫਾਇਲਾਂ ਸੰਭਾਲਣ ਲਈ ਡਾਇਰੈਕਟਰੀ ਹੈ। ਜੇ ਸੈੱਟ ਨਾ ਕੀਤਾ ਤਾਂ ਡਿਫਾਲਟ ਡੌਕੂਮੈਂਟ ਡਾਇਰੈਕਟਰੀ "
-"ਹੈ।"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
-msgid "Quality value to use for JPEG compression"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Quality value to use for JPEG compression."
-msgstr ""
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+#: data/simple-scan.appdata.xml.in:8
 msgid ""
 "A really easy way to scan both documents and photos. You can crop out the "
 "bad parts of a photo and rotate it if it is the wrong way round. You can "
@@ -409,196 +317,162 @@ msgid ""
 "formats."
 msgstr ""
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+#: data/simple-scan.appdata.xml.in:13
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr "ਕੋਈ ਵੀ ਸਕੈਨਰ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ। ਸਕੈਨਰ ਨਾਲ ਕੁਨੈਕਟ ਕਰੋ ਜੀ।"
 
-#. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "ਸਕੈਨਰ ਨਾਲ ਜੁੜਨ ਲਈ ਅਸਮਰੱਥ"
 
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "ਸਕੈਨ ਕਰਨਾ ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਅਸਮਰੱਥ"
 
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1236 src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr "ਸਕੈਨਰ ਨਾਲ ਸੰਚਾਰ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ"
 
-#. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr ""
 
-#. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr ""
 
-#: ../src/simple-scan.vala:26
+#: src/simple-scan.vala:26
 msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr ""
 
-#. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:391
+#: src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "ਸਕੈਨ ਕਰਨ ਲਈ ਫੇਲ੍ਹ"
 
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:318 src/ui.vala:1602 src/ui.vala:1887
 msgid "_Close"
 msgstr ""
 
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:327
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "'%s' ਵਰਤਣ ਲਈ ਯੂਜ਼ਰ-ਨਾਂ ਅਤੇ ਪਾਸਵਰਡ ਚਾਹੀਦਾ ਹੈ"
 
-#. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:375
 msgid "No scanners detected"
 msgstr "ਕੋਈ ਸਕੈਨਰ ਨਹੀਂ ਮਿਲਿਆ"
 
-#. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:377
 msgid "Please check your scanner is connected and powered on"
 msgstr "ਆਪਣੇ ਜੁੜ ਹੋਏ ਸਕੈਨਰ ਨੂੰ ਚੈੱਕ ਕਰੋ ਅਤੇ ਚਾਲੂ ਕਰੋ"
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:382
 msgid "Additional software needed"
 msgstr ""
 
-#. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr ""
 
-#. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:506 src/ui.vala:1843
 msgid "Save As..."
 msgstr "ਇੰਝ ਸੰਭਾਲੋ..."
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:509 src/ui.vala:675
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:510 src/ui.vala:676
 msgid "_Save"
 msgstr ""
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "ਸਕੈਨ ਕੀਤਾ ਡੌਕੂਮੈਂਟ.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:521
 msgid "Image Files"
 msgstr "ਚਿੱਤਰ ਫਾਇਲਾਂ"
 
-#. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:527
 msgid "All Files"
 msgstr "ਸਭ ਫਾਇਲਾਂ"
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (ਬਹੁ-ਸਫ਼ਾ ਡੌਕੂਮੈਂਟ)"
 
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (compressed)"
 
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (lossless)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:557
 msgid "File format:"
 msgstr ""
 
-#. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:650
 msgid "Failed to save file"
 msgstr "ਫਾਇਲ ਸੰਭਾਲਣ ਲਈ ਫੇਲ੍ਹ ਹੈ"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:673
 msgid "If you don't save, changes will be permanently lost."
 msgstr "ਜੇ ਤੁਸੀਂ ਨਾ ਸੰਭਾਲਿਆ ਤਾਂ ਸਭ ਬਦਲਾਅ ਖਤਮ ਹੋ ਜਾਣਗੇ।"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:708
+#: src/ui.vala:708
 msgid "Save current document?"
 msgstr "ਮੌਜੂਦਾ ਡੌਕੂਮੈਂਟ ਸੰਭਾਲਣਾ ਹੈ?"
 
-#. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:710
 msgid "Discard Changes"
 msgstr "ਬਦਲਾਅ ਅਣਡਿੱਠੇ"
 
-#. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr ""
 
-#. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "ਚਿੱਤਰ ਝਲਕ ਐਪਲੀਕੇਸ਼ਨ ਖੋਲ੍ਹਣ ਲਈ ਅਸਮਰੱਥ"
 
-#. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1206
 msgid "Combine sides"
 msgstr ""
 
-#. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr ""
 
-#. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1226
 msgid "Reverse"
 msgstr ""
 
-#. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr ""
 
-#. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "ਮੱਦਦ ਫਾਇਲ ਖੋਲ੍ਹਣ ਲਈ ਅਸਮਰੱਥ"
 
-#. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1472
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -614,206 +488,181 @@ msgid ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
 
-#. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "ਸੈਂਪਲ ਸਕੈਨ ਬਾਰੇ"
 
-#. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "ਸੈਂਪਲ ਡੌਕੂਮੈਂਟ ਸਕੈਨਿੰਗ ਟੂਲ"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  A S Alam https://launchpad.net/~aalam-users"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "ਕੀ ਬੰਦ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਡੌਕੂਮੈਂਟ ਸੰਭਾਲਣਾ ਹੈ?"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "ਬਿਨਾਂ ਸੰਭਾਲੇ ਬੰਦ ਕਰਨਾ ਹੈ"
 
-#. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
-#. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1581
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
 msgstr ""
 
-#. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
-#. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1587
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
 msgstr ""
 
-#. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr ""
 
-#. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
-#. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1598
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
 msgstr ""
 
-#. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1602
 msgid "Install drivers"
 msgstr ""
 
-#. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
-#. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr ""
 
-#. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr ""
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr ""
 
-#. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1676
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr ""
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (ਡਿਫਾਲਟ)"
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (draft)"
 
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (ਵੱਧ ਰੈਜ਼ੋਲੂਸ਼ਨ)"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/ui.vala:1793
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1835
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1840
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1844
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1845
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1853
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1854
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1855
 msgid "Quit"
 msgstr ""
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "ਸਕੈਨਰ ਬਦਲੋ(_S)"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr ""
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1897
 msgid "Automatic"
 msgstr "ਆਟੋਮੈਟਿਕ"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1947
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1949
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:1957
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:1959
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:1967
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:1969
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2008
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
@@ -824,6 +673,18 @@ msgstr ""
 #~ msgid "Direction of scan"
 #~ msgstr "ਸਕੈਨ ਦੀ ਦਿਸ਼ਾ"
 
+#~ msgid "Device to scan from"
+#~ msgstr "ਸਕੈਨ ਕਰਨ ਲਈ ਜੰਤਰ"
+
+#~ msgid "Directory to save files to"
+#~ msgstr "ਫਾਇਲਾਂ ਸੰਭਾਲਣ ਲਈ ਡਾਇਰੈਕਟਰੀ"
+
+#~ msgid "SANE device to acquire images from."
+#~ msgstr "ਚਿੱਤਰ ਲੈਣ ਲਈ ਸੈਨ (SANE) ਜੰਤਰ"
+
+#~ msgid "Type of document being scanned"
+#~ msgstr "ਸਕੈਨ ਕੀਤੇ ਜਾਣ ਵਾਲੇ ਡੌਕੂਮੈਂਟ ਦੀ ਕਿਸਮ"
+
 #, c-format
 #~ msgid ""
 #~ "Usage:\n"
@@ -841,5 +702,20 @@ msgstr ""
 #~ msgid "Please check your installation"
 #~ msgstr "ਆਪਣੀ ਇੰਸਟਾਲੇਸ਼ਨ ਚੈੱਕ ਕਰੋ ਜੀ"
 
+#~ msgid "Page side to scan"
+#~ msgstr "ਸਕੈਨ ਕਰਨ ਲਈ ਸਫ਼ੇ ਦਾ ਪਾਸਾ"
+
+#~ msgid "Resolution for text scans"
+#~ msgstr "ਟੈਕਸਟ ਸਕੈਨ ਲਈ ਰੈਜ਼ੋਲੂਸ਼ਨ"
+
+#~ msgid "Resolution for photo scans"
+#~ msgstr "ਫੋਟੋ ਸਕੈਨ ਲਈ ਰੈਜੋਲੂਸ਼ਨ"
+
 #~ msgid "Resolution of last scanned image"
 #~ msgstr "ਆਖਰੀ ਸਕੈਨ ਕੀਤੇ ਚਿੱਤਰ ਦਾ ਰੈਜ਼ੋਲੂਸ਼ਨ"
+
+#~ msgid ""
+#~ "The directory to save files to. Defaults to the documents directory if unset."
+#~ msgstr ""
+#~ "ਫਾਇਲਾਂ ਸੰਭਾਲਣ ਲਈ ਡਾਇਰੈਕਟਰੀ ਹੈ। ਜੇ ਸੈੱਟ ਨਾ ਕੀਤਾ ਤਾਂ ਡਿਫਾਲਟ ਡੌਕੂਮੈਂਟ ਡਾਇਰੈਕਟਰੀ "
+#~ "ਹੈ।"
diff --git a/po/pl.gmo b/po/pl.gmo
new file mode 100644
index 0000000..f172346
--- /dev/null
+++ b/po/pl.gmo
diff --git a/po/pl.po b/po/pl.po
index 0ab80b0..cff9efc 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,409 +7,309 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-06 14:16+1200\n"
-"PO-Revision-Date: 2015-11-27 19:44+0000\n"
+"POT-Creation-Date: 2016-07-29 12:47+1200\n"
+"PO-Revision-Date: 2016-07-31 16:41+0000\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-04-14 05:40+0000\n"
-"X-Generator: Launchpad (build 17990)\n"
+"X-Launchpad-Export-Date: 2016-08-01 05:18+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 
 #. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:2
+#: data/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "Upow_ażnij"
 
 #. Label beside username entry
-#: ../data/simple-scan.ui.h:4
+#: data/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "Nazwa _użytkownika dla zasobu:"
 
 #. Label beside password entry
-#: ../data/simple-scan.ui.h:6
+#: data/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Hasło:"
 
 #. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:8
+#: data/simple-scan.ui:188
 msgid "Front and Back"
 msgstr "Przód i tył"
 
 #. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:10
+#: data/simple-scan.ui:192
 msgid "Front"
 msgstr "Przód"
 
 #. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:12
+#: data/simple-scan.ui:196
 msgid "Back"
 msgstr "Tył"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
-#: ../data/appdata/simple-scan.appdata.xml.in.h:1
+#: data/simple-scan.ui:225 data/simple-scan.ui:809
+#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr "Proste skanowanie"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:16
+#: data/simple-scan.ui:241
 msgid "_Document"
 msgstr "_Dokument"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:18
+#: data/simple-scan.ui:260
 msgid "Sc_an"
 msgstr "Sk_anowanie"
 
+#. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:20
+#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
 msgid "Single _Page"
 msgstr "_Pojedyncza strona"
 
+#. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:22
+#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr "_Wszystkie strony z podajnika"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:24
+#: data/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "Zatrzymaj _skanowanie"
 
-#: ../data/simple-scan.ui.h:25
+#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
 msgid "Text"
 msgstr "Tekst"
 
-#: ../data/simple-scan.ui.h:26
+#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
 msgid "Photo"
 msgstr "Zdjęcie"
 
 #. Menu item to reorder pages
-#. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1183 ../src/ui.vala:1841
+#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr "Zmień kolejność stron"
 
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: data/simple-scan.ui:367
 msgid "_Email"
 msgstr "_E-mail"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: data/simple-scan.ui:430
 msgid "_Page"
 msgstr "_Strona"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: data/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "Obróć w _lewo"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: data/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "Obróć w p_rawo"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: data/simple-scan.ui:460
 msgid "_Crop"
-msgstr "_Przytnij"
+msgstr "_Kadruj"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: data/simple-scan.ui:470
 msgid "_None"
 msgstr "_Brak"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: data/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: data/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: data/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: data/simple-scan.ui:514
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: data/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: data/simple-scan.ui:536
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: data/simple-scan.ui:547
 msgid "_Custom"
-msgstr "_Własny"
+msgstr "_Niestandardowy"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: data/simple-scan.ui:565
 msgid "_Rotate Crop"
-msgstr "Ob_róć obszar przycięcia"
+msgstr "Ob_róć obszar kadrowania"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: data/simple-scan.ui:578
 msgid "Move Left"
 msgstr "Przesuń w lewo"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: data/simple-scan.ui:587
 msgid "Move Right"
 msgstr "Przesuń w prawo"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: data/simple-scan.ui:624
 msgid "_Help"
 msgstr "Pomo_c"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: data/simple-scan.ui:632
 msgid "_Contents"
 msgstr "_Spis treści"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: data/simple-scan.ui:674 data/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "Tworzy nowy dokument"
 
-#: ../data/simple-scan.ui.h:67
+#: data/simple-scan.ui:675
 msgid "New"
 msgstr "Nowy"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: data/simple-scan.ui:689 data/simple-scan.ui:836
 msgid "Scan a single page from the scanner"
 msgstr "Skanuje pojedynczą stronę ze skanera"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: data/simple-scan.ui:691 data/simple-scan.ui:837
 msgid "Scan"
 msgstr "Skanuj"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: data/simple-scan.ui:707 data/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "Zapisuje dokument do pliku"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1842
+#: data/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "Zapisz"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: data/simple-scan.ui:724 data/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "Zatrzymuje bieżące skanowanie"
 
-#: ../data/simple-scan.ui.h:77
+#: data/simple-scan.ui:725 data/simple-scan.ui:825
 msgid "Stop"
 msgstr "Zatrzymaj"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: data/simple-scan.ui:749 data/simple-scan.ui:936
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Obraca stronę w lewo (przeciwnie do ruchu wskazówek zegara)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: data/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "Obróć w lewo"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: data/simple-scan.ui:764 data/simple-scan.ui:914
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Obraca stronę w prawo (zgodnie z ruchem wskazówek zegara)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: data/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "Obróć w prawo"
 
-#: ../data/simple-scan.ui.h:86
+#: data/simple-scan.ui:779 data/simple-scan.ui:963
 msgid "Crop the selected page"
-msgstr "Przycina wybraną stronę"
+msgstr "Kadruje zaznaczoną stronę"
 
-#: ../data/simple-scan.ui.h:87
+#: data/simple-scan.ui:781
 msgid "Crop"
-msgstr "Przytnij"
+msgstr "Kadruj"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1849
+#: data/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "Preferencje"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: data/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "Źródło skan_owania:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: data/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "_Rozdzielczość tekstu:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: data/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "Rozdzielczość z_djęcia:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: data/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "Skanowanie stron:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: data/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "Rozmiar strony:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: data/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "Jasność:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: data/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "Kontrast:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: data/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "Jakość:"
 
-#: ../data/simple-scan.desktop.in.h:2
+#: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr "Skaner dokumentów"
 
-#: ../data/simple-scan.desktop.in.h:3
+#: data/simple-scan.desktop.in:5
 msgid "Scan Documents"
 msgstr "Skanowanie dokumentów"
 
-#: ../data/simple-scan.desktop.in.h:4
+#: data/simple-scan.desktop.in:6
 msgid "scan;scanner;flatbed;adf;"
 msgstr "skan;skanowanie;skaner;scan;scanner;flatbed;adf;"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Device to scan from"
-msgstr "Urządzenie skanujące"
+#: data/simple-scan.desktop.in:8
+msgid "scanner"
+msgstr "scanner"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "SANE device to acquire images from."
-msgstr "Urządzenie SANE do pobierania obrazu."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "Type of document being scanned"
-msgstr "Typ skanowanego dokumentu"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
-msgid ""
-"Type of document being scanned. This setting decides on the scan resolution, "
-"colors and post-processing."
-msgstr ""
-"Typ skanowanego dokumentu. To ustawienie decyduje o rozdzielczości "
-"skanowania, kolorach i przetwarzaniu końcowym."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
-msgid "Width of paper in tenths of a mm"
-msgstr "Szerokość papieru w dziesiątkach milimetrów"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-"Szerokość papieru w dziesiątkach milimetrów (lub 0 dla automatycznego "
-"wykrywania papieru)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
-msgid "Height of paper in tenths of a mm"
-msgstr "Wysokość papieru w dziesiątkach milimetrów"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-"Wysokość papieru w dziesiątkach milimetrów (lub 0 dla automatycznego "
-"wykrywania papieru)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "Brightness of scan"
-msgstr "Jasność skanowania"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "The brightness adjustment from -100 to 100 (0 being none)."
-msgstr "Dostosowanie jasności, od -100 do 100 (0 oznacza brak)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid "Contrast of scan"
-msgstr "Kontrast skanowania"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "The contrast adjustment from -100 to 100 (0 being none)."
-msgstr "Dostosowanie kontrastu, od -100 do 100 (0 oznacza brak)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid "Resolution for text scans"
-msgstr "Rozdzielczość skanowanego tekstu"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
-msgid "The resolution in dots-per-inch to use when scanning text."
-msgstr ""
-"Rozdzielczość do użycia podczas skanowania tekstu w punktach na cal (DPI)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
-msgid "Resolution for photo scans"
-msgstr "Rozdzielczość skanowanych zdjęć"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr ""
-"Rozdzielczość do użycia podczas skanowania zdjęć w punktach na cal (DPI)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
-msgid "Page side to scan"
-msgstr "Strona do skanowania"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
-msgid "The page side to scan."
-msgstr "Strona kartki do skanowania."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
-msgid "Directory to save files to"
-msgstr "Katalog do zapisania plików"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
-msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
-msgstr ""
-"Katalog do zapisywania plików. Jeśli nie ustawiono, używa domyślnego "
-"katalogu Dokumenty."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
-msgid "Quality value to use for JPEG compression"
-msgstr "Wartość jakości używana do kompresji JPEG"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Quality value to use for JPEG compression."
-msgstr "Wartość jakości używana do kompresji JPEG."
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+#: data/simple-scan.appdata.xml.in:8
 msgid ""
 "A really easy way to scan both documents and photos. You can crop out the "
 "bad parts of a photo and rotate it if it is the wrong way round. You can "
@@ -420,200 +320,165 @@ msgstr ""
 "i obracanie zdjęć, drukowanie, eksportowanie do formatu PDF oraz zapisywanie "
 "w wielu formatach."
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+#: data/simple-scan.appdata.xml.in:13
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 "Program Simple Scan używa mechanizmu SANE do obsługi większości istniejących "
 "skanerów."
 
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Brak dostępnych skanerów. Proszę podłączyć skaner."
 
-#. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "Nie można połączyć ze skanerem"
 
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "Nie można rozpocząć skanowania"
 
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1236 src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr "Błąd podczas komunikacji ze skanerem"
 
-#. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "Wyświetla informacje o wersji"
 
-#. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr "Wyświetla komunikaty diagnozowania błędów"
 
-#: ../src/simple-scan.vala:26
+#: src/simple-scan.vala:26
 msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr "Naprawia pliki PDF utworzone przy użyciu starszych wersji programu"
 
-#. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:391
+#: src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Skanowanie się nie powiodło"
 
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
-msgstr "[URZĄDZENIE] — narzędzie do skanowania"
+msgstr "[URZĄDZENIE…] — narzędzie do skanowania"
 
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
-"Polecenie \"%s --help\" wyświetli pełną listę dostępnych opcji wiersza "
-"poleceń."
+"Polecenie „%s --help” wyświetli pełną listę dostępnych opcji wiersza poleceń."
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:318 src/ui.vala:1602 src/ui.vala:1887
 msgid "_Close"
 msgstr "Za_mknij"
 
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:327
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Uzyskanie dostępu do „%s” wymaga podania nazwy użytkownika i hasła"
 
-#. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:375
 msgid "No scanners detected"
 msgstr "Nie wykryto żadnego skanera"
 
-#. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:377
 msgid "Please check your scanner is connected and powered on"
 msgstr "Proszę sprawdzić, czy skaner jest podłączony i włączony"
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:382
 msgid "Additional software needed"
 msgstr "Wymagane dodatkowe oprogramowanie"
 
-#. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr "Należy zainstalować sterownik skanera."
 
-#. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:506 src/ui.vala:1843
 msgid "Save As..."
 msgstr "Zapisz jako…"
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:509 src/ui.vala:675
 msgid "_Cancel"
 msgstr "_Anuluj"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:510 src/ui.vala:676
 msgid "_Save"
 msgstr "_Zapisz"
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "Zeskanowany dokument.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:521
 msgid "Image Files"
 msgstr "Pliki obrazów"
 
-#. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:527
 msgid "All Files"
 msgstr "Wszystkie pliki"
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (dokument wielostronicowy)"
 
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (skompresowany)"
 
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (bezstratny)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:557
 msgid "File format:"
 msgstr "Format pliku:"
 
-#. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:650
 msgid "Failed to save file"
 msgstr "Zapisanie pliku się nie powiodło"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:673
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Zmiany zostaną bezpowrotnie utracone, jeśli nie zostaną zapisane."
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:708
+#: src/ui.vala:708
 msgid "Save current document?"
 msgstr "Zapisać bieżący dokument?"
 
-#. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:710
 msgid "Discard Changes"
 msgstr "Odrzuć zmiany"
 
-#. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "Nie można zapisać podglądu obrazu"
 
-#. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "Nie można otworzyć programu podglądu obrazów"
 
-#. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1206
 msgid "Combine sides"
 msgstr "Połącz strony"
 
-#. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr "Połącz strony (odwrotnie)"
 
-#. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1226
 msgid "Reverse"
 msgstr "Odwrotnie"
 
-#. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr "Bez zmiany"
 
-#. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "Nie można otworzyć pliku pomocy"
 
-#. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1472
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -644,54 +509,45 @@ msgstr ""
 "Powszechnej Licencji Publicznej GNU (GNU General Public License); jeśli nie\n"
 "— proszę odwiedzić stronę internetową <http://www.gnu.org/licenses/>."
 
-#. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "O programie"
 
-#. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "Proste narzędzie do skanowania dokumentów"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Arkadiusz Błasiak https://launchpad.net/~ares1112\n"
 "  GTriderXC https://launchpad.net/~gtriderxc\n"
-"  Kuba Mędrek https://launchpad.net/~kubix-medrek\n"
-"  Marcin Kozioł https://launchpad.net/~lord-dark666\n"
 "  Michał Sawicz https://launchpad.net/~saviq\n"
 "  Miłosz Kosobucki https://launchpad.net/~mikom\n"
 "  P.W. https://launchpad.net/~piwsko\n"
-"  Piotr Drąg https://launchpad.net/~raven46\n"
+"  Piotr Drąg https://launchpad.net/~piotrdrag\n"
 "  Piotr Sokół https://launchpad.net/~psokol\n"
 "  Piotr Strębski https://launchpad.net/~strebski\n"
 "  Piotr Łukomiak https://launchpad.net/~pioluk\n"
 "  Rafał Szalecki https://launchpad.net/~perex\n"
-"  Szymon Waliczek https://launchpad.net/~majster-pl\n"
 "  Tomasz 'Zen' Napierala https://launchpad.net/~tzn\n"
 "  Tomasz Dominikowski https://launchpad.net/~dominikowski\n"
 "  Wiatrak https://launchpad.net/~wiatrak."
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "Zapisać dokument przed zakończeniem programu?"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "Zakończ bez zapisywania"
 
-#. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr "Wykryto skaner marki Brother."
 
-#. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1581
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
@@ -699,13 +555,11 @@ msgstr ""
 "Sterowniki dla tego urządzenia są dostępne na <a "
 "href=\"http://support.brother.com\">stronie firmy Brother</a>."
 
-#. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr "Wykryto skaner marki Samsung."
 
-#. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1587
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
@@ -713,18 +567,15 @@ msgstr ""
 "Sterowniki dla tego urządzenia są dostępne na <a "
 "href=\"http://samsung.com/support\">stronie firmy Samsung</a>."
 
-#. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr "Wykryto skaner marki HP."
 
-#. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr "Wykryto skaner marki Epson."
 
-#. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1598
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
@@ -732,139 +583,125 @@ msgstr ""
 "Sterowniki są dostępne na <a href=\"http://support.epson.com\">stronie firmy "
 "Epson</a>."
 
-#. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1602
 msgid "Install drivers"
 msgstr "Instalowanie sterowników"
 
-#. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
-msgstr "Po zakończeniu instalowania należy uruchomić program ponownie."
+msgstr "Po ukończeniu instalowania należy uruchomić program ponownie."
 
-#. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1645
 msgid "Installing drivers..."
-msgstr "Instalowanie sterowników..."
+msgstr "Instalowanie sterowników…"
 
-#. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1653
 msgid "Drivers installed successfully!"
-msgstr "Zainstalowano sterowniki!"
+msgstr "Zainstalowano sterowniki."
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
-msgstr "Nie udało się zainstalować sterowników (kod błędu %d)."
+msgstr "Zainstalowanie sterowników się nie powiodło (kod błędu %d)."
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1669
 msgid "Failed to install drivers."
-msgstr "Nie udało się zainstalować sterowników."
+msgstr "Zainstalowanie sterowników się nie powiodło."
 
-#. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1676
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr "Należy zainstalować pakiety %s."
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d DPI (domyślnie)"
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d DPI (szkic)"
 
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d DPI (wysoka rozdzielczość)"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/ui.vala:1793
 #, c-format
 msgid "%d dpi"
 msgstr "%d DPI"
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1835
 msgid "New Document"
 msgstr "Nowy dokument"
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1840
 msgid "Document"
 msgstr "Dokument"
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1844
 msgid "Email..."
 msgstr "E-mail…"
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1845
 msgid "Print..."
 msgstr "Wydrukuj…"
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1853
 msgid "Help"
 msgstr "Pomoc"
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1854
 msgid "About"
 msgstr "O programie"
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1855
 msgid "Quit"
 msgstr "Zakończ"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "Zmień _skaner"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr "_Zainstaluj sterowniki"
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1897
 msgid "Automatic"
-msgstr "Automatyczny"
+msgstr "Automatycznie"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1947
 msgid "Darker"
 msgstr "Ciemniej"
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1949
 msgid "Lighter"
 msgstr "Jaśniej"
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:1957
 msgid "Less"
 msgstr "Mniejszy"
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:1959
 msgid "More"
 msgstr "Większy"
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:1967
 msgid "Minimum"
 msgstr "Minimalnie"
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:1969
 msgid "Maximum"
 msgstr "Maksymalnie"
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2008
 msgid "Saving document..."
 msgstr "Zapisywanie dokumentu…"
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Zapisywanie strony %d z %d"
@@ -889,9 +726,24 @@ msgstr "Zapisywanie strony %d z %d"
 #~ msgid "Direction of scan"
 #~ msgstr "Kierunek skanowania"
 
+#~ msgid "Device to scan from"
+#~ msgstr "Urządzenie skanujące"
+
+#~ msgid "Resolution for text scans"
+#~ msgstr "Rozdzielczość skanowanego tekstu"
+
+#~ msgid "Resolution for photo scans"
+#~ msgstr "Rozdzielczość skanowanych zdjęć"
+
 #~ msgid "Resolution of last scanned image"
 #~ msgstr "Rozdzielczość ostatnio zeskanowanego obrazu"
 
+#~ msgid "Directory to save files to"
+#~ msgstr "Katalog do zapisania plików"
+
+#~ msgid "SANE device to acquire images from."
+#~ msgstr "Urządzenie SANE do pobierania obrazu."
+
 #~ msgid ""
 #~ "The direction of the scanner across the scanned page. It can be one of the "
 #~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
@@ -901,6 +753,9 @@ msgstr "Zapisywanie strony %d z %d"
 #~ "\"left-to-right\" (od lewej do prawej), \"right-to-left\" (od prawej do "
 #~ "lewej)"
 
+#~ msgid "Type of document being scanned"
+#~ msgstr "Typ skanowanego dokumentu"
+
 #~ msgid ""
 #~ "Type of document being scanned. 'text' for text documents, 'photo' for "
 #~ "photos. This setting decides on the scan resolution, colors and post-"
@@ -930,6 +785,12 @@ msgstr "Zapisywanie strony %d z %d"
 #~ msgid "The resolution in dots-per-inch of the previously scanned image."
 #~ msgstr "Rozdzielczość ostatnio skanowanego obrazu w punktach na cal (dpi)."
 
+#~ msgid ""
+#~ "The directory to save files to. Defaults to the documents directory if unset."
+#~ msgstr ""
+#~ "Katalog do zapisywania plików. Jeśli nie ustawiono, używa domyślnego "
+#~ "katalogu Dokumenty."
+
 #~ msgid "Window height in pixels"
 #~ msgstr "Wysokość okna w pikselach"
 
@@ -970,6 +831,29 @@ msgstr "Zapisywanie strony %d z %d"
 #~ "Strona do skanowania. Może wynosić jedną z wartości: \"both\" (obie), "
 #~ "\"front\" (przód), \"back\" (tył)"
 
+#~ msgid "Page side to scan"
+#~ msgstr "Strona do skanowania"
+
+#~ msgid ""
+#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr ""
+#~ "Wysokość papieru w dziesiątkach milimetrów (lub 0 dla automatycznego "
+#~ "wykrywania papieru)."
+
+#~ msgid "Height of paper in tenths of a mm"
+#~ msgstr "Wysokość papieru w dziesiątkach milimetrów"
+
+#~ msgid ""
+#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr ""
+#~ "Szerokość papieru w dziesiątkach milimetrów (lub 0 dla automatycznego "
+#~ "wykrywania papieru)."
+
+#~ msgid "Width of paper in tenths of a mm"
+#~ msgstr "Szerokość papieru w dziesiątkach milimetrów"
+
 #, c-format
 #~ msgid ""
 #~ "GTK+ Options:\n"
@@ -992,5 +876,41 @@ msgstr "Zapisywanie strony %d z %d"
 #~ "  --gtk-module=MODUŁY             Wczytuje dodatkowe moduły biblioteki GTK+\n"
 #~ "  --g-fatal-warnings              Wszystkie ostrzeżenia są krytyczne"
 
+#~ msgid ""
+#~ "Type of document being scanned. This setting decides on the scan resolution, "
+#~ "colors and post-processing."
+#~ msgstr ""
+#~ "Typ skanowanego dokumentu. To ustawienie decyduje o rozdzielczości "
+#~ "skanowania, kolorach i przetwarzaniu końcowym."
+
+#~ msgid "The page side to scan."
+#~ msgstr "Strona kartki do skanowania."
+
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "Kierunek skanowania strony."
+
+#~ msgid "Quality value to use for JPEG compression."
+#~ msgstr "Wartość jakości używana do kompresji JPEG."
+
+#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
+#~ msgstr "Dostosowanie kontrastu, od -100 do 100 (0 oznacza brak)."
+
+#~ msgid "Contrast of scan"
+#~ msgstr "Kontrast skanowania"
+
+#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
+#~ msgstr "Dostosowanie jasności, od -100 do 100 (0 oznacza brak)."
+
+#~ msgid "Brightness of scan"
+#~ msgstr "Jasność skanowania"
+
+#~ msgid "Quality value to use for JPEG compression"
+#~ msgstr "Wartość jakości używana do kompresji JPEG"
+
+#~ msgid "The resolution in dots-per-inch to use when scanning text."
+#~ msgstr ""
+#~ "Rozdzielczość do użycia podczas skanowania tekstu w punktach na cal (DPI)."
+
+#~ msgid "The resolution in dots-per-inch to use when scanning photos."
+#~ msgstr ""
+#~ "Rozdzielczość do użycia podczas skanowania zdjęć w punktach na cal (DPI)."
diff --git a/po/pt.gmo b/po/pt.gmo
new file mode 100644
index 0000000..6522f2f
--- /dev/null
+++ b/po/pt.gmo
diff --git a/po/pt.po b/po/pt.po
index 054a9bf..70f1309 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,407 +7,309 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-06 14:16+1200\n"
+"POT-Creation-Date: 2016-07-29 12:47+1200\n"
 "PO-Revision-Date: 2015-09-22 09:45+0000\n"
 "Last-Translator: Ivo Xavier <ivoxavier.8@gmail.com>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-04-14 05:40+0000\n"
-"X-Generator: Launchpad (build 17990)\n"
+"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 
 #. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:2
+#: data/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_Autorizar"
 
 #. Label beside username entry
-#: ../data/simple-scan.ui.h:4
+#: data/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "Nome do _utilizador para o recurso:"
 
 #. Label beside password entry
-#: ../data/simple-scan.ui.h:6
+#: data/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Palavra-passe:"
 
 #. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:8
+#: data/simple-scan.ui:188
 msgid "Front and Back"
 msgstr "Frente e verso"
 
 #. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:10
+#: data/simple-scan.ui:192
 msgid "Front"
 msgstr "Frente"
 
 #. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:12
+#: data/simple-scan.ui:196
 msgid "Back"
 msgstr "Verso"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
-#: ../data/appdata/simple-scan.appdata.xml.in.h:1
+#: data/simple-scan.ui:225 data/simple-scan.ui:809
+#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr "Digitalização"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:16
+#: data/simple-scan.ui:241
 msgid "_Document"
 msgstr "_Documento"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:18
+#: data/simple-scan.ui:260
 msgid "Sc_an"
 msgstr "Digit_alizar"
 
+#. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:20
+#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
 msgid "Single _Page"
 msgstr "_Página única"
 
+#. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:22
+#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr "Todas as páginas a partir do _alimentador"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:24
+#: data/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "_Parar digitalização"
 
-#: ../data/simple-scan.ui.h:25
+#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
 msgid "Text"
 msgstr "Texto"
 
-#: ../data/simple-scan.ui.h:26
+#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
 msgid "Photo"
 msgstr "Foto"
 
 #. Menu item to reorder pages
-#. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1183 ../src/ui.vala:1841
+#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr "Reordenar páginas"
 
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: data/simple-scan.ui:367
 msgid "_Email"
 msgstr "_Email"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: data/simple-scan.ui:430
 msgid "_Page"
 msgstr "_Página"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: data/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "Rodar à _esquerda"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: data/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "Rodar à _direita"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: data/simple-scan.ui:460
 msgid "_Crop"
 msgstr "_Cortar"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: data/simple-scan.ui:470
 msgid "_None"
 msgstr "_Nenhum"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: data/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: data/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: data/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: data/simple-scan.ui:514
 msgid "_Letter"
 msgstr "_Carta"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: data/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: data/simple-scan.ui:536
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: data/simple-scan.ui:547
 msgid "_Custom"
 msgstr "_Personalizar"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: data/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr "_Rodar recorte"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: data/simple-scan.ui:578
 msgid "Move Left"
 msgstr "Mover para a esquerda"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: data/simple-scan.ui:587
 msgid "Move Right"
 msgstr "Mover para a direita"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: data/simple-scan.ui:624
 msgid "_Help"
 msgstr "_Ajuda"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: data/simple-scan.ui:632
 msgid "_Contents"
 msgstr "_Conteúdos"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: data/simple-scan.ui:674 data/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "Iniciar um novo documento"
 
-#: ../data/simple-scan.ui.h:67
+#: data/simple-scan.ui:675
 msgid "New"
 msgstr "Novo"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: data/simple-scan.ui:689 data/simple-scan.ui:836
 msgid "Scan a single page from the scanner"
 msgstr "Digitalizar uma página no digitalizador"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: data/simple-scan.ui:691 data/simple-scan.ui:837
 msgid "Scan"
 msgstr "Digitalizar"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: data/simple-scan.ui:707 data/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "Guardar documento num ficheiro"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1842
+#: data/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "Guardar"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: data/simple-scan.ui:724 data/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "Parar digitalização atual"
 
-#: ../data/simple-scan.ui.h:77
+#: data/simple-scan.ui:725 data/simple-scan.ui:825
 msgid "Stop"
 msgstr "Parar"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: data/simple-scan.ui:749 data/simple-scan.ui:936
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Rodar a página para a esquerda (contra ponteiros do relógio)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: data/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "Rodar à esquerda"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: data/simple-scan.ui:764 data/simple-scan.ui:914
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Rodar a página para a direita (ponteiros do relógio)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: data/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "Rodar à direita"
 
-#: ../data/simple-scan.ui.h:86
+#: data/simple-scan.ui:779 data/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "Cortar a página selecionada"
 
-#: ../data/simple-scan.ui.h:87
+#: data/simple-scan.ui:781
 msgid "Crop"
 msgstr "Recortar"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1849
+#: data/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "Preferências"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: data/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "Origem da digitalizaçã_o:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: data/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "Resolução do _texto:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: data/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "_Resolução da foto:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: data/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "Lado da digitalização"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: data/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "Tamanho da página:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: data/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "Brilho:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: data/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "Contraste:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: data/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "Qualidade:"
 
-#: ../data/simple-scan.desktop.in.h:2
+#: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr "Scanner de documentos"
 
-#: ../data/simple-scan.desktop.in.h:3
+#: data/simple-scan.desktop.in:5
 msgid "Scan Documents"
 msgstr "Digitalizar documentos"
 
-#: ../data/simple-scan.desktop.in.h:4
+#: data/simple-scan.desktop.in:6
 msgid "scan;scanner;flatbed;adf;"
 msgstr "scan;scanner;flatbed;adf;"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Device to scan from"
-msgstr "Dispositivo de onde digitalizar"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "SANE device to acquire images from."
-msgstr "Dispositivo SANE para obter imagens"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "Type of document being scanned"
-msgstr "Tipo do documento a ser digitalizado"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
-msgid ""
-"Type of document being scanned. This setting decides on the scan resolution, "
-"colors and post-processing."
-msgstr ""
-"Tipo de documento a ser digitalizado. Esta configuração decide sobre a "
-"resolução de digitalização, cores e pós-processamento."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
-msgid "Width of paper in tenths of a mm"
-msgstr "Largura do papel em milímetros"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
+#: data/simple-scan.desktop.in:8
+msgid "scanner"
 msgstr ""
-"A largura do papel em milimetros (ou 0 para detecção automática de papel)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
-msgid "Height of paper in tenths of a mm"
-msgstr "Altura da folha em décimos de mm"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-"A altura do papel em milímetros (ou 0 para detecção automática de papel)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "Brightness of scan"
-msgstr "Brilho da digitalização"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "The brightness adjustment from -100 to 100 (0 being none)."
-msgstr "O ajuste do brilho desde -100 a 100 (0 sendo nenhum)"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid "Contrast of scan"
-msgstr "Contraste da digitalização"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "The contrast adjustment from -100 to 100 (0 being none)."
-msgstr "O ajuste do contraste desde -100 a 100 (0 sendo nada)"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid "Resolution for text scans"
-msgstr "Resolução para digitalização de textos"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
-msgid "The resolution in dots-per-inch to use when scanning text."
-msgstr ""
-"A resolução em pontos-por-polegada a ser usada quando digitalizar texto."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
-msgid "Resolution for photo scans"
-msgstr "Resolução para digitalização de fotos"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr ""
-"A resolução em pontos-por-polegadas  a ser usada quando digitalizar fotos."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
-msgid "Page side to scan"
-msgstr "Lado da página a digitalizar"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
-msgid "The page side to scan."
-msgstr "O lado da página para digitalizar."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
-msgid "Directory to save files to"
-msgstr "Pasta para guardar os ficheiros"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
-msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
-msgstr ""
-"O diretório no qual salvar os ficheiros. Usa o diretório de documentos "
-"predefinido se não for configurado."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
-msgid "Quality value to use for JPEG compression"
-msgstr "Valor de qualidade a usar na compressão JPEG"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Quality value to use for JPEG compression."
-msgstr "Valor de qualidade a usar na compressão JPEG."
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+#: data/simple-scan.appdata.xml.in:8
 msgid ""
 "A really easy way to scan both documents and photos. You can crop out the "
 "bad parts of a photo and rotate it if it is the wrong way round. You can "
@@ -418,202 +320,168 @@ msgstr ""
 "cortar e rodar. Pode imprimir as digitalizações, exportar para PDF, ou "
 "guardar em vários tipos de formatos de imagem."
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+#: data/simple-scan.appdata.xml.in:13
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 "Simple Scan usa a estrutura SANE para suportar a maior parte dos scanners "
 "atuais."
 
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Sem digitalizador disponível. Por favor, ligue um scanner."
 
-#. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "Impossível ligar ao scanner"
 
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "Não é possível iniciar a digitalização"
 
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1236 src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr "Erro de comunicação com scanner"
 
-#. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "Mostrar a versão de lançamento"
 
-#. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr "Imprimir mensagens de depuração"
 
-#: ../src/simple-scan.vala:26
+#: src/simple-scan.vala:26
 msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr ""
 "Compatibilizar ficheiros PDF gerados por versões mais antigas do "
 "Digitalizações"
 
-#. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:391
+#: src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Falhou ao digitalizar"
 
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DEVICE...] - Utilitário de digitalização"
 
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Execute '%s --help' para consultar uma lista completa das opções de linha de "
 "comando disponíveis."
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:318 src/ui.vala:1602 src/ui.vala:1887
 msgid "_Close"
 msgstr "Fechar"
 
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:327
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "É necessário utilizador e palavra-passe para aceder a '%s'"
 
-#. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:375
 msgid "No scanners detected"
 msgstr "Sem scanners detetados"
 
-#. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:377
 msgid "Please check your scanner is connected and powered on"
 msgstr "Verifique se o seu scanner está conetado e ligado"
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:382
 msgid "Additional software needed"
 msgstr "Software adicional necessário"
 
-#. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr "Precisa instalar o driver de software para o seu scanner."
 
-#. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:506 src/ui.vala:1843
 msgid "Save As..."
 msgstr "Guardar como..."
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:509 src/ui.vala:675
 msgid "_Cancel"
 msgstr "Cancelar"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:510 src/ui.vala:676
 msgid "_Save"
 msgstr "Guardar"
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "Documento digitalizado.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:521
 msgid "Image Files"
 msgstr "Ficheiros de imagem"
 
-#. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:527
 msgid "All Files"
 msgstr "Todos os ficheiros"
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (documento multi-página)"
 
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (comprimido)"
 
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (sem perdas)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:557
 msgid "File format:"
 msgstr "Formato do ficheiro:"
 
-#. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:650
 msgid "Failed to save file"
 msgstr "Falhou ao guardar o ficheiro"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:673
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Se não guardar, as alteração serão perdidas permanentemente."
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:708
+#: src/ui.vala:708
 msgid "Save current document?"
 msgstr "Guardar documento atual?"
 
-#. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:710
 msgid "Discard Changes"
 msgstr "Descartar alterações"
 
-#. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "Incapaz de gravar imagem para pré-visualização"
 
-#. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "Não foi possível abrir a aplicação de visualização de imagem"
 
-#. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1206
 msgid "Combine sides"
 msgstr "Combinar lados"
 
-#. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr "Combinar lados (inverso)"
 
-#. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1226
 msgid "Reverse"
 msgstr "Inverter"
 
-#. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr "Manter inalterado"
 
-#. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "Não foi possível abrir o ficheiro da ajuda"
 
-#. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1472
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -642,17 +510,15 @@ msgstr ""
 "\n"
 "este programa. Caso contrário, veja <http://www.gnu.org/licenses/>."
 
-#. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "Acerca do Digitalizações (Simple Scan)"
 
-#. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "Ferramenta simples para digitalizar documentos"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -664,7 +530,6 @@ msgstr ""
 "  António PT https://launchpad.net/~antoniopt\n"
 "  Carlos Manuel https://launchpad.net/~crolidge\n"
 "  Claudio Novais https://launchpad.net/~claudiocn\n"
-"  Daniel Carvalho https://launchpad.net/~danielcarvalhobt\n"
 "  David Gomes https://launchpad.net/~davidgomes\n"
 "  Diogo Lavareda https://launchpad.net/~diogolavareda\n"
 "  Fernando Carvalho https://launchpad.net/~phaetonkde\n"
@@ -677,7 +542,6 @@ msgstr ""
 "  Jaime Pereira https://launchpad.net/~jaimepereira\n"
 "  Jose Almeida https://launchpad.net/~josealmeida\n"
 "  Luis Pratas https://launchpad.net/~luispratas\n"
-"  Marco Paulo Martins Sousa https://launchpad.net/~marcomsousa\n"
 "  Maria Loureiro https://launchpad.net/~cloureiro\n"
 "  Paulo Henriques https://launchpad.net/~pajohenriques\n"
 "  Ricardo Conde https://launchpad.net/~turotulco\n"
@@ -685,26 +549,21 @@ msgstr ""
 "  Sérgio Faria https://launchpad.net/~sergio91pt\n"
 "  Tiago Carrondo https://launchpad.net/~tcarrondo\n"
 "  Tiago Silva https://launchpad.net/~tiagosilva\n"
-"  joao dourado https://launchpad.net/~sjdourado\n"
 "  styluss https://launchpad.net/~styluss"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "Guardar documento antes de sair?"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "Sair sem guardar"
 
-#. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr "Aparenta ter um scanner da Brother."
 
-#. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1581
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
@@ -712,13 +571,11 @@ msgstr ""
 "Os controladores estão disponíveis em <a "
 "href=\"http://support.brother.com\">Brother website</a>"
 
-#. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr "Aparentemente tem um digitalizador Samsung."
 
-#. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1587
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
@@ -726,18 +583,15 @@ msgstr ""
 "Os controladores estão disponíveis em <a "
 "href=\"http://samsung.com/support\">Samsung website</a>"
 
-#. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr "Aparentemente tem um digitalizador HP"
 
-#. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr "Aparentemente tem um digitalizador Epson"
 
-#. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1598
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
@@ -745,140 +599,126 @@ msgstr ""
 "Os drivers para isto estão disponíveis em <a "
 "href=\"http://support.epson.com\">Epson</a>."
 
-#. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1602
 msgid "Install drivers"
 msgstr "Instalar drivers"
 
-#. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 "Uma vez instalado vai necessitar de re-iniciar a Digitalização Simples"
 
-#. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr "A instalar drivers..."
 
-#. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr "Controladores instalados com sucesso!"
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Erro na instalação dos controladores (código de erro %d)"
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr "Falhou a instalar os drivers."
 
-#. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1676
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr "Necessita de instalar o pacote(s) %s"
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (predefinido)"
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (rascunho)"
 
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (alta-resolução)"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/ui.vala:1793
 #, c-format
 msgid "%d dpi"
 msgstr "%d ppp"
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1835
 msgid "New Document"
 msgstr "Novo documento"
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1840
 msgid "Document"
 msgstr "Documento"
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1844
 msgid "Email..."
 msgstr "Email..."
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1845
 msgid "Print..."
 msgstr "Imprimir..."
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1853
 msgid "Help"
 msgstr "Ajuda"
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1854
 msgid "About"
 msgstr "Sobre"
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1855
 msgid "Quit"
 msgstr "Sair"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "Alterar _digitalizador"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr "_Instalar drivers"
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1897
 msgid "Automatic"
 msgstr "Automático"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1947
 msgid "Darker"
 msgstr "Escurecer"
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1949
 msgid "Lighter"
 msgstr "Clarear"
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:1957
 msgid "Less"
 msgstr "Menos"
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:1959
 msgid "More"
 msgstr "Mais"
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:1967
 msgid "Minimum"
 msgstr "Mínimo"
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:1969
 msgid "Maximum"
 msgstr "Máximo"
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2008
 msgid "Saving document..."
 msgstr "A guardar o documento..."
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "A guardar a página %d de %d"
@@ -900,15 +740,33 @@ msgstr "A guardar a página %d de %d"
 #~ "Utilização:\n"
 #~ "  %s [DISPOSITIVO...] - Utilitário de digitalização"
 
+#~ msgid "Page side to scan"
+#~ msgstr "Lado da página a digitalizar"
+
 #~ msgid "Height of scanned image in pixels"
 #~ msgstr "Altura da imagem digitalizada em pixeis"
 
+#~ msgid "SANE device to acquire images from."
+#~ msgstr "Dispositivo SANE para obter imagens"
+
 #~ msgid "Direction of scan"
 #~ msgstr "Direcção da digitalização"
 
+#~ msgid "Resolution for text scans"
+#~ msgstr "Resolução para digitalização de textos"
+
+#~ msgid "Resolution for photo scans"
+#~ msgstr "Resolução para digitalização de fotos"
+
 #~ msgid "Resolution of last scanned image"
 #~ msgstr "Resolução da última imagem digitalizada"
 
+#~ msgid "Directory to save files to"
+#~ msgstr "Pasta para guardar os ficheiros"
+
+#~ msgid "Height of paper in tenths of a mm"
+#~ msgstr "Altura da folha em décimos de mm"
+
 #~ msgid "TRUE if the application window is maximized"
 #~ msgstr "VERDADE se a janela da aplicação está maximizada."
 
@@ -927,6 +785,9 @@ msgstr "A guardar a página %d de %d"
 #~ "A altura da imagem digitalizada em pixels. Este valor é actualizado com o "
 #~ "valor da última página digitalizada."
 
+#~ msgid "Device to scan from"
+#~ msgstr "Dispositivo de onde digitalizar"
+
 #~ msgid ""
 #~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
 #~ msgstr ""
@@ -934,6 +795,21 @@ msgstr "A guardar a página %d de %d"
 #~ "'frente' 'verso'"
 
 #~ msgid ""
+#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr ""
+#~ "A altura do papel em milímetros (ou 0 para detecção automática de papel)."
+
+#~ msgid ""
+#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr ""
+#~ "A largura do papel em milimetros (ou 0 para detecção automática de papel)."
+
+#~ msgid "Type of document being scanned"
+#~ msgstr "Tipo do documento a ser digitalizado"
+
+#~ msgid ""
 #~ "Type of document being scanned. 'text' for text documents, 'photo' for "
 #~ "photos. This setting decides on the scan resolution, colors and post-"
 #~ "processing."
@@ -953,6 +829,17 @@ msgstr "A guardar a página %d de %d"
 #~ msgstr ""
 #~ "A resolução em pontos-por-polegada da imagem anteriormente digitalizada."
 
+#~ msgid "The resolution in dots-per-inch to use when scanning text."
+#~ msgstr ""
+#~ "A resolução em pontos-por-polegada a ser usada quando digitalizar texto."
+
+#~ msgid "The resolution in dots-per-inch to use when scanning photos."
+#~ msgstr ""
+#~ "A resolução em pontos-por-polegadas  a ser usada quando digitalizar fotos."
+
+#~ msgid "Width of paper in tenths of a mm"
+#~ msgstr "Largura do papel em milímetros"
+
 #~ msgid "Window height in pixels"
 #~ msgstr "Altura da janela em pixels"
 
@@ -1003,8 +890,42 @@ msgstr "A guardar a página %d de %d"
 #~ "--gtk-module=MODULES   Carregar módulos GTK+ adicionais\n"
 #~ "--g-fatal-warnings     Tornar todos os avisos fatais"
 
+#~ msgid "The page side to scan."
+#~ msgstr "O lado da página para digitalizar."
+
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "A direção do scanner através da página digitalizada."
 
+#~ msgid ""
+#~ "Type of document being scanned. This setting decides on the scan resolution, "
+#~ "colors and post-processing."
+#~ msgstr ""
+#~ "Tipo de documento a ser digitalizado. Esta configuração decide sobre a "
+#~ "resolução de digitalização, cores e pós-processamento."
+
+#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
+#~ msgstr "O ajuste do contraste desde -100 a 100 (0 sendo nada)"
+
+#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
+#~ msgstr "O ajuste do brilho desde -100 a 100 (0 sendo nenhum)"
+
+#~ msgid "Quality value to use for JPEG compression."
+#~ msgstr "Valor de qualidade a usar na compressão JPEG."
+
+#~ msgid "Contrast of scan"
+#~ msgstr "Contraste da digitalização"
+
+#~ msgid "Brightness of scan"
+#~ msgstr "Brilho da digitalização"
+
+#~ msgid "Quality value to use for JPEG compression"
+#~ msgstr "Valor de qualidade a usar na compressão JPEG"
+
+#~ msgid ""
+#~ "The directory to save files to. Defaults to the documents directory if unset."
+#~ msgstr ""
+#~ "O diretório no qual salvar os ficheiros. Usa o diretório de documentos "
+#~ "predefinido se não for configurado."
+
 #~ msgid "Select File _Type"
 #~ msgstr "Selecionar _tipo de ficheiro"
diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo
new file mode 100644
index 0000000..a58734b
--- /dev/null
+++ b/po/pt_BR.gmo
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 5bf534a..3ada035 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,408 +7,309 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-06 14:16+1200\n"
+"POT-Creation-Date: 2016-07-29 12:47+1200\n"
 "PO-Revision-Date: 2013-04-16 12:21+0000\n"
 "Last-Translator: Neliton Pereira Jr. <nelitonpjr@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-04-14 05:40+0000\n"
-"X-Generator: Launchpad (build 17990)\n"
+"X-Launchpad-Export-Date: 2016-07-30 05:46+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 
 #. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:2
+#: data/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_Autorizar"
 
 #. Label beside username entry
-#: ../data/simple-scan.ui.h:4
+#: data/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "Nome de _usuário para o recurso:"
 
 #. Label beside password entry
-#: ../data/simple-scan.ui.h:6
+#: data/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Senha:"
 
 #. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:8
+#: data/simple-scan.ui:188
 msgid "Front and Back"
 msgstr "Frente e verso"
 
 #. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:10
+#: data/simple-scan.ui:192
 msgid "Front"
 msgstr "Frente"
 
 #. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:12
+#: data/simple-scan.ui:196
 msgid "Back"
 msgstr "Verso"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
-#: ../data/appdata/simple-scan.appdata.xml.in.h:1
+#: data/simple-scan.ui:225 data/simple-scan.ui:809
+#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr "Digitalizador simples"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:16
+#: data/simple-scan.ui:241
 msgid "_Document"
 msgstr "_Documento"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:18
+#: data/simple-scan.ui:260
 msgid "Sc_an"
 msgstr "Digit_alizar"
 
+#. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:20
+#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
 msgid "Single _Page"
 msgstr "_Página única"
 
+#. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:22
+#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr "Todas as páginas do ali_mentador"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:24
+#: data/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "Par_ar digitalização"
 
-#: ../data/simple-scan.ui.h:25
+#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
 msgid "Text"
 msgstr "Texto"
 
-#: ../data/simple-scan.ui.h:26
+#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
 msgid "Photo"
 msgstr "Foto"
 
 #. Menu item to reorder pages
-#. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1183 ../src/ui.vala:1841
+#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr "Reordenar páginas"
 
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: data/simple-scan.ui:367
 msgid "_Email"
 msgstr "_E-mail"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: data/simple-scan.ui:430
 msgid "_Page"
 msgstr "_Página"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: data/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "Girar à _esquerda"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: data/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "Girar à di_reita"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: data/simple-scan.ui:460
 msgid "_Crop"
 msgstr "Re_cortar"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: data/simple-scan.ui:470
 msgid "_None"
 msgstr "_Nenhum"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: data/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: data/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: data/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: data/simple-scan.ui:514
 msgid "_Letter"
 msgstr "_Carta"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: data/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "_Ofício"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: data/simple-scan.ui:536
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: data/simple-scan.ui:547
 msgid "_Custom"
 msgstr "_Personalizar"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: data/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr "Gira_r área recortada"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: data/simple-scan.ui:578
 msgid "Move Left"
 msgstr "Mover para a esquerda"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: data/simple-scan.ui:587
 msgid "Move Right"
 msgstr "Mover para a direita"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: data/simple-scan.ui:624
 msgid "_Help"
 msgstr "A_juda"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: data/simple-scan.ui:632
 msgid "_Contents"
 msgstr "_Conteúdo"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: data/simple-scan.ui:674 data/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "Iniciar um novo documento"
 
-#: ../data/simple-scan.ui.h:67
+#: data/simple-scan.ui:675
 msgid "New"
 msgstr "Novo"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: data/simple-scan.ui:689 data/simple-scan.ui:836
 msgid "Scan a single page from the scanner"
 msgstr "Digitalizar uma página no digitalizador"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: data/simple-scan.ui:691 data/simple-scan.ui:837
 msgid "Scan"
 msgstr "Digitalizar"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: data/simple-scan.ui:707 data/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "Salvar documento em arquivo"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1842
+#: data/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "Salvar"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: data/simple-scan.ui:724 data/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "Parar a digitalização atual"
 
-#: ../data/simple-scan.ui.h:77
+#: data/simple-scan.ui:725 data/simple-scan.ui:825
 msgid "Stop"
 msgstr "Parar"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: data/simple-scan.ui:749 data/simple-scan.ui:936
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Girar a página à esquerda (sentido anti-horário)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: data/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "Girar à esquerda"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: data/simple-scan.ui:764 data/simple-scan.ui:914
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Girar a página à direita (sentido horário)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: data/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "Girar à direita"
 
-#: ../data/simple-scan.ui.h:86
+#: data/simple-scan.ui:779 data/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "Recortar a página selecionada"
 
-#: ../data/simple-scan.ui.h:87
+#: data/simple-scan.ui:781
 msgid "Crop"
 msgstr "Recortar"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1849
+#: data/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "Preferências"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: data/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "Origem da digitalizaçã_o:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: data/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "Resolução do _texto:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: data/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "Resolução da _foto:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: data/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "Lado a digitalizar:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: data/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "Tamanho da página:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: data/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "Brilho:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: data/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "Contraste:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: data/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "Qualidade:"
 
-#: ../data/simple-scan.desktop.in.h:2
+#: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:3
+#: data/simple-scan.desktop.in:5
 msgid "Scan Documents"
 msgstr "Digitalizar documentos"
 
-#: ../data/simple-scan.desktop.in.h:4
+#: data/simple-scan.desktop.in:6
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Device to scan from"
-msgstr "Dispositivo de onde digitalizar"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "SANE device to acquire images from."
-msgstr "Dispositivo de onde o SANE adquirire imagens."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "Type of document being scanned"
-msgstr "Tipo do documento a ser digitalizado"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
-msgid ""
-"Type of document being scanned. This setting decides on the scan resolution, "
-"colors and post-processing."
-msgstr ""
-"Tipo de documento a ser digitalizado. Esta configuração define a resolução "
-"da digitalização, cores e pós-processamento."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
-msgid "Width of paper in tenths of a mm"
-msgstr "Largura do papel em décimos de milímetro"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
+#: data/simple-scan.desktop.in:8
+msgid "scanner"
 msgstr ""
-"A largura do papel em décimos de mm (ou 0 para detecção automática de papel)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
-msgid "Height of paper in tenths of a mm"
-msgstr "Altura do papel em décimos de milímetro"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-"A altura do papel em décimos de milímetro (ou 0 para detecção automática de "
-"papel)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "Brightness of scan"
-msgstr "Luminosidade do digitalizador"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "The brightness adjustment from -100 to 100 (0 being none)."
-msgstr "O ajuste de luminosidade de -100 para 100 (0 sendo nenhum)"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid "Contrast of scan"
-msgstr "Contraste do digitalizador"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "The contrast adjustment from -100 to 100 (0 being none)."
-msgstr "O ajuste do contraste de -100 para 100 (0 sendo nenhum)"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid "Resolution for text scans"
-msgstr "Resolução para digitalização de textos"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
-msgid "The resolution in dots-per-inch to use when scanning text."
-msgstr ""
-"A resolução em pontos por polegada a ser usada na digitalização e textos."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
-msgid "Resolution for photo scans"
-msgstr "Resolução para digitalização de fotos"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr ""
-"A resolução em pontos por polegadas a ser usada na digitalização de fotos."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
-msgid "Page side to scan"
-msgstr "Lado da página a ser digitalizado"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
-msgid "The page side to scan."
-msgstr "O lado da página a ser digitalizado."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
-msgid "Directory to save files to"
-msgstr "Diretório para salvar arquivos"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
-msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
-msgstr ""
-"O diretório no qual salvar os arquivos. Se não configurado, o diretório "
-"Documentos é usado como padrão."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
-msgid "Quality value to use for JPEG compression"
-msgstr "Qualidade para usar na compressão JPEG"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Quality value to use for JPEG compression."
-msgstr "Qualidade para usar na compressão JPEG."
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+#: data/simple-scan.appdata.xml.in:8
 msgid ""
 "A really easy way to scan both documents and photos. You can crop out the "
 "bad parts of a photo and rotate it if it is the wrong way round. You can "
@@ -416,200 +317,166 @@ msgid ""
 "formats."
 msgstr ""
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+#: data/simple-scan.appdata.xml.in:13
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr ""
 "Nenhum digitalizador disponível. Por favor, conecte um digitalizador."
 
-#. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "Não foi possível conectar-se ao digitalizador"
 
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "Não foi possível iniciar o digitalizador"
 
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1236 src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr "Erro na comunicação com o digitalizador"
 
-#. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "Mostrar versão de lançamento"
 
-#. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr "Imprimir mensagens de depuração"
 
-#: ../src/simple-scan.vala:26
+#: src/simple-scan.vala:26
 msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr ""
 "Corrigir arquivos PDF gerados com versões anteriores do Digitalizador simples"
 
-#. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:391
+#: src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Falha ao digitalizar"
 
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DISPOSITIVO...] - Utilitário de digitalização"
 
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Execute '%s --help' para ver a lista completa de opções disponíveis para "
 "linha de comando."
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:318 src/ui.vala:1602 src/ui.vala:1887
 msgid "_Close"
 msgstr "Fe_char"
 
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:327
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "É necessário o nome de usuário e senha para acessar '%s'"
 
-#. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:375
 msgid "No scanners detected"
 msgstr "Nenhum digitalizador detectado"
 
-#. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:377
 msgid "Please check your scanner is connected and powered on"
 msgstr "Por favor verifique se o seu digitalizador está conectado e ligado"
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:382
 msgid "Additional software needed"
 msgstr ""
 
-#. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr ""
 
-#. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:506 src/ui.vala:1843
 msgid "Save As..."
 msgstr "Salvar como..."
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:509 src/ui.vala:675
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:510 src/ui.vala:676
 msgid "_Save"
 msgstr "_Salvar"
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "Documento digitalizado.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:521
 msgid "Image Files"
 msgstr "Arquivos de imagem"
 
-#. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:527
 msgid "All Files"
 msgstr "Todos os arquivos"
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (documento com múltiplas páginas)"
 
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (comprimido)"
 
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (sem perdas)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:557
 msgid "File format:"
 msgstr ""
 
-#. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:650
 msgid "Failed to save file"
 msgstr "Falha ao salvar o arquivo"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:673
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Se você não salvar, as alterações serão permanentemente perdidas."
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:708
+#: src/ui.vala:708
 msgid "Save current document?"
 msgstr "Salvar documento atual?"
 
-#. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:710
 msgid "Discard Changes"
 msgstr "Descartar alterações"
 
-#. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "Não é possível salvar imagem para visualização"
 
-#. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "Não foi possível abrir o aplicativo de visualização de imagem"
 
-#. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1206
 msgid "Combine sides"
 msgstr "Combine os lados"
 
-#. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr "Combine os lados (reverso)"
 
-#. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1226
 msgid "Reverse"
 msgstr "Reverso"
 
-#. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr "Manter inalterado"
 
-#. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "Não foi possível abrir o arquivo de ajuda"
 
-#. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1472
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -638,34 +505,31 @@ msgstr ""
 "Você deve ter recebido uma cópia da Licença Pública Geral GNU juntamente a\n"
 "este programa. Caso contrário, acesse <http://www.gnu.org/licenses/>."
 
-#. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "Sobre o Digitalizador simples"
 
-#. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "Ferramenta simples para digitalizar documentos"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
-"  Almufadado https://launchpad.net/~almufadado\n"
 "  André Gondim https://launchpad.net/~andregondim\n"
 "  Beatriz Vital https://launchpad.net/~vitalb\n"
 "  Benjamim Gois https://launchpad.net/~benjamim-gois\n"
 "  Celio Alves https://launchpad.net/~celio.alves\n"
 "  Celio Ricardo Quaio Goetten https://launchpad.net/~celioric\n"
 "  Celso H. L. S. Junior https://launchpad.net/~celsojunior\n"
+"  Douglas Santos https://launchpad.net/~douglasrpg\n"
 "  Fábio Nogueira https://launchpad.net/~fnogueira\n"
 "  Matheus Pacheco de Andrade https://launchpad.net/~matheusp-andrade-"
 "deactivatedaccount\n"
 "  Neliton Pereira Jr. https://launchpad.net/~nelitonpjr\n"
 "  Pablo Diego Moço https://launchpad.net/~pablodm89\n"
 "  Paulo José https://launchpad.net/~pauloup\n"
-"  Paulo Pernomian https://launchpad.net/~paulopernomian\n"
 "  Rafael Neri https://launchpad.net/~rafepel\n"
 "  Rafael Zenni https://launchpad.net/~rafaeldz\n"
 "  Salomão Carneiro de Brito https://launchpad.net/~salomaocar\n"
@@ -677,190 +541,167 @@ msgstr ""
 "  kahue https://launchpad.net/~kahuemm\n"
 "  millemiglia https://launchpad.net/~dnieper650"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "Salvar o documento antes de sair?"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "Sair sem salvar"
 
-#. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
-#. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1581
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
 msgstr ""
 
-#. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
-#. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1587
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
 msgstr ""
 
-#. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr ""
 
-#. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
-#. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1598
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
 msgstr ""
 
-#. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1602
 msgid "Install drivers"
 msgstr ""
 
-#. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
-#. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr ""
 
-#. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr ""
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr ""
 
-#. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1676
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr ""
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (padrão)"
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (rascunho)"
 
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (alta resolução)"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/ui.vala:1793
 #, c-format
 msgid "%d dpi"
 msgstr "%d ppp"
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1835
 msgid "New Document"
 msgstr "Novo documento"
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1840
 msgid "Document"
 msgstr "Documentos"
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1844
 msgid "Email..."
 msgstr "E-mail..."
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1845
 msgid "Print..."
 msgstr "Imprimir..."
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1853
 msgid "Help"
 msgstr "Ajuda"
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1854
 msgid "About"
 msgstr "Sobre"
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1855
 msgid "Quit"
 msgstr "Sair"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "Alterar _digitalizador"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr ""
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1897
 msgid "Automatic"
 msgstr "Automático"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1947
 msgid "Darker"
 msgstr "Mais escuro"
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1949
 msgid "Lighter"
 msgstr "Mais claro"
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:1957
 msgid "Less"
 msgstr "Menos"
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:1959
 msgid "More"
 msgstr "Mais"
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:1967
 msgid "Minimum"
 msgstr "Mínima"
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:1969
 msgid "Maximum"
 msgstr "Máxima"
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2008
 msgid "Saving document..."
 msgstr "Salvando documento..."
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Salvando página %d de %d"
@@ -907,6 +748,9 @@ msgstr "Salvando página %d de %d"
 #~ msgid "Height of scanned image in pixels"
 #~ msgstr "Altura da imagem digitalizada em pixels"
 
+#~ msgid "Resolution for photo scans"
+#~ msgstr "Resolução para digitalização de fotos"
+
 #~ msgid "Window height in pixels"
 #~ msgstr "Altura da janela em pixels"
 
@@ -916,6 +760,9 @@ msgstr "Salvando página %d de %d"
 #~ msgid "Width of scanned image in pixels"
 #~ msgstr "Largura da imagem digitalizada em pixels"
 
+#~ msgid "Resolution for text scans"
+#~ msgstr "Resolução para digitalização de textos"
+
 #~ msgid "The resolution in dots-per-inch of the previously scanned image."
 #~ msgstr ""
 #~ "A resolução em pontos por polegada da imagem previamente digitalizada."
@@ -930,6 +777,9 @@ msgstr "Salvando página %d de %d"
 #~ "A altura da imagem digitalizada em pixels. Este valor é atualizado com o "
 #~ "valor da última página digitalizada."
 
+#~ msgid "Device to scan from"
+#~ msgstr "Dispositivo de onde digitalizar"
+
 #~ msgid "Direction of scan"
 #~ msgstr "Direção da digitalização"
 
@@ -972,6 +822,18 @@ msgstr "Salvando página %d de %d"
 #~ msgid "Scanned Document"
 #~ msgstr "Documento digitalizado"
 
+#~ msgid "Directory to save files to"
+#~ msgstr "Diretório para salvar arquivos"
+
+#~ msgid "Height of paper in tenths of a mm"
+#~ msgstr "Altura do papel em décimos de milímetro"
+
+#~ msgid ""
+#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr ""
+#~ "A largura do papel em décimos de mm (ou 0 para detecção automática de papel)."
+
 #~ msgid ""
 #~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
 #~ msgstr ""
@@ -979,14 +841,75 @@ msgstr "Salvando página %d de %d"
 #~ "'frente' 'verso'"
 
 #~ msgid ""
+#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr ""
+#~ "A altura do papel em décimos de milímetro (ou 0 para detecção automática de "
+#~ "papel)."
+
+#~ msgid "Width of paper in tenths of a mm"
+#~ msgstr "Largura do papel em décimos de milímetro"
+
+#~ msgid ""
 #~ "The width of scanned image in pixels. This value is updated to what the last "
 #~ "scanned page was."
 #~ msgstr ""
 #~ "A largura da imagem digitalizada em pixels. Este valor é atualizado com o "
 #~ "valor da última imagem que foi digitalizada."
 
+#~ msgid ""
+#~ "Type of document being scanned. This setting decides on the scan resolution, "
+#~ "colors and post-processing."
+#~ msgstr ""
+#~ "Tipo de documento a ser digitalizado. Esta configuração define a resolução "
+#~ "da digitalização, cores e pós-processamento."
+
+#~ msgid "Type of document being scanned"
+#~ msgstr "Tipo do documento a ser digitalizado"
+
 #~ msgid "TRUE if the application window is maximized"
 #~ msgstr "VERDADEIRO se a janela do aplicativo estiver maximizada"
 
+#~ msgid "SANE device to acquire images from."
+#~ msgstr "Dispositivo de onde o SANE adquirire imagens."
+
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "A direção em que o digitalizador percorre a página digitalizada."
+
+#~ msgid "The page side to scan."
+#~ msgstr "O lado da página a ser digitalizado."
+
+#~ msgid "Page side to scan"
+#~ msgstr "Lado da página a ser digitalizado"
+
+#~ msgid "The resolution in dots-per-inch to use when scanning text."
+#~ msgstr ""
+#~ "A resolução em pontos por polegada a ser usada na digitalização e textos."
+
+#~ msgid "The resolution in dots-per-inch to use when scanning photos."
+#~ msgstr ""
+#~ "A resolução em pontos por polegadas a ser usada na digitalização de fotos."
+
+#~ msgid ""
+#~ "The directory to save files to. Defaults to the documents directory if unset."
+#~ msgstr ""
+#~ "O diretório no qual salvar os arquivos. Se não configurado, o diretório "
+#~ "Documentos é usado como padrão."
+
+#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
+#~ msgstr "O ajuste do contraste de -100 para 100 (0 sendo nenhum)"
+
+#~ msgid "Contrast of scan"
+#~ msgstr "Contraste do digitalizador"
+
+#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
+#~ msgstr "O ajuste de luminosidade de -100 para 100 (0 sendo nenhum)"
+
+#~ msgid "Brightness of scan"
+#~ msgstr "Luminosidade do digitalizador"
+
+#~ msgid "Quality value to use for JPEG compression."
+#~ msgstr "Qualidade para usar na compressão JPEG."
+
+#~ msgid "Quality value to use for JPEG compression"
+#~ msgstr "Qualidade para usar na compressão JPEG"
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/ro.gmo b/po/ro.gmo
new file mode 100644
index 0000000..25e2831
--- /dev/null
+++ b/po/ro.gmo
diff --git a/po/ro.po b/po/ro.po
index 9fd4c0e..0473db6 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -7,407 +7,310 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-06 14:16+1200\n"
+"POT-Creation-Date: 2016-07-29 12:47+1200\n"
 "PO-Revision-Date: 2012-09-11 18:43+0000\n"
 "Last-Translator: Lucian Adrian Grijincu <lucian.grijincu@gmail.com>\n"
 "Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-04-14 05:40+0000\n"
-"X-Generator: Launchpad (build 17990)\n"
+"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 "Language: ro\n"
 
 #. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:2
+#: data/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_Autorizează"
 
 #. Label beside username entry
-#: ../data/simple-scan.ui.h:4
+#: data/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "Numele de _utilizator pentru resursă:"
 
 #. Label beside password entry
-#: ../data/simple-scan.ui.h:6
+#: data/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Parolă:"
 
 #. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:8
+#: data/simple-scan.ui:188
 msgid "Front and Back"
 msgstr "Față și verso"
 
 #. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:10
+#: data/simple-scan.ui:192
 msgid "Front"
 msgstr "Față"
 
 #. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:12
+#: data/simple-scan.ui:196
 msgid "Back"
 msgstr "Verso"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
-#: ../data/appdata/simple-scan.appdata.xml.in.h:1
+#: data/simple-scan.ui:225 data/simple-scan.ui:809
+#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr "Scanare simplă"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:16
+#: data/simple-scan.ui:241
 msgid "_Document"
 msgstr "_Document"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:18
+#: data/simple-scan.ui:260
 msgid "Sc_an"
 msgstr "Sc_anează"
 
+#. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:20
+#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
 msgid "Single _Page"
 msgstr "O singură _pagină"
 
+#. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:22
+#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr "Toate paginile de la tava cu _foi de hârtie"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:24
+#: data/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "Oprește _scanarea"
 
-#: ../data/simple-scan.ui.h:25
+#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
 msgid "Text"
 msgstr "Text"
 
-#: ../data/simple-scan.ui.h:26
+#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
 msgid "Photo"
 msgstr "Foto"
 
 #. Menu item to reorder pages
-#. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1183 ../src/ui.vala:1841
+#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr ""
 
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: data/simple-scan.ui:367
 msgid "_Email"
 msgstr "_Email"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: data/simple-scan.ui:430
 msgid "_Page"
 msgstr "_Pagină"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: data/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "Rotește la _stânga"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: data/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "Rotește la _dreapta"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: data/simple-scan.ui:460
 msgid "_Crop"
 msgstr "De_cupează"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: data/simple-scan.ui:470
 msgid "_None"
 msgstr "_Niciunul"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: data/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: data/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: data/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: data/simple-scan.ui:514
 msgid "_Letter"
 msgstr "_Scrisoare"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: data/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: data/simple-scan.ui:536
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: data/simple-scan.ui:547
 msgid "_Custom"
 msgstr "_Personalizat"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: data/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr "_Rotește zona decupată"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: data/simple-scan.ui:578
 msgid "Move Left"
 msgstr "Mută la stânga"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: data/simple-scan.ui:587
 msgid "Move Right"
 msgstr "Mută la dreapta"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: data/simple-scan.ui:624
 msgid "_Help"
 msgstr "_Ajutor"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: data/simple-scan.ui:632
 msgid "_Contents"
 msgstr "_Cuprins"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: data/simple-scan.ui:674 data/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "Începeți un document nou"
 
-#: ../data/simple-scan.ui.h:67
+#: data/simple-scan.ui:675
 msgid "New"
 msgstr "Nou"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: data/simple-scan.ui:689 data/simple-scan.ui:836
 msgid "Scan a single page from the scanner"
 msgstr "Scanați o singură pagină din scaner"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: data/simple-scan.ui:691 data/simple-scan.ui:837
 msgid "Scan"
 msgstr "Scanează"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: data/simple-scan.ui:707 data/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "Salvează documentul ca fișier"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1842
+#: data/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "Salvează"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: data/simple-scan.ui:724 data/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "Oprește scanarea curentă"
 
-#: ../data/simple-scan.ui.h:77
+#: data/simple-scan.ui:725 data/simple-scan.ui:825
 msgid "Stop"
 msgstr "Oprește"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: data/simple-scan.ui:749 data/simple-scan.ui:936
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Rotește pagina la stânga (în sens invers acelor de ceasornic)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: data/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "Rotește la stânga"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: data/simple-scan.ui:764 data/simple-scan.ui:914
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Rotește pagina la dreapta (în sensul acelor de ceasornic)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: data/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "Rotește la dreapta"
 
-#: ../data/simple-scan.ui.h:86
+#: data/simple-scan.ui:779 data/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "Decupează pagina selectată"
 
-#: ../data/simple-scan.ui.h:87
+#: data/simple-scan.ui:781
 msgid "Crop"
 msgstr "Decupează"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1849
+#: data/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "Preferințe"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: data/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "S_ursă scanare:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: data/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "Rezoluție _text:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: data/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "Rezoluție _foto :"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: data/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "Partea scanată:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: data/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "Dimensiunea paginii:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: data/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "Luminozitate:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: data/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "Contrast:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: data/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "Calitate:"
 
-#: ../data/simple-scan.desktop.in.h:2
+#: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:3
+#: data/simple-scan.desktop.in:5
 msgid "Scan Documents"
 msgstr "Scanează documente"
 
-#: ../data/simple-scan.desktop.in.h:4
+#: data/simple-scan.desktop.in:6
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Device to scan from"
-msgstr "Dispozitiv de folosit pentru scanare"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "SANE device to acquire images from."
-msgstr "Dispozitivul SANE din care se preiau imaginile."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "Type of document being scanned"
-msgstr "Tipul de document scanat"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
-msgid ""
-"Type of document being scanned. This setting decides on the scan resolution, "
-"colors and post-processing."
+#: data/simple-scan.desktop.in:8
+msgid "scanner"
 msgstr ""
-"Tipul de document care va fi scanat. Această opțiune determină rezoluția de "
-"scanare, culoarea și post-procesarea."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
-msgid "Width of paper in tenths of a mm"
-msgstr "Lățimea hârtiei în zecimi de mm"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-"Lățimea hârtiei în zecimi de mm (sau 0 pentru detectarea automată a hârtiei)"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
-msgid "Height of paper in tenths of a mm"
-msgstr "Înălțimea hârtiei în zecimi de mm"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-"Înălțimea hârtiei în zecimi de mm (sau 0 pentru detectarea automată a "
-"hârtiei)"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "Brightness of scan"
-msgstr "Luminozitate scanare"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "The brightness adjustment from -100 to 100 (0 being none)."
-msgstr "Reglare luminozitate de la -100 la 100 (0 fiind nimic)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid "Contrast of scan"
-msgstr "Contrast scanare"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "The contrast adjustment from -100 to 100 (0 being none)."
-msgstr "Reglare contrast de la -100 la 100 (0 fiind nimic)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid "Resolution for text scans"
-msgstr "Rezoluția pentru scanări text"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
-msgid "The resolution in dots-per-inch to use when scanning text."
-msgstr "Rezoluția în dpi (dots-per-inch) folosită la scanarea de text."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
-msgid "Resolution for photo scans"
-msgstr "Rezoluția pentru scanări foto"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr "Rezoluția în dpi (dots-per-inch) folosită la scanarea fotografiilor."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
-msgid "Page side to scan"
-msgstr "Partea de scanat a paginii"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
-msgid "The page side to scan."
-msgstr "Fața paginii care va fi scanată."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
-msgid "Directory to save files to"
-msgstr "Dosarul în care să se salveze fișierele"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
-msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
-msgstr ""
-"Dosarul în care să se salveze fișierele. Dacă nu este definit, fișierele "
-"sunt salvate în dosarul de documente."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
-msgid "Quality value to use for JPEG compression"
-msgstr "Valoare calitate pentru compresia JPEG"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Quality value to use for JPEG compression."
-msgstr "Valoare calitate pentru compresia JPEG"
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+#: data/simple-scan.appdata.xml.in:8
 msgid ""
 "A really easy way to scan both documents and photos. You can crop out the "
 "bad parts of a photo and rotate it if it is the wrong way round. You can "
@@ -415,200 +318,166 @@ msgid ""
 "formats."
 msgstr ""
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+#: data/simple-scan.appdata.xml.in:13
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Nu există niciun scaner disponibil. Conectați un scaner."
 
-#. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "Nu s-a putut realiza conexiunea la scaner"
 
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "Nu s-a putut porni scanarea"
 
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1236 src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr "Eroare la comunicarea cu scanerul"
 
-#. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "Arată versiunea"
 
-#. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr "Afișează mesajele pentru depanare"
 
-#: ../src/simple-scan.vala:26
+#: src/simple-scan.vala:26
 msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr ""
 "Repară fișiere PDF generate cu versiuni mai vechi ale programului scanare "
 "simplă"
 
-#. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:391
+#: src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Scanarea a eșuat"
 
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "DISPOZITIV...] - Utilitar pentru scanare"
 
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Rulați „%s --help” pentru a consulta lista completă a opțiunilor pentru "
 "comenzile mediului text."
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:318 src/ui.vala:1602 src/ui.vala:1887
 msgid "_Close"
 msgstr "Înc_hide"
 
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:327
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Sunt necesare numele de utilizator și parola pentru a accesa „%s”"
 
-#. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:375
 msgid "No scanners detected"
 msgstr "Nu a fost detectat niciun scaner"
 
-#. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:377
 msgid "Please check your scanner is connected and powered on"
 msgstr "Verificați dacă scanerul este conectat și pornit"
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:382
 msgid "Additional software needed"
 msgstr ""
 
-#. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr ""
 
-#. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:506 src/ui.vala:1843
 msgid "Save As..."
 msgstr "Salvează ca..."
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:509 src/ui.vala:675
 msgid "_Cancel"
 msgstr "_Anulare"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:510 src/ui.vala:676
 msgid "_Save"
 msgstr "_Salvează"
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "Document scanat.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:521
 msgid "Image Files"
 msgstr "Fișiere imagine"
 
-#. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:527
 msgid "All Files"
 msgstr "Toate fișierele"
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (document cu mai multe pagini)"
 
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (comprimat)"
 
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (fără pierderi)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:557
 msgid "File format:"
 msgstr ""
 
-#. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:650
 msgid "Failed to save file"
 msgstr "Salvarea fișierului a eșuat"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:673
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Dacă nu salvați, modificările vor fi pierdute definitiv."
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:708
+#: src/ui.vala:708
 msgid "Save current document?"
 msgstr "Salvați documentul curent?"
 
-#. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:710
 msgid "Discard Changes"
 msgstr "Renunță la modificări"
 
-#. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "Nu se poate salva imaginea pentru a prezenta o previzualizare"
 
-#. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "Nu s-a putut deschide aplicația de previzualizare a imaginilor"
 
-#. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1206
 msgid "Combine sides"
 msgstr ""
 
-#. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr ""
 
-#. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1226
 msgid "Reverse"
 msgstr ""
 
-#. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr ""
 
-#. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "Nu se poate deschide fișierul de ajutor"
 
-#. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1472
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -639,17 +508,15 @@ msgstr ""
 "împreună cu acest program. În caz contrar, consultați "
 "<http://www.gnu.org/licenses/>."
 
-#. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "Despre „Scanare simplă”"
 
-#. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "Utilitar pentru scanarea simplă a documentelor"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -662,190 +529,167 @@ msgstr ""
 "  ValentinV https://launchpad.net/~valentinverde\n"
 "  sfantu https://launchpad.net/~sfantus1"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "Salvați documentul înainte de ieșire?"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "Închide fără a salva"
 
-#. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
-#. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1581
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
 msgstr ""
 
-#. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
-#. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1587
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
 msgstr ""
 
-#. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr ""
 
-#. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
-#. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1598
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
 msgstr ""
 
-#. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1602
 msgid "Install drivers"
 msgstr ""
 
-#. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
-#. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr ""
 
-#. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr ""
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr ""
 
-#. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1676
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr ""
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (implicit)"
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (ciornă)"
 
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (rezoluție înaltă)"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/ui.vala:1793
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1835
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1840
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1844
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1845
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1853
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1854
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1855
 msgid "Quit"
 msgstr ""
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "Schimbă _scanerul"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr ""
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1897
 msgid "Automatic"
 msgstr "Automată"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1947
 msgid "Darker"
 msgstr "Mai întunecat"
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1949
 msgid "Lighter"
 msgstr "Mai luminos"
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:1957
 msgid "Less"
 msgstr "Mai puțin"
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:1959
 msgid "More"
 msgstr "Mai mult"
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:1967
 msgid "Minimum"
 msgstr "Minim"
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:1969
 msgid "Maximum"
 msgstr "Maxim"
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2008
 msgid "Saving document..."
 msgstr "Se salvează documentul..."
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Se salvează pagina %d din %d"
@@ -864,6 +708,12 @@ msgstr "Se salvează pagina %d din %d"
 #~ "Utilizare:\n"
 #~ "  %s [DISPOZITIV...] - Utilitar de scanare"
 
+#~ msgid "Device to scan from"
+#~ msgstr "Dispozitiv de folosit pentru scanare"
+
+#~ msgid "Type of document being scanned"
+#~ msgstr "Tipul de document scanat"
+
 #~ msgid "Resolution of last scanned image"
 #~ msgstr "Rezoluția ultimei imagini scanate"
 
@@ -873,9 +723,27 @@ msgstr "Se salvează pagina %d din %d"
 #~ msgid "Direction of scan"
 #~ msgstr "Direcția scanării"
 
+#~ msgid "Directory to save files to"
+#~ msgstr "Dosarul în care să se salveze fișierele"
+
+#~ msgid "Height of paper in tenths of a mm"
+#~ msgstr "Înălțimea hârtiei în zecimi de mm"
+
 #~ msgid "Height of scanned image in pixels"
 #~ msgstr "Înălțimea imaginii scanate, în pixeli"
 
+#~ msgid "Page side to scan"
+#~ msgstr "Partea de scanat a paginii"
+
+#~ msgid "Resolution for photo scans"
+#~ msgstr "Rezoluția pentru scanări foto"
+
+#~ msgid "Resolution for text scans"
+#~ msgstr "Rezoluția pentru scanări text"
+
+#~ msgid "SANE device to acquire images from."
+#~ msgstr "Dispozitivul SANE din care se preiau imaginile."
+
 #~ msgid "TRUE if the application window is maximized"
 #~ msgstr "ADEVĂRAT dacă fereastra aplicației este mărită la maximum"
 
@@ -887,6 +755,12 @@ msgstr "Se salvează pagina %d din %d"
 #~ "„top-to-bottom”, „bottom-to-top”, „left-to-right”, „right-to-left”"
 
 #~ msgid ""
+#~ "The directory to save files to. Defaults to the documents directory if unset."
+#~ msgstr ""
+#~ "Dosarul în care să se salveze fișierele. Dacă nu este definit, fișierele "
+#~ "sunt salvate în dosarul de documente."
+
+#~ msgid ""
 #~ "The height of scanned image in pixels. This value is updated to what the "
 #~ "last scanned page was."
 #~ msgstr ""
@@ -894,6 +768,13 @@ msgstr "Se salvează pagina %d din %d"
 #~ "cea corespunzătoare paginii scanate precedent."
 
 #~ msgid ""
+#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr ""
+#~ "Înălțimea hârtiei în zecimi de mm (sau 0 pentru detectarea automată a "
+#~ "hârtiei)"
+
+#~ msgid ""
 #~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
 #~ msgstr ""
 #~ "Partea de scanat a paginii. Poate fi una din următoarele: „ambele”, „față”, "
@@ -902,6 +783,12 @@ msgstr "Se salvează pagina %d din %d"
 #~ msgid "The resolution in dots-per-inch of the previously scanned image."
 #~ msgstr "Rezoluția în dpi (dots-per-inch) a imaginii scanate precedent."
 
+#~ msgid "The resolution in dots-per-inch to use when scanning photos."
+#~ msgstr "Rezoluția în dpi (dots-per-inch) folosită la scanarea fotografiilor."
+
+#~ msgid "The resolution in dots-per-inch to use when scanning text."
+#~ msgstr "Rezoluția în dpi (dots-per-inch) folosită la scanarea de text."
+
 #~ msgid ""
 #~ "The width of scanned image in pixels. This value is updated to what the last "
 #~ "scanned page was."
@@ -910,6 +797,12 @@ msgstr "Se salvează pagina %d din %d"
 #~ "corespunzătoare paginii scanate precedent."
 
 #~ msgid ""
+#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr ""
+#~ "Lățimea hârtiei în zecimi de mm (sau 0 pentru detectarea automată a hârtiei)"
+
+#~ msgid ""
 #~ "Type of document being scanned. 'text' for text documents, 'photo' for "
 #~ "photos. This setting decides on the scan resolution, colors and post-"
 #~ "processing."
@@ -918,6 +811,9 @@ msgstr "Se salvează pagina %d din %d"
 #~ "pentru fotografii. Aceste configurări decid rezoluția, culorile și post-"
 #~ "procesarea scanării."
 
+#~ msgid "Width of paper in tenths of a mm"
+#~ msgstr "Lățimea hârtiei în zecimi de mm"
+
 #~ msgid "Window height in pixels"
 #~ msgstr "Înălțimea ferestrei, în pixeli"
 
@@ -971,5 +867,33 @@ msgstr "Se salvează pagina %d din %d"
 #~ msgid "Files missing"
 #~ msgstr "Lipsesc fișierele"
 
+#~ msgid "The page side to scan."
+#~ msgstr "Fața paginii care va fi scanată."
+
+#~ msgid ""
+#~ "Type of document being scanned. This setting decides on the scan resolution, "
+#~ "colors and post-processing."
+#~ msgstr ""
+#~ "Tipul de document care va fi scanat. Această opțiune determină rezoluția de "
+#~ "scanare, culoarea și post-procesarea."
+
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "Direcția scanerului față de pagina scanată."
+
+#~ msgid "Quality value to use for JPEG compression."
+#~ msgstr "Valoare calitate pentru compresia JPEG"
+
+#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
+#~ msgstr "Reglare contrast de la -100 la 100 (0 fiind nimic)."
+
+#~ msgid "Contrast of scan"
+#~ msgstr "Contrast scanare"
+
+#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
+#~ msgstr "Reglare luminozitate de la -100 la 100 (0 fiind nimic)."
+
+#~ msgid "Brightness of scan"
+#~ msgstr "Luminozitate scanare"
+
+#~ msgid "Quality value to use for JPEG compression"
+#~ msgstr "Valoare calitate pentru compresia JPEG"
diff --git a/po/ru.gmo b/po/ru.gmo
new file mode 100644
index 0000000..7f6f222
--- /dev/null
+++ b/po/ru.gmo
diff --git a/po/ru.po b/po/ru.po
index 95ee22e..0dcbd81 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,402 +7,309 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-06 14:16+1200\n"
+"POT-Creation-Date: 2016-07-29 12:47+1200\n"
 "PO-Revision-Date: 2015-11-01 17:49+0000\n"
 "Last-Translator: Sandro <Unknown>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-04-14 05:40+0000\n"
-"X-Generator: Launchpad (build 17990)\n"
+"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 
 #. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:2
+#: data/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "Р_азрешить"
 
 #. Label beside username entry
-#: ../data/simple-scan.ui.h:4
+#: data/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "Имя поль_зователя для ресурса:"
 
 #. Label beside password entry
-#: ../data/simple-scan.ui.h:6
+#: data/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Пароль:"
 
 #. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:8
+#: data/simple-scan.ui:188
 msgid "Front and Back"
 msgstr "Обе стороны"
 
 #. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:10
+#: data/simple-scan.ui:192
 msgid "Front"
 msgstr "Лицевая сторона"
 
 #. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:12
+#: data/simple-scan.ui:196
 msgid "Back"
 msgstr "Обратная сторона"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
-#: ../data/appdata/simple-scan.appdata.xml.in.h:1
+#: data/simple-scan.ui:225 data/simple-scan.ui:809
+#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr "Простое сканирование"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:16
+#: data/simple-scan.ui:241
 msgid "_Document"
 msgstr "_Документ"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:18
+#: data/simple-scan.ui:260
 msgid "Sc_an"
 msgstr "_Сканировать"
 
+#. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:20
+#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
 msgid "Single _Page"
 msgstr "Одна _страница"
 
+#. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:22
+#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr "Все страницы из _автоподатчика"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:24
+#: data/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "_Остановить сканирование"
 
-#: ../data/simple-scan.ui.h:25
+#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
 msgid "Text"
 msgstr "Текст"
 
-#: ../data/simple-scan.ui.h:26
+#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
 msgid "Photo"
 msgstr "Фотография"
 
 #. Menu item to reorder pages
-#. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1183 ../src/ui.vala:1841
+#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr "Организация страниц"
 
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: data/simple-scan.ui:367
 msgid "_Email"
 msgstr "Отправить _почтой"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: data/simple-scan.ui:430
 msgid "_Page"
 msgstr "_Страница"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: data/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "Повернуть в_лево"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: data/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "Повернуть в_право"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: data/simple-scan.ui:460
 msgid "_Crop"
 msgstr "_Обрезать"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: data/simple-scan.ui:470
 msgid "_None"
 msgstr "_Нет"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: data/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: data/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: data/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: data/simple-scan.ui:514
 msgid "_Letter"
 msgstr "US _Letter"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: data/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "US Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: data/simple-scan.ui:536
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: data/simple-scan.ui:547
 msgid "_Custom"
 msgstr "_Другое..."
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: data/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr "_Повернуть выбранное"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: data/simple-scan.ui:578
 msgid "Move Left"
 msgstr "Переместить влево"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: data/simple-scan.ui:587
 msgid "Move Right"
 msgstr "Переместить вправо"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: data/simple-scan.ui:624
 msgid "_Help"
 msgstr "_Справка"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: data/simple-scan.ui:632
 msgid "_Contents"
 msgstr "_Содержание"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: data/simple-scan.ui:674 data/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "Создать новый документ"
 
-#: ../data/simple-scan.ui.h:67
+#: data/simple-scan.ui:675
 msgid "New"
 msgstr "Создать"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: data/simple-scan.ui:689 data/simple-scan.ui:836
 msgid "Scan a single page from the scanner"
 msgstr "Сканировать одну страницу со сканера"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: data/simple-scan.ui:691 data/simple-scan.ui:837
 msgid "Scan"
 msgstr "Сканировать"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: data/simple-scan.ui:707 data/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "Сохранить документ в файл"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1842
+#: data/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "Сохранить"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: data/simple-scan.ui:724 data/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "Прервать выполняемое сканирование"
 
-#: ../data/simple-scan.ui.h:77
+#: data/simple-scan.ui:725 data/simple-scan.ui:825
 msgid "Stop"
 msgstr "Завершить"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: data/simple-scan.ui:749 data/simple-scan.ui:936
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Повернуть страницу влево (против часовой стрелки)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: data/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "Повернуть влево"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: data/simple-scan.ui:764 data/simple-scan.ui:914
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Повернуть страницу вправо (по часовой стрелке)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: data/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "Повернуть вправо"
 
-#: ../data/simple-scan.ui.h:86
+#: data/simple-scan.ui:779 data/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "Обрезать выбранную страницу"
 
-#: ../data/simple-scan.ui.h:87
+#: data/simple-scan.ui:781
 msgid "Crop"
 msgstr "Обрезать"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1849
+#: data/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "Параметры"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: data/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "Ист_очник сканирования:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: data/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "Р_азрешение текста:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: data/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "_Разрешение фотографии:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: data/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "Сканируемая сторона:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: data/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "Размер листа:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: data/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "Яркость:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: data/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "Контрастность:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: data/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "Качество:"
 
-#: ../data/simple-scan.desktop.in.h:2
+#: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr "Сканер документов"
 
-#: ../data/simple-scan.desktop.in.h:3
+#: data/simple-scan.desktop.in:5
 msgid "Scan Documents"
 msgstr "Сканирование документов"
 
-#: ../data/simple-scan.desktop.in.h:4
+#: data/simple-scan.desktop.in:6
 msgid "scan;scanner;flatbed;adf;"
 msgstr "сканировать;сканер;планшетный;автоподатчик;"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Device to scan from"
-msgstr "Устройство сканирования"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "SANE device to acquire images from."
-msgstr "Устройство SANE для получения изображений."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "Type of document being scanned"
-msgstr "Тип сканируемого документа"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
-msgid ""
-"Type of document being scanned. This setting decides on the scan resolution, "
-"colors and post-processing."
+#: data/simple-scan.desktop.in:8
+msgid "scanner"
 msgstr ""
-"Тип сканируемого документа. Эта настройка отвечает за разрешение, глубину "
-"цвета и пост-обработку."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
-msgid "Width of paper in tenths of a mm"
-msgstr "Ширина бумаги, см"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr "Ширина бумаги в десятках мм (или 0 для автоматического определения)"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
-msgid "Height of paper in tenths of a mm"
-msgstr "Высота бумаги в десятых долях мм"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr "Высота бумаги в десятках мм (или 0 для автоматического определения)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "Brightness of scan"
-msgstr "Яркость изображения"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "The brightness adjustment from -100 to 100 (0 being none)."
-msgstr "Значение яркости от -100 до 100 (0 — без изменений)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid "Contrast of scan"
-msgstr "Контрастность изображения"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "The contrast adjustment from -100 to 100 (0 being none)."
-msgstr "Значение контрастности от -100 до 100 (0 — без изменений)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid "Resolution for text scans"
-msgstr "Разрешение для сканирования текста"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
-msgid "The resolution in dots-per-inch to use when scanning text."
-msgstr "Разрешение в точках на дюйм при сканировании текста."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
-msgid "Resolution for photo scans"
-msgstr "Разрешение для сканирования фотографий"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr "Разрешение в точках на дюйм при сканировании фотографий."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
-msgid "Page side to scan"
-msgstr "Сторона страницы для сканирования"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
-msgid "The page side to scan."
-msgstr "Сторона страницы для сканирования."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
-msgid "Directory to save files to"
-msgstr "Папка для сохранения файлов"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
-msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
-msgstr ""
-"Папка для сохранения файлов. По умолчанию используется папка с документами."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
-msgid "Quality value to use for JPEG compression"
-msgstr "Значение качества, используемого для сжатия JPEG"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Quality value to use for JPEG compression."
-msgstr "Значение качества, используемого для сжатия JPEG."
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+#: data/simple-scan.appdata.xml.in:8
 msgid ""
 "A really easy way to scan both documents and photos. You can crop out the "
 "bad parts of a photo and rotate it if it is the wrong way round. You can "
@@ -414,198 +321,164 @@ msgstr ""
 "неправильно. Вы можете распечатать сканированные материалы, экспортировать "
 "их в PDF или изображения ряда форматов."
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+#: data/simple-scan.appdata.xml.in:13
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 "Простое сканирование использует фреймворк SANE для поддержки большинства "
 "существующих сканеров."
 
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Нет доступного сканера. Подключите его."
 
-#. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "Не могу подключиться к сканеру"
 
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "Не могу начать сканирование"
 
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1236 src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr "Ошибка при работе со сканером"
 
-#. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "Показать версию"
 
-#. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr "Показать сообщения отладки"
 
-#: ../src/simple-scan.vala:26
+#: src/simple-scan.vala:26
 msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr "Исправить PDF-файлы, созданные предыдущими версиями Simple Scan"
 
-#. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:391
+#: src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Сканирование не удалось"
 
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DEVICE...] — Устройство сканирования"
 
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr "Выполните '%s --help', чтобы вывести полный список доступных опций."
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:318 src/ui.vala:1602 src/ui.vala:1887
 msgid "_Close"
 msgstr "_Закрыть"
 
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:327
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Для доступа к '%s' нужны имя пользователя и пароль"
 
-#. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:375
 msgid "No scanners detected"
 msgstr "Сканеры не обнаружены"
 
-#. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:377
 msgid "Please check your scanner is connected and powered on"
 msgstr "Проверьте, что сканер подсоединён и включён"
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:382
 msgid "Additional software needed"
 msgstr "Необходимо дополнительно программное обеспечение"
 
-#. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr "Необходимо установить драйвер для вашего сканера."
 
-#. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:506 src/ui.vala:1843
 msgid "Save As..."
 msgstr "Сохранить как..."
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:509 src/ui.vala:675
 msgid "_Cancel"
 msgstr "_Отменить"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:510 src/ui.vala:676
 msgid "_Save"
 msgstr "Со_хранить"
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "Сканированный документ.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:521
 msgid "Image Files"
 msgstr "Файлы изображений"
 
-#. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:527
 msgid "All Files"
 msgstr "Все файлы"
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (многостраничный документ)"
 
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (сжатый)"
 
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (без потерь в качестве)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:557
 msgid "File format:"
 msgstr "Формат файла:"
 
-#. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:650
 msgid "Failed to save file"
 msgstr "Не удалось сохранить файл"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:673
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Если не выполнить сохранение, все изменения будут утеряны."
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:708
+#: src/ui.vala:708
 msgid "Save current document?"
 msgstr "Сохранить текущий документ?"
 
-#. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:710
 msgid "Discard Changes"
 msgstr "Отменить изменения"
 
-#. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "Не удалось сохранить изображение для предварительного просмотра"
 
-#. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "Невозможно открыть программу для просмотра изображений"
 
-#. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1206
 msgid "Combine sides"
 msgstr "Объединить стороны"
 
-#. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr "Объединить стороны (в обратном порядке)"
 
-#. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1226
 msgid "Reverse"
 msgstr "В обратном порядке"
 
-#. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr "Оставить без изменений"
 
-#. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "Не удалось открыть файл справки"
 
-#. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1472
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -633,17 +506,15 @@ msgstr ""
 "License) должная поставляться с этой программой. В остальных случаях "
 "пройдите по ссылке: <http://www.gnu.org/licenses/>."
 
-#. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "О программе"
 
-#. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "Простой инструмент для сканирования документов"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -653,17 +524,14 @@ msgstr ""
 "  Alexey Kotlyarov https://launchpad.net/~koterpillar\n"
 "  Andrew Sudarikov https://launchpad.net/~andrey-interra\n"
 "  Andrew Yakush https://launchpad.net/~andyak77\n"
-"  Arsa Chernikov https://launchpad.net/~arsa-chernikov\n"
 "  Artem Popov https://launchpad.net/~artfwo\n"
 "  AsstZD https://launchpad.net/~eskaer-spamsink\n"
-"  Dmitri Konoplev https://launchpad.net/~knoplef\n"
 "  Dmitry Shachnev https://launchpad.net/~mitya57\n"
 "  Dr Gregory House https://launchpad.net/~greghouse\n"
 "  Eugene Marshal https://launchpad.net/~lowrider\n"
 "  Evgeny https://launchpad.net/~evgeny-ig\n"
 "  Igor Zubarev https://launchpad.net/~igor.zubarev\n"
 "  Int https://launchpad.net/~howrudoin\n"
-"  Ivan Bulychev https://launchpad.net/~vanyok\n"
 "  KEIII https://launchpad.net/~cashagent\n"
 "  ManDrive https://launchpad.net/~roman-romul\n"
 "  Net4Hack https://launchpad.net/~networkforhackers\n"
@@ -675,7 +543,6 @@ msgstr ""
 "  Sergey Loshakov https://launchpad.net/~sergeylo\n"
 "  Sergey Sedov https://launchpad.net/~serg-sedov\n"
 "  Simplehuman https://launchpad.net/~simplehuman\n"
-"  Stanislav Bazhenov https://launchpad.net/~stanislav-bajenov\n"
 "  Stas Solovey https://launchpad.net/~whats-up\n"
 "  Victor Mireyev https://launchpad.net/~victor-mireyev\n"
 "  Vitaly Zawullon Katraev https://launchpad.net/~zawullon\n"
@@ -685,23 +552,19 @@ msgstr ""
 "  Илья Калитко https://launchpad.net/~kalitko-ilya007\n"
 "  ☠Jay ZDLin☠ https://launchpad.net/~black-buddha666"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "Сохранить документ перед выходом?"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "Выйти без сохранения"
 
-#. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr "Похоже, у вас сканер компании Brother."
 
-#. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1581
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
@@ -709,13 +572,11 @@ msgstr ""
 "Драйверы для этих сканеров доступны на <a "
 "href=\"http://support.brother.com\">веб-сайте Brother</a>."
 
-#. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr "Похоже, у вас сканер компании Samsung."
 
-#. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1587
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
@@ -723,18 +584,15 @@ msgstr ""
 "Драйверы для этих сканеров доступны на <a "
 "href=\"http://samsung.com/support\">веб-сайте Samsung</a>."
 
-#. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr "Похоже, у вас сканер компании HP."
 
-#. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr "Похоже, у вас сканер компании Epson."
 
-#. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1598
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
@@ -742,139 +600,125 @@ msgstr ""
 "Драйверы для этих сканеров доступны на <a "
 "href=\"http://support.epson.com\">веб-сайте Epson</a>."
 
-#. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1602
 msgid "Install drivers"
 msgstr "Установка драйверов"
 
-#. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "После установки необходимо перезапустить Simple Scan."
 
-#. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr "Установка драйверов…"
 
-#. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr "Драйверы успешно установлены!"
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Не удалось установить драйверы (код ошибки %d)."
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr "Не удалось установить драйверы."
 
-#. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1676
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr "Необходимо установить пакет(-ы) %s."
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (по умолчанию)"
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (черновик)"
 
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (высокое разрешение)"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/ui.vala:1793
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1835
 msgid "New Document"
 msgstr "Новый документ"
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1840
 msgid "Document"
 msgstr "Документ"
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1844
 msgid "Email..."
 msgstr "Отправить..."
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1845
 msgid "Print..."
 msgstr "Печать..."
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1853
 msgid "Help"
 msgstr "Справка"
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1854
 msgid "About"
 msgstr "О программе"
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1855
 msgid "Quit"
 msgstr "Завершить"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "Сменить _сканер"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr "_Установить драйверы"
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1897
 msgid "Automatic"
 msgstr "Выбрать автоматически"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1947
 msgid "Darker"
 msgstr "Темнее"
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1949
 msgid "Lighter"
 msgstr "Светлее"
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:1957
 msgid "Less"
 msgstr "Меньше"
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:1959
 msgid "More"
 msgstr "Больше"
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:1967
 msgid "Minimum"
 msgstr "Мин."
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:1969
 msgid "Maximum"
 msgstr "Макс."
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2008
 msgid "Saving document..."
 msgstr "Сохранение документа..."
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Сохранение страницы %d из %d"
@@ -919,6 +763,12 @@ msgstr "Сохранение страницы %d из %d"
 #~ msgid "Height of scanned image in pixels"
 #~ msgstr "Высота отсканированного изображения в пикселах"
 
+#~ msgid "Device to scan from"
+#~ msgstr "Устройство сканирования"
+
+#~ msgid "Directory to save files to"
+#~ msgstr "Папка для сохранения файлов"
+
 #~ msgid "Direction of scan"
 #~ msgstr "Направление сканирования"
 
@@ -939,6 +789,15 @@ msgstr "Сохранение страницы %d из %d"
 #~ msgid "TRUE if the application window is maximized"
 #~ msgstr "TRUE, если окно приложения развёрнуто на весь экран"
 
+#~ msgid "SANE device to acquire images from."
+#~ msgstr "Устройство SANE для получения изображений."
+
+#~ msgid "Resolution for text scans"
+#~ msgstr "Разрешение для сканирования текста"
+
+#~ msgid "Resolution for photo scans"
+#~ msgstr "Разрешение для сканирования фотографий"
+
 #~ msgid "The resolution in dots-per-inch of the previously scanned image."
 #~ msgstr ""
 #~ "Разрешение в точках на дюйм предыдущего отсканированного изображения."
@@ -946,6 +805,17 @@ msgstr "Сохранение страницы %d из %d"
 #~ msgid "Resolution of last scanned image"
 #~ msgstr "Разрешение последнего отсканированного изображения"
 
+#~ msgid "The resolution in dots-per-inch to use when scanning photos."
+#~ msgstr "Разрешение в точках на дюйм при сканировании фотографий."
+
+#~ msgid ""
+#~ "The directory to save files to. Defaults to the documents directory if unset."
+#~ msgstr ""
+#~ "Папка для сохранения файлов. По умолчанию используется папка с документами."
+
+#~ msgid "Type of document being scanned"
+#~ msgstr "Тип сканируемого документа"
+
 #~ msgid "Window height in pixels"
 #~ msgstr "Высота окна в пикселах"
 
@@ -975,6 +845,9 @@ msgstr "Сохранение страницы %d из %d"
 #~ "Ширина отсканированного изображения в пикселах. Это значение обновляется при "
 #~ "каждом новом сканировании."
 
+#~ msgid "The resolution in dots-per-inch to use when scanning text."
+#~ msgstr "Разрешение в точках на дюйм при сканировании текста."
+
 #~ msgid "Width of scanned image in pixels"
 #~ msgstr "Ширина отсканированного изображения в пикселах"
 
@@ -990,10 +863,39 @@ msgstr "Сохранение страницы %d из %d"
 #~ "Сторона страницы для сканирования. Может быть: 'с обоих сторон', 'лицевая', "
 #~ "'обратная'"
 
+#~ msgid "Page side to scan"
+#~ msgstr "Сторона страницы для сканирования"
+
+#~ msgid ""
+#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr "Ширина бумаги в десятках мм (или 0 для автоматического определения)"
+
+#~ msgid "Height of paper in tenths of a mm"
+#~ msgstr "Высота бумаги в десятых долях мм"
+
+#~ msgid "Width of paper in tenths of a mm"
+#~ msgstr "Ширина бумаги, см"
+
+#~ msgid "The page side to scan."
+#~ msgstr "Сторона страницы для сканирования."
+
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "Направление сканирования страницы."
 
 #~ msgid ""
+#~ "Type of document being scanned. This setting decides on the scan resolution, "
+#~ "colors and post-processing."
+#~ msgstr ""
+#~ "Тип сканируемого документа. Эта настройка отвечает за разрешение, глубину "
+#~ "цвета и пост-обработку."
+
+#~ msgid ""
+#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr "Высота бумаги в десятках мм (или 0 для автоматического определения)."
+
+#~ msgid ""
 #~ "Type of document being scanned. 'text' for text documents, 'photo' for "
 #~ "photos. This setting decides on the scan resolution, colors and post-"
 #~ "processing."
@@ -1001,3 +903,21 @@ msgstr "Сохранение страницы %d из %d"
 #~ "Тип сканируемого документа. 'Текст' для текстовых документов, 'Фотография' "
 #~ "для фотографий. Выбор типа определяет разрешение, цвета и пост-обработку при "
 #~ "сканировании."
+
+#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
+#~ msgstr "Значение яркости от -100 до 100 (0 — без изменений)."
+
+#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
+#~ msgstr "Значение контрастности от -100 до 100 (0 — без изменений)."
+
+#~ msgid "Contrast of scan"
+#~ msgstr "Контрастность изображения"
+
+#~ msgid "Brightness of scan"
+#~ msgstr "Яркость изображения"
+
+#~ msgid "Quality value to use for JPEG compression."
+#~ msgstr "Значение качества, используемого для сжатия JPEG."
+
+#~ msgid "Quality value to use for JPEG compression"
+#~ msgstr "Значение качества, используемого для сжатия JPEG"
diff --git a/po/sd.gmo b/po/sd.gmo
new file mode 100644
index 0000000..c52e90d
--- /dev/null
+++ b/po/sd.gmo
diff --git a/po/sd.po b/po/sd.po
index e8b599a..70e671a 100644
--- a/po/sd.po
+++ b/po/sd.po
@@ -7,399 +7,309 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-06 14:16+1200\n"
+"POT-Creation-Date: 2016-07-29 12:47+1200\n"
 "PO-Revision-Date: 2012-04-17 06:12+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Sindhi <sd@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-04-14 05:40+0000\n"
-"X-Generator: Launchpad (build 17990)\n"
+"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 
 #. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:2
+#: data/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_اجازت ڏيو"
 
 #. Label beside username entry
-#: ../data/simple-scan.ui.h:4
+#: data/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr ""
 
 #. Label beside password entry
-#: ../data/simple-scan.ui.h:6
+#: data/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_ڳجھو لفظ:"
 
 #. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:8
+#: data/simple-scan.ui:188
 msgid "Front and Back"
 msgstr "اڳيون ۽ پويون"
 
 #. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:10
+#: data/simple-scan.ui:192
 msgid "Front"
 msgstr "اڳيون"
 
 #. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:12
+#: data/simple-scan.ui:196
 msgid "Back"
 msgstr "پوئتي"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
-#: ../data/appdata/simple-scan.appdata.xml.in.h:1
+#: data/simple-scan.ui:225 data/simple-scan.ui:809
+#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr "سادو اسڪين"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:16
+#: data/simple-scan.ui:241
 msgid "_Document"
 msgstr "_دستاويز"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:18
+#: data/simple-scan.ui:260
 msgid "Sc_an"
 msgstr "_اسڪين"
 
+#. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:20
+#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
 msgid "Single _Page"
 msgstr "هڪڙو _صفحو"
 
+#. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:22
+#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr ""
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:24
+#: data/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "اسڪين _روڪيو"
 
-#: ../data/simple-scan.ui.h:25
+#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
 msgid "Text"
 msgstr "تحرير"
 
-#: ../data/simple-scan.ui.h:26
+#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
 msgid "Photo"
 msgstr "فوٽو"
 
 #. Menu item to reorder pages
-#. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1183 ../src/ui.vala:1841
+#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr ""
 
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: data/simple-scan.ui:367
 msgid "_Email"
 msgstr "_ايميل"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: data/simple-scan.ui:430
 msgid "_Page"
 msgstr "_صفحو"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: data/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "_کاٻي ڦيرايو"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: data/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "_ساڄي ڦيرايو"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: data/simple-scan.ui:460
 msgid "_Crop"
 msgstr "_ڪاٽيو"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: data/simple-scan.ui:470
 msgid "_None"
 msgstr "_ڪوبه نه"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: data/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: data/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: data/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: data/simple-scan.ui:514
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: data/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: data/simple-scan.ui:536
 msgid "4×6"
 msgstr ""
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: data/simple-scan.ui:547
 msgid "_Custom"
 msgstr "_مرضي مطابق"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: data/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr ""
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: data/simple-scan.ui:578
 msgid "Move Left"
 msgstr "کاٻي چوريو"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: data/simple-scan.ui:587
 msgid "Move Right"
 msgstr "ساڄي چوريو"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: data/simple-scan.ui:624
 msgid "_Help"
 msgstr "_مدد"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: data/simple-scan.ui:632
 msgid "_Contents"
 msgstr "_مواد"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: data/simple-scan.ui:674 data/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "نئون دستاويز بنايو"
 
-#: ../data/simple-scan.ui.h:67
+#: data/simple-scan.ui:675
 msgid "New"
 msgstr "نئون"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: data/simple-scan.ui:689 data/simple-scan.ui:836
 msgid "Scan a single page from the scanner"
 msgstr "اسڪينر مان هڪڙو صفحو اسڪين ڪريو"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: data/simple-scan.ui:691 data/simple-scan.ui:837
 msgid "Scan"
 msgstr "اسڪين"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: data/simple-scan.ui:707 data/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "دستاويز کي فائل ۾ سانڍيو"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1842
+#: data/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "سانڍيو"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: data/simple-scan.ui:724 data/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "هلندڙ اسڪين روڪيو"
 
-#: ../data/simple-scan.ui.h:77
+#: data/simple-scan.ui:725 data/simple-scan.ui:825
 msgid "Stop"
 msgstr "روڪيو"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: data/simple-scan.ui:749 data/simple-scan.ui:936
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr ""
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: data/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "کاٻي ڦيرايو"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: data/simple-scan.ui:764 data/simple-scan.ui:914
 msgid "Rotate the page to the right (clockwise)"
 msgstr ""
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: data/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "ساڄي ڦيرايو"
 
-#: ../data/simple-scan.ui.h:86
+#: data/simple-scan.ui:779 data/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "چونڊيل صفحي کي ڪاٽيو"
 
-#: ../data/simple-scan.ui.h:87
+#: data/simple-scan.ui:781
 msgid "Crop"
 msgstr "ڪاٽيو"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1849
+#: data/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "ترجيحون"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: data/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: data/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: data/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr ""
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: data/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "پاسو اسڪين ڪريو:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: data/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "صفحي جي ماپ:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: data/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: data/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: data/simple-scan.ui:1260
 msgid "Quality:"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:2
+#: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:3
+#: data/simple-scan.desktop.in:5
 msgid "Scan Documents"
 msgstr "دستاويزات اسڪين ڪريو"
 
-#: ../data/simple-scan.desktop.in.h:4
+#: data/simple-scan.desktop.in:6
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Device to scan from"
-msgstr "اسڪين ڪرڻ لاءِ اوزار"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "SANE device to acquire images from."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "Type of document being scanned"
-msgstr "اسڪين ٿيندڙ دستاويز جو قسم"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
-msgid ""
-"Type of document being scanned. This setting decides on the scan resolution, "
-"colors and post-processing."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
-msgid "Width of paper in tenths of a mm"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
-msgid "Height of paper in tenths of a mm"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "Brightness of scan"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "The brightness adjustment from -100 to 100 (0 being none)."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid "Contrast of scan"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "The contrast adjustment from -100 to 100 (0 being none)."
+#: data/simple-scan.desktop.in:8
+msgid "scanner"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid "Resolution for text scans"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
-msgid "The resolution in dots-per-inch to use when scanning text."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
-msgid "Resolution for photo scans"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
-msgid "Page side to scan"
-msgstr "اسڪين ڪرڻ لاءِ صفحي جو پاسو"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
-msgid "The page side to scan."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
-msgid "Directory to save files to"
-msgstr "فائلون سانڍڻ لاءِ خانو"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
-msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
-msgid "Quality value to use for JPEG compression"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Quality value to use for JPEG compression."
-msgstr ""
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+#: data/simple-scan.appdata.xml.in:8
 msgid ""
 "A really easy way to scan both documents and photos. You can crop out the "
 "bad parts of a photo and rotate it if it is the wrong way round. You can "
@@ -407,196 +317,162 @@ msgid ""
 "formats."
 msgstr ""
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+#: data/simple-scan.appdata.xml.in:13
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr ""
 
-#. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr ""
 
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr ""
 
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1236 src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr ""
 
-#. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr ""
 
-#. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr ""
 
-#: ../src/simple-scan.vala:26
+#: src/simple-scan.vala:26
 msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr ""
 
-#. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:391
+#: src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "اسڪين ڪرڻ ۾ ناڪامي"
 
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:318 src/ui.vala:1602 src/ui.vala:1887
 msgid "_Close"
 msgstr ""
 
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:327
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr ""
 
-#. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:375
 msgid "No scanners detected"
 msgstr ""
 
-#. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:377
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:382
 msgid "Additional software needed"
 msgstr ""
 
-#. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr ""
 
-#. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:506 src/ui.vala:1843
 msgid "Save As..."
 msgstr "هينئن سانڍيو..."
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:509 src/ui.vala:675
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:510 src/ui.vala:676
 msgid "_Save"
 msgstr ""
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "اسڪين دستاويز.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:521
 msgid "Image Files"
 msgstr "شڪل فائلون"
 
-#. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:527
 msgid "All Files"
 msgstr "تمام فائلون"
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr ""
 
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr ""
 
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr ""
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:557
 msgid "File format:"
 msgstr ""
 
-#. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:650
 msgid "Failed to save file"
 msgstr "فائل سانڍڻ ۾ ناڪامي"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:673
 msgid "If you don't save, changes will be permanently lost."
 msgstr ""
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:708
+#: src/ui.vala:708
 msgid "Save current document?"
 msgstr "هاڻوڪو دستاويز سانڍيو؟"
 
-#. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:710
 msgid "Discard Changes"
 msgstr "تبديليون منسوخ ڪريو"
 
-#. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr ""
 
-#. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr ""
 
-#. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1206
 msgid "Combine sides"
 msgstr ""
 
-#. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr ""
 
-#. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1226
 msgid "Reverse"
 msgstr ""
 
-#. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr ""
 
-#. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "سهڪاري فائل ڀرڻ ۾ ناڪام"
 
-#. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1472
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -612,213 +488,200 @@ msgid ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
 
-#. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "سادي اسڪين بابت"
 
-#. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "سادو دستاويز اسڪين ڪندڙ اوزار"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Abdul-Rahim Nizamani https://launchpad.net/~ghaffari"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "نڪرڻ کان پهرين دستاويز سانڍيو؟"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "سانڍڻ بغير نڪرو"
 
-#. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
-#. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1581
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
 msgstr ""
 
-#. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
-#. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1587
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
 msgstr ""
 
-#. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr ""
 
-#. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
-#. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1598
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
 msgstr ""
 
-#. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1602
 msgid "Install drivers"
 msgstr ""
 
-#. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
-#. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr ""
 
-#. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr ""
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr ""
 
-#. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1676
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr ""
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/ui.vala:1793
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1835
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1840
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1844
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1845
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1853
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1854
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1855
 msgid "Quit"
 msgstr ""
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "اسڪينر _تبديل ڪريو"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr ""
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1897
 msgid "Automatic"
 msgstr "پاڻمرادو"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1947
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1949
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:1957
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:1959
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:1967
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:1969
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2008
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
 
+#~ msgid "Device to scan from"
+#~ msgstr "اسڪين ڪرڻ لاءِ اوزار"
+
+#~ msgid "Page side to scan"
+#~ msgstr "اسڪين ڪرڻ لاءِ صفحي جو پاسو"
+
+#~ msgid "Directory to save files to"
+#~ msgstr "فائلون سانڍڻ لاءِ خانو"
+
 #~ msgid "Direction of scan"
 #~ msgstr "اسڪين جو رخ"
 
+#~ msgid "Type of document being scanned"
+#~ msgstr "اسڪين ٿيندڙ دستاويز جو قسم"
+
 #~ msgid "Scanned Document"
 #~ msgstr "اسڪين ٿيل دستاويز"
 
diff --git a/po/se.gmo b/po/se.gmo
new file mode 100644
index 0000000..1927930
--- /dev/null
+++ b/po/se.gmo
diff --git a/po/se.po b/po/se.po
index bfbe551..b21602a 100644
--- a/po/se.po
+++ b/po/se.po
@@ -7,399 +7,309 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-06 14:16+1200\n"
+"POT-Creation-Date: 2016-07-29 12:47+1200\n"
 "PO-Revision-Date: 2012-08-18 11:22+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Northern Sami <se@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-04-14 05:40+0000\n"
-"X-Generator: Launchpad (build 17990)\n"
+"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 
 #. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:2
+#: data/simple-scan.ui:24
 msgid "_Authorize"
 msgstr ""
 
 #. Label beside username entry
-#: ../data/simple-scan.ui.h:4
+#: data/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr ""
 
 #. Label beside password entry
-#: ../data/simple-scan.ui.h:6
+#: data/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Beassansátni:"
 
 #. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:8
+#: data/simple-scan.ui:188
 msgid "Front and Back"
 msgstr ""
 
 #. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:10
+#: data/simple-scan.ui:192
 msgid "Front"
 msgstr "Ovdabealli"
 
 #. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:12
+#: data/simple-scan.ui:196
 msgid "Back"
 msgstr "Maŋos"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
-#: ../data/appdata/simple-scan.appdata.xml.in.h:1
+#: data/simple-scan.ui:225 data/simple-scan.ui:809
+#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr "Simple Scan"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:16
+#: data/simple-scan.ui:241
 msgid "_Document"
 msgstr "_Dokumeanta"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:18
+#: data/simple-scan.ui:260
 msgid "Sc_an"
 msgstr ""
 
+#. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:20
+#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
 msgid "Single _Page"
 msgstr ""
 
+#. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:22
+#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr ""
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:24
+#: data/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:25
+#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
 msgid "Text"
 msgstr "Teaksta"
 
-#: ../data/simple-scan.ui.h:26
+#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
 msgid "Photo"
 msgstr "Fotografiija"
 
 #. Menu item to reorder pages
-#. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1183 ../src/ui.vala:1841
+#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr ""
 
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: data/simple-scan.ui:367
 msgid "_Email"
 msgstr "_E-boasta"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: data/simple-scan.ui:430
 msgid "_Page"
 msgstr ""
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: data/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr ""
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: data/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr ""
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: data/simple-scan.ui:460
 msgid "_Crop"
 msgstr "_Čuohpa"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: data/simple-scan.ui:470
 msgid "_None"
 msgstr ""
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: data/simple-scan.ui:481
 msgid "A_4"
 msgstr ""
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: data/simple-scan.ui:492
 msgid "A_5"
 msgstr ""
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: data/simple-scan.ui:503
 msgid "A_6"
 msgstr ""
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: data/simple-scan.ui:514
 msgid "_Letter"
 msgstr ""
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: data/simple-scan.ui:525
 msgid "Le_gal"
 msgstr ""
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: data/simple-scan.ui:536
 msgid "4×6"
 msgstr ""
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: data/simple-scan.ui:547
 msgid "_Custom"
 msgstr ""
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: data/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr ""
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: data/simple-scan.ui:578
 msgid "Move Left"
 msgstr ""
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: data/simple-scan.ui:587
 msgid "Move Right"
 msgstr "Sirdde olgešguvlui"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: data/simple-scan.ui:624
 msgid "_Help"
 msgstr "_Veahkki"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: data/simple-scan.ui:632
 msgid "_Contents"
 msgstr ""
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: data/simple-scan.ui:674 data/simple-scan.ui:885
 msgid "Start a new document"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:67
+#: data/simple-scan.ui:675
 msgid "New"
 msgstr "Ođđa"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: data/simple-scan.ui:689 data/simple-scan.ui:836
 msgid "Scan a single page from the scanner"
 msgstr ""
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: data/simple-scan.ui:691 data/simple-scan.ui:837
 msgid "Scan"
 msgstr "Oza"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: data/simple-scan.ui:707 data/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1842
+#: data/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "Vurke"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: data/simple-scan.ui:724 data/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:77
+#: data/simple-scan.ui:725 data/simple-scan.ui:825
 msgid "Stop"
 msgstr "Bisset"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: data/simple-scan.ui:749 data/simple-scan.ui:936
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr ""
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: data/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr ""
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: data/simple-scan.ui:764 data/simple-scan.ui:914
 msgid "Rotate the page to the right (clockwise)"
 msgstr ""
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: data/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "Jorat olgešguvlui"
 
-#: ../data/simple-scan.ui.h:86
+#: data/simple-scan.ui:779 data/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:87
+#: data/simple-scan.ui:781
 msgid "Crop"
 msgstr ""
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1849
+#: data/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "Oidimat"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: data/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: data/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: data/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr ""
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: data/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr ""
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: data/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr ""
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: data/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: data/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: data/simple-scan.ui:1260
 msgid "Quality:"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:2
+#: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:3
+#: data/simple-scan.desktop.in:5
 msgid "Scan Documents"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:4
+#: data/simple-scan.desktop.in:6
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Device to scan from"
+#: data/simple-scan.desktop.in:8
+msgid "scanner"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "SANE device to acquire images from."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "Type of document being scanned"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
-msgid ""
-"Type of document being scanned. This setting decides on the scan resolution, "
-"colors and post-processing."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
-msgid "Width of paper in tenths of a mm"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
-msgid "Height of paper in tenths of a mm"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "Brightness of scan"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "The brightness adjustment from -100 to 100 (0 being none)."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid "Contrast of scan"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "The contrast adjustment from -100 to 100 (0 being none)."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid "Resolution for text scans"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
-msgid "The resolution in dots-per-inch to use when scanning text."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
-msgid "Resolution for photo scans"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
-msgid "Page side to scan"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
-msgid "The page side to scan."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
-msgid "Directory to save files to"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
-msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
-msgid "Quality value to use for JPEG compression"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Quality value to use for JPEG compression."
-msgstr ""
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+#: data/simple-scan.appdata.xml.in:8
 msgid ""
 "A really easy way to scan both documents and photos. You can crop out the "
 "bad parts of a photo and rotate it if it is the wrong way round. You can "
@@ -407,196 +317,162 @@ msgid ""
 "formats."
 msgstr ""
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+#: data/simple-scan.appdata.xml.in:13
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr ""
 
-#. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr ""
 
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr ""
 
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1236 src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr ""
 
-#. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr ""
 
-#. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr ""
 
-#: ../src/simple-scan.vala:26
+#: src/simple-scan.vala:26
 msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr ""
 
-#. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:391
+#: src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr ""
 
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:318 src/ui.vala:1602 src/ui.vala:1887
 msgid "_Close"
 msgstr ""
 
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:327
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr ""
 
-#. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:375
 msgid "No scanners detected"
 msgstr ""
 
-#. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:377
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:382
 msgid "Additional software needed"
 msgstr ""
 
-#. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr ""
 
-#. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:506 src/ui.vala:1843
 msgid "Save As..."
 msgstr "Vurke nugo …"
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:509 src/ui.vala:675
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:510 src/ui.vala:676
 msgid "_Save"
 msgstr ""
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr ""
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:521
 msgid "Image Files"
 msgstr ""
 
-#. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:527
 msgid "All Files"
 msgstr "Buot fiillat"
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr ""
 
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr ""
 
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr ""
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:557
 msgid "File format:"
 msgstr ""
 
-#. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:650
 msgid "Failed to save file"
 msgstr ""
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:673
 msgid "If you don't save, changes will be permanently lost."
 msgstr ""
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:708
+#: src/ui.vala:708
 msgid "Save current document?"
 msgstr ""
 
-#. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:710
 msgid "Discard Changes"
 msgstr ""
 
-#. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr ""
 
-#. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr ""
 
-#. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1206
 msgid "Combine sides"
 msgstr ""
 
-#. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr ""
 
-#. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1226
 msgid "Reverse"
 msgstr ""
 
-#. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr ""
 
-#. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr ""
 
-#. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1472
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -612,206 +488,181 @@ msgid ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
 
-#. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "Simple Scan-dieđut"
 
-#. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Christopher Forster https://launchpad.net/~christopherforster"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr ""
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr ""
 
-#. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
-#. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1581
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
 msgstr ""
 
-#. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
-#. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1587
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
 msgstr ""
 
-#. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr ""
 
-#. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
-#. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1598
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
 msgstr ""
 
-#. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1602
 msgid "Install drivers"
 msgstr ""
 
-#. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
-#. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr ""
 
-#. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr ""
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr ""
 
-#. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1676
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr ""
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/ui.vala:1793
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1835
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1840
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1844
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1845
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1853
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1854
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1855
 msgid "Quit"
 msgstr ""
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr ""
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr ""
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1897
 msgid "Automatic"
 msgstr "Automáhtalaš"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1947
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1949
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:1957
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:1959
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:1967
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:1969
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2008
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/shn.gmo b/po/shn.gmo
new file mode 100644
index 0000000..c18da32
--- /dev/null
+++ b/po/shn.gmo
diff --git a/po/shn.po b/po/shn.po
index 9fa56b5..a7ad3e9 100644
--- a/po/shn.po
+++ b/po/shn.po
@@ -7,399 +7,309 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-06 14:16+1200\n"
+"POT-Creation-Date: 2016-07-29 12:47+1200\n"
 "PO-Revision-Date: 2012-04-17 06:12+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Shan <shn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-04-14 05:40+0000\n"
-"X-Generator: Launchpad (build 17990)\n"
+"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 
 #. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:2
+#: data/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_မၵ်းမၼ်ႈၶႂၢင်းပၼ်"
 
 #. Label beside username entry
-#: ../data/simple-scan.ui.h:4
+#: data/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr ""
 
 #. Label beside password entry
-#: ../data/simple-scan.ui.h:6
+#: data/simple-scan.ui:117
 msgid "_Password:"
 msgstr ""
 
 #. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:8
+#: data/simple-scan.ui:188
 msgid "Front and Back"
 msgstr ""
 
 #. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:10
+#: data/simple-scan.ui:192
 msgid "Front"
 msgstr ""
 
 #. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:12
+#: data/simple-scan.ui:196
 msgid "Back"
 msgstr "ႁူၼ်လင်"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
-#: ../data/appdata/simple-scan.appdata.xml.in.h:1
+#: data/simple-scan.ui:225 data/simple-scan.ui:809
+#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr ""
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:16
+#: data/simple-scan.ui:241
 msgid "_Document"
 msgstr ""
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:18
+#: data/simple-scan.ui:260
 msgid "Sc_an"
 msgstr ""
 
+#. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:20
+#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
 msgid "Single _Page"
 msgstr ""
 
+#. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:22
+#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr ""
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:24
+#: data/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:25
+#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
 msgid "Text"
 msgstr "လိၵ်ႈ"
 
-#: ../data/simple-scan.ui.h:26
+#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
 msgid "Photo"
 msgstr ""
 
 #. Menu item to reorder pages
-#. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1183 ../src/ui.vala:1841
+#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr ""
 
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: data/simple-scan.ui:367
 msgid "_Email"
 msgstr ""
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: data/simple-scan.ui:430
 msgid "_Page"
 msgstr ""
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: data/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr ""
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: data/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr ""
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: data/simple-scan.ui:460
 msgid "_Crop"
 msgstr ""
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: data/simple-scan.ui:470
 msgid "_None"
 msgstr ""
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: data/simple-scan.ui:481
 msgid "A_4"
 msgstr ""
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: data/simple-scan.ui:492
 msgid "A_5"
 msgstr ""
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: data/simple-scan.ui:503
 msgid "A_6"
 msgstr ""
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: data/simple-scan.ui:514
 msgid "_Letter"
 msgstr ""
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: data/simple-scan.ui:525
 msgid "Le_gal"
 msgstr ""
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: data/simple-scan.ui:536
 msgid "4×6"
 msgstr ""
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: data/simple-scan.ui:547
 msgid "_Custom"
 msgstr ""
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: data/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr ""
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: data/simple-scan.ui:578
 msgid "Move Left"
 msgstr ""
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: data/simple-scan.ui:587
 msgid "Move Right"
 msgstr ""
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: data/simple-scan.ui:624
 msgid "_Help"
 msgstr ""
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: data/simple-scan.ui:632
 msgid "_Contents"
 msgstr ""
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: data/simple-scan.ui:674 data/simple-scan.ui:885
 msgid "Start a new document"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:67
+#: data/simple-scan.ui:675
 msgid "New"
 msgstr ""
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: data/simple-scan.ui:689 data/simple-scan.ui:836
 msgid "Scan a single page from the scanner"
 msgstr ""
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: data/simple-scan.ui:691 data/simple-scan.ui:837
 msgid "Scan"
 msgstr ""
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: data/simple-scan.ui:707 data/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1842
+#: data/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr ""
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: data/simple-scan.ui:724 data/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:77
+#: data/simple-scan.ui:725 data/simple-scan.ui:825
 msgid "Stop"
 msgstr ""
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: data/simple-scan.ui:749 data/simple-scan.ui:936
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr ""
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: data/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr ""
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: data/simple-scan.ui:764 data/simple-scan.ui:914
 msgid "Rotate the page to the right (clockwise)"
 msgstr ""
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: data/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:86
+#: data/simple-scan.ui:779 data/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:87
+#: data/simple-scan.ui:781
 msgid "Crop"
 msgstr ""
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1849
+#: data/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: data/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: data/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: data/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr ""
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: data/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr ""
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: data/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr ""
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: data/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: data/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: data/simple-scan.ui:1260
 msgid "Quality:"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:2
+#: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:3
+#: data/simple-scan.desktop.in:5
 msgid "Scan Documents"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:4
+#: data/simple-scan.desktop.in:6
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Device to scan from"
+#: data/simple-scan.desktop.in:8
+msgid "scanner"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "SANE device to acquire images from."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "Type of document being scanned"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
-msgid ""
-"Type of document being scanned. This setting decides on the scan resolution, "
-"colors and post-processing."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
-msgid "Width of paper in tenths of a mm"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
-msgid "Height of paper in tenths of a mm"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "Brightness of scan"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "The brightness adjustment from -100 to 100 (0 being none)."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid "Contrast of scan"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "The contrast adjustment from -100 to 100 (0 being none)."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid "Resolution for text scans"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
-msgid "The resolution in dots-per-inch to use when scanning text."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
-msgid "Resolution for photo scans"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
-msgid "Page side to scan"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
-msgid "The page side to scan."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
-msgid "Directory to save files to"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
-msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
-msgid "Quality value to use for JPEG compression"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Quality value to use for JPEG compression."
-msgstr ""
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+#: data/simple-scan.appdata.xml.in:8
 msgid ""
 "A really easy way to scan both documents and photos. You can crop out the "
 "bad parts of a photo and rotate it if it is the wrong way round. You can "
@@ -407,196 +317,162 @@ msgid ""
 "formats."
 msgstr ""
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+#: data/simple-scan.appdata.xml.in:13
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr ""
 
-#. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr ""
 
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr ""
 
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1236 src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr ""
 
-#. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr ""
 
-#. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr ""
 
-#: ../src/simple-scan.vala:26
+#: src/simple-scan.vala:26
 msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr ""
 
-#. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:391
+#: src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr ""
 
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:318 src/ui.vala:1602 src/ui.vala:1887
 msgid "_Close"
 msgstr ""
 
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:327
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr ""
 
-#. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:375
 msgid "No scanners detected"
 msgstr ""
 
-#. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:377
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:382
 msgid "Additional software needed"
 msgstr ""
 
-#. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr ""
 
-#. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:506 src/ui.vala:1843
 msgid "Save As..."
 msgstr ""
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:509 src/ui.vala:675
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:510 src/ui.vala:676
 msgid "_Save"
 msgstr ""
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr ""
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:521
 msgid "Image Files"
 msgstr ""
 
-#. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:527
 msgid "All Files"
 msgstr ""
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr ""
 
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr ""
 
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr ""
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:557
 msgid "File format:"
 msgstr ""
 
-#. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:650
 msgid "Failed to save file"
 msgstr ""
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:673
 msgid "If you don't save, changes will be permanently lost."
 msgstr ""
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:708
+#: src/ui.vala:708
 msgid "Save current document?"
 msgstr ""
 
-#. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:710
 msgid "Discard Changes"
 msgstr ""
 
-#. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr ""
 
-#. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr ""
 
-#. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1206
 msgid "Combine sides"
 msgstr ""
 
-#. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr ""
 
-#. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1226
 msgid "Reverse"
 msgstr ""
 
-#. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr ""
 
-#. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr ""
 
-#. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1472
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -612,206 +488,181 @@ msgid ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
 
-#. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr ""
 
-#. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Rockworld https://launchpad.net/~rockrock2222222"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr ""
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr ""
 
-#. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
-#. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1581
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
 msgstr ""
 
-#. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
-#. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1587
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
 msgstr ""
 
-#. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr ""
 
-#. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
-#. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1598
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
 msgstr ""
 
-#. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1602
 msgid "Install drivers"
 msgstr ""
 
-#. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
-#. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr ""
 
-#. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr ""
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr ""
 
-#. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1676
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr ""
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/ui.vala:1793
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1835
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1840
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1844
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1845
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1853
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1854
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1855
 msgid "Quit"
 msgstr ""
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr ""
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr ""
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1897
 msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1947
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1949
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:1957
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:1959
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:1967
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:1969
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2008
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/simple-scan.pot b/po/simple-scan.pot
new file mode 100644
index 0000000..a6f23dc
--- /dev/null
+++ b/po/simple-scan.pot
@@ -0,0 +1,665 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Robert Ancell <robert.ancell@canonical.com>
+# This file is distributed under the same license as the simple-scan package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: simple-scan 3.21.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-07-29 12:47+1200\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"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Button to submit authorization dialog
+#: data/simple-scan.ui:24
+msgid "_Authorize"
+msgstr ""
+
+#. Label beside username entry
+#: data/simple-scan.ui:102
+msgid "_Username for resource:"
+msgstr ""
+
+#. Label beside password entry
+#: data/simple-scan.ui:117
+msgid "_Password:"
+msgstr ""
+
+#. Combo box label for scanning both sides of a page
+#: data/simple-scan.ui:188
+msgid "Front and Back"
+msgstr ""
+
+#. Combo box label for scanning the front side of a page
+#: data/simple-scan.ui:192
+msgid "Front"
+msgstr ""
+
+#. Combo box label for scanning the back side of a page
+#: data/simple-scan.ui:196
+msgid "Back"
+msgstr ""
+
+#. Title of scan window
+#: data/simple-scan.ui:225 data/simple-scan.ui:809
+#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
+msgid "Simple Scan"
+msgstr ""
+
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: data/simple-scan.ui:241
+msgid "_Document"
+msgstr ""
+
+#. Scan menu item
+#: data/simple-scan.ui:260
+msgid "Sc_an"
+msgstr ""
+
+#. Scan menu item to scan a single page from the scanner
+#. Toolbar scan menu item to scan a single page from the scanner
+#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+msgid "Single _Page"
+msgstr ""
+
+#. Scan menu item to scan all pages from a document feeder
+#. Toolbar scan menu item to scan all pages from a document feeder
+#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+msgid "All Pages From _Feeder"
+msgstr ""
+
+#. Menu entry to stop current scan
+#: data/simple-scan.ui:294
+msgid "_Stop Scan"
+msgstr ""
+
+#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+msgid "Text"
+msgstr ""
+
+#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+msgid "Photo"
+msgstr ""
+
+#. Menu item to reorder pages
+#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
+msgid "Reorder Pages"
+msgstr ""
+
+#. Label on email menu item
+#: data/simple-scan.ui:367
+msgid "_Email"
+msgstr ""
+
+#. Page menu (contains action for each page, e.g. delete, crop)
+#: data/simple-scan.ui:430
+msgid "_Page"
+msgstr ""
+
+#. Menu item to rotate page to left (anti-clockwise)
+#: data/simple-scan.ui:440
+msgid "Rotate _Left"
+msgstr ""
+
+#. Menu item to rotate page to right (clockwise)
+#: data/simple-scan.ui:450
+msgid "Rotate _Right"
+msgstr ""
+
+#. Label for page crop submenu
+#: data/simple-scan.ui:460
+msgid "_Crop"
+msgstr ""
+
+#. Radio button for no crop
+#: data/simple-scan.ui:470
+msgid "_None"
+msgstr ""
+
+#. Radio button for cropping page to A4 size
+#: data/simple-scan.ui:481
+msgid "A_4"
+msgstr ""
+
+#. Radio button for cropping page to A5 size
+#: data/simple-scan.ui:492
+msgid "A_5"
+msgstr ""
+
+#. Radio button for cropping page to A6 size
+#: data/simple-scan.ui:503
+msgid "A_6"
+msgstr ""
+
+#. Radio button for cropping page to US letter size
+#: data/simple-scan.ui:514
+msgid "_Letter"
+msgstr ""
+
+#. Radio button for cropping to page to US legal size
+#: data/simple-scan.ui:525
+msgid "Le_gal"
+msgstr ""
+
+#. Radio button for cropping page to 4x6 inch
+#: data/simple-scan.ui:536
+msgid "4×6"
+msgstr ""
+
+#. Radio button for cropping to custom page size
+#: data/simple-scan.ui:547
+msgid "_Custom"
+msgstr ""
+
+#. Menu item to rotate the crop area
+#: data/simple-scan.ui:565
+msgid "_Rotate Crop"
+msgstr ""
+
+#. Menu item to move the selected page to the left
+#: data/simple-scan.ui:578
+msgid "Move Left"
+msgstr ""
+
+#. Menu item to move the selected page to the right
+#: data/simple-scan.ui:587
+msgid "Move Right"
+msgstr ""
+
+#. Label on help menu
+#: data/simple-scan.ui:624
+msgid "_Help"
+msgstr ""
+
+#. Help|Contents menu
+#: data/simple-scan.ui:632
+msgid "_Contents"
+msgstr ""
+
+#. Tooltip for new document button
+#: data/simple-scan.ui:674 data/simple-scan.ui:885
+msgid "Start a new document"
+msgstr ""
+
+#: data/simple-scan.ui:675
+msgid "New"
+msgstr ""
+
+#. Tooltip for scan toolbar button
+#: data/simple-scan.ui:689 data/simple-scan.ui:836
+msgid "Scan a single page from the scanner"
+msgstr ""
+
+#. Label on scan toolbar item
+#: data/simple-scan.ui:691 data/simple-scan.ui:837
+msgid "Scan"
+msgstr ""
+
+#. Tooltip for save toolbar button
+#: data/simple-scan.ui:707 data/simple-scan.ui:864
+msgid "Save document to a file"
+msgstr ""
+
+#: data/simple-scan.ui:709 src/ui.vala:1842
+msgid "Save"
+msgstr ""
+
+#. Tooltip for stop button
+#: data/simple-scan.ui:724 data/simple-scan.ui:824
+msgid "Stop the current scan"
+msgstr ""
+
+#: data/simple-scan.ui:725 data/simple-scan.ui:825
+msgid "Stop"
+msgstr ""
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: data/simple-scan.ui:749 data/simple-scan.ui:936
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr ""
+
+#. Label on rotate page left (anti-clockwise) item
+#: data/simple-scan.ui:750
+msgid "Rotate Left"
+msgstr ""
+
+#. Tooltip for rotate right (clockwise) button
+#: data/simple-scan.ui:764 data/simple-scan.ui:914
+msgid "Rotate the page to the right (clockwise)"
+msgstr ""
+
+#. Label on rotate page right (clockwise) item
+#: data/simple-scan.ui:765
+msgid "Rotate Right"
+msgstr ""
+
+#: data/simple-scan.ui:779 data/simple-scan.ui:963
+msgid "Crop the selected page"
+msgstr ""
+
+#: data/simple-scan.ui:781
+msgid "Crop"
+msgstr ""
+
+#. Title of preferences dialog
+#: data/simple-scan.ui:997 src/ui.vala:1849
+msgid "Preferences"
+msgstr ""
+
+#. Label beside scan source combo box
+#: data/simple-scan.ui:1048
+msgid "Scan S_ource:"
+msgstr ""
+
+#. Label beside scan source combo box
+#: data/simple-scan.ui:1079
+msgid "_Text Resolution:"
+msgstr ""
+
+#. Label beside scan source combo box
+#: data/simple-scan.ui:1095
+msgid "_Photo Resolution:"
+msgstr ""
+
+#. Label beside scan side combo box
+#: data/simple-scan.ui:1139
+msgid "Scan Side:"
+msgstr ""
+
+#. Label beside page size combo box
+#: data/simple-scan.ui:1169
+msgid "Page Size:"
+msgstr ""
+
+#. Label beside brightness scale
+#: data/simple-scan.ui:1199
+msgid "Brightness:"
+msgstr ""
+
+#. Label beside contrast scale
+#: data/simple-scan.ui:1229
+msgid "Contrast:"
+msgstr ""
+
+#. Label beside quality scale
+#: data/simple-scan.ui:1260
+msgid "Quality:"
+msgstr ""
+
+#: data/simple-scan.desktop.in:4
+msgid "Document Scanner"
+msgstr ""
+
+#: data/simple-scan.desktop.in:5
+msgid "Scan Documents"
+msgstr ""
+
+#: data/simple-scan.desktop.in:6
+msgid "scan;scanner;flatbed;adf;"
+msgstr ""
+
+#: data/simple-scan.desktop.in:8
+msgid "scanner"
+msgstr ""
+
+#: data/simple-scan.appdata.xml.in:8
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: data/simple-scan.appdata.xml.in:13
+msgid "Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
+#: src/scanner.vala:841
+msgid "No scanners available.  Please connect a scanner."
+msgstr ""
+
+#: src/scanner.vala:871
+msgid "Unable to connect to scanner"
+msgstr ""
+
+#: src/scanner.vala:1223
+msgid "Unable to start scan"
+msgstr ""
+
+#: src/scanner.vala:1236 src/scanner.vala:1333
+msgid "Error communicating with scanner"
+msgstr ""
+
+#: src/simple-scan.vala:21
+msgid "Show release version"
+msgstr ""
+
+#: src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr ""
+
+#: src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+msgstr ""
+
+#: src/simple-scan.vala:391
+msgid "Failed to scan"
+msgstr ""
+
+#: src/simple-scan.vala:621
+msgid "[DEVICE...] - Scanning utility"
+msgstr ""
+
+#: src/simple-scan.vala:632
+#, c-format
+msgid "Run '%s --help' to see a full list of available command line options."
+msgstr ""
+
+#: src/ui.vala:318 src/ui.vala:1602 src/ui.vala:1887
+msgid "_Close"
+msgstr ""
+
+#: src/ui.vala:327
+#, c-format
+msgid "Username and password required to access '%s'"
+msgstr ""
+
+#: src/ui.vala:375
+msgid "No scanners detected"
+msgstr ""
+
+#: src/ui.vala:377
+msgid "Please check your scanner is connected and powered on"
+msgstr ""
+
+#: src/ui.vala:382
+msgid "Additional software needed"
+msgstr ""
+
+#: src/ui.vala:384
+msgid "You need to install driver software for your scanner."
+msgstr ""
+
+#: src/ui.vala:506 src/ui.vala:1843
+msgid "Save As..."
+msgstr ""
+
+#: src/ui.vala:509 src/ui.vala:675
+msgid "_Cancel"
+msgstr ""
+
+#: src/ui.vala:510 src/ui.vala:676
+msgid "_Save"
+msgstr ""
+
+#: src/ui.vala:516
+msgid "Scanned Document.pdf"
+msgstr ""
+
+#: src/ui.vala:521
+msgid "Image Files"
+msgstr ""
+
+#: src/ui.vala:527
+msgid "All Files"
+msgstr ""
+
+#: src/ui.vala:536
+msgid "PDF (multi-page document)"
+msgstr ""
+
+#: src/ui.vala:542
+msgid "JPEG (compressed)"
+msgstr ""
+
+#: src/ui.vala:548
+msgid "PNG (lossless)"
+msgstr ""
+
+#: src/ui.vala:557
+msgid "File format:"
+msgstr ""
+
+#: src/ui.vala:650
+msgid "Failed to save file"
+msgstr ""
+
+#: src/ui.vala:673
+msgid "If you don't save, changes will be permanently lost."
+msgstr ""
+
+#: src/ui.vala:708
+msgid "Save current document?"
+msgstr ""
+
+#: src/ui.vala:710
+msgid "Discard Changes"
+msgstr ""
+
+#: src/ui.vala:992
+msgid "Unable to save image for preview"
+msgstr ""
+
+#: src/ui.vala:1004
+msgid "Unable to open image preview application"
+msgstr ""
+
+#: src/ui.vala:1206
+msgid "Combine sides"
+msgstr ""
+
+#: src/ui.vala:1216
+msgid "Combine sides (reverse)"
+msgstr ""
+
+#: src/ui.vala:1226
+msgid "Reverse"
+msgstr ""
+
+#: src/ui.vala:1236
+msgid "Keep unchanged"
+msgstr ""
+
+#: src/ui.vala:1451
+msgid "Unable to open help file"
+msgstr ""
+
+#: src/ui.vala:1472
+msgid ""
+"This program is free software: you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation, either version 3 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License\n"
+"along with this program.  If not, see <http://www.gnu.org/licenses/>."
+msgstr ""
+
+#: src/ui.vala:1475
+msgid "About Simple Scan"
+msgstr ""
+
+#: src/ui.vala:1478
+msgid "Simple document scanning tool"
+msgstr ""
+
+#: src/ui.vala:1487
+msgid "translator-credits"
+msgstr ""
+
+#: src/ui.vala:1509
+msgid "Save document before quitting?"
+msgstr ""
+
+#: src/ui.vala:1511
+msgid "Quit without Saving"
+msgstr ""
+
+#: src/ui.vala:1579
+msgid "You appear to have a Brother scanner."
+msgstr ""
+
+#: src/ui.vala:1581
+msgid ""
+"Drivers for this are available on the <a href=\"http://support.brother.com"
+"\">Brother website</a>."
+msgstr ""
+
+#: src/ui.vala:1585
+msgid "You appear to have a Samsung scanner."
+msgstr ""
+
+#: src/ui.vala:1587
+msgid ""
+"Drivers for this are available on the <a href=\"http://samsung.com/support"
+"\">Samsung website</a>."
+msgstr ""
+
+#: src/ui.vala:1591
+msgid "You appear to have an HP scanner."
+msgstr ""
+
+#: src/ui.vala:1596
+msgid "You appear to have an Epson scanner."
+msgstr ""
+
+#: src/ui.vala:1598
+msgid ""
+"Drivers for this are available on the <a href=\"http://support.epson.com"
+"\">Epson website</a>."
+msgstr ""
+
+#: src/ui.vala:1602
+msgid "Install drivers"
+msgstr ""
+
+#: src/ui.vala:1633
+msgid "Once installed you will need to restart Simple Scan."
+msgstr ""
+
+#: src/ui.vala:1645
+msgid "Installing drivers..."
+msgstr ""
+
+#: src/ui.vala:1653
+msgid "Drivers installed successfully!"
+msgstr ""
+
+#: src/ui.vala:1663
+#, c-format
+msgid "Failed to install drivers (error code %d)."
+msgstr ""
+
+#: src/ui.vala:1669
+msgid "Failed to install drivers."
+msgstr ""
+
+#: src/ui.vala:1676
+#, c-format
+msgid "You need to install the %s package(s)."
+msgstr ""
+
+#: src/ui.vala:1784
+#, c-format
+msgid "%d dpi (default)"
+msgstr ""
+
+#: src/ui.vala:1787
+#, c-format
+msgid "%d dpi (draft)"
+msgstr ""
+
+#: src/ui.vala:1790
+#, c-format
+msgid "%d dpi (high resolution)"
+msgstr ""
+
+#: src/ui.vala:1793
+#, c-format
+msgid "%d dpi"
+msgstr ""
+
+#: src/ui.vala:1835
+msgid "New Document"
+msgstr ""
+
+#: src/ui.vala:1840
+msgid "Document"
+msgstr ""
+
+#: src/ui.vala:1844
+msgid "Email..."
+msgstr ""
+
+#: src/ui.vala:1845
+msgid "Print..."
+msgstr ""
+
+#: src/ui.vala:1853
+msgid "Help"
+msgstr ""
+
+#: src/ui.vala:1854
+msgid "About"
+msgstr ""
+
+#: src/ui.vala:1855
+msgid "Quit"
+msgstr ""
+
+#: src/ui.vala:1889
+msgid "Change _Scanner"
+msgstr ""
+
+#: src/ui.vala:1891
+msgid "_Install Drivers"
+msgstr ""
+
+#: src/ui.vala:1897
+msgid "Automatic"
+msgstr ""
+
+#: src/ui.vala:1947
+msgid "Darker"
+msgstr ""
+
+#: src/ui.vala:1949
+msgid "Lighter"
+msgstr ""
+
+#: src/ui.vala:1957
+msgid "Less"
+msgstr ""
+
+#: src/ui.vala:1959
+msgid "More"
+msgstr ""
+
+#: src/ui.vala:1967
+msgid "Minimum"
+msgstr ""
+
+#: src/ui.vala:1969
+msgid "Maximum"
+msgstr ""
+
+#: src/ui.vala:2008
+msgid "Saving document..."
+msgstr ""
+
+#: src/ui.vala:2173
+#, c-format
+msgid "Saving page %d out of %d"
+msgstr ""
diff --git a/po/sk.gmo b/po/sk.gmo
new file mode 100644
index 0000000..9f97316
--- /dev/null
+++ b/po/sk.gmo
diff --git a/po/sk.po b/po/sk.po
index cccb0a9..f40a194 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -8,412 +8,311 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-06 14:16+1200\n"
-"PO-Revision-Date: 2015-12-05 10:37+0000\n"
+"POT-Creation-Date: 2016-07-29 12:47+1200\n"
+"PO-Revision-Date: 2016-07-29 05:59+0000\n"
 "Last-Translator: Dusan Kazik <prescott66@gmail.com>\n"
 "Language-Team: slovenčina <>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-04-14 05:40+0000\n"
-"X-Generator: Launchpad (build 17990)\n"
+"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 "Language: sk\n"
 
 #. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:2
+#: data/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "Ove_riť"
 
 #. Label beside username entry
-#: ../data/simple-scan.ui.h:4
+#: data/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "_Užívateľské meno pre zdroj:"
 
 #. Label beside password entry
-#: ../data/simple-scan.ui.h:6
+#: data/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Heslo:"
 
 #. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:8
+#: data/simple-scan.ui:188
 msgid "Front and Back"
 msgstr "Predná a zadná strana"
 
 #. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:10
+#: data/simple-scan.ui:192
 msgid "Front"
 msgstr "Predná strana"
 
 #. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:12
+#: data/simple-scan.ui:196
 msgid "Back"
 msgstr "Zadná strana"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
-#: ../data/appdata/simple-scan.appdata.xml.in.h:1
+#: data/simple-scan.ui:225 data/simple-scan.ui:809
+#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr "Jednoduché skenovanie"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:16
+#: data/simple-scan.ui:241
 msgid "_Document"
 msgstr "_Dokument"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:18
+#: data/simple-scan.ui:260
 msgid "Sc_an"
 msgstr "_Skenovať"
 
+#. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:20
+#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
 msgid "Single _Page"
 msgstr "_Jedna stránka"
 
+#. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:22
+#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
-msgstr "_Všetky stránky zo zásobníka"
+msgstr "_Všetky stránky z podávača"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:24
+#: data/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "_Zastaviť skenovanie"
 
-#: ../data/simple-scan.ui.h:25
+#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
 msgid "Text"
 msgstr "Text"
 
-#: ../data/simple-scan.ui.h:26
+#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
 msgid "Photo"
 msgstr "Fotografia"
 
 #. Menu item to reorder pages
-#. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1183 ../src/ui.vala:1841
+#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr "Zmeniť poradie stránok"
 
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: data/simple-scan.ui:367
 msgid "_Email"
 msgstr "_Email"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: data/simple-scan.ui:430
 msgid "_Page"
 msgstr "_Stránka"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: data/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "Otočiť _doľava"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: data/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "Otočiť do_prava"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: data/simple-scan.ui:460
 msgid "_Crop"
 msgstr "_Orezanie"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: data/simple-scan.ui:470
 msgid "_None"
 msgstr "Žia_dne"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: data/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: data/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: data/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: data/simple-scan.ui:514
 msgid "_Letter"
 msgstr "US _List"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: data/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: data/simple-scan.ui:536
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: data/simple-scan.ui:547
 msgid "_Custom"
 msgstr "_Vlastné"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: data/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr "_Otočiť výrez"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: data/simple-scan.ui:578
 msgid "Move Left"
 msgstr "Presunúť doľava"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: data/simple-scan.ui:587
 msgid "Move Right"
 msgstr "Presunúť doprava"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: data/simple-scan.ui:624
 msgid "_Help"
 msgstr "_Pomocník"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: data/simple-scan.ui:632
 msgid "_Contents"
 msgstr "_Obsah"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: data/simple-scan.ui:674 data/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "Vytvorí nový dokument"
 
-#: ../data/simple-scan.ui.h:67
+#: data/simple-scan.ui:675
 msgid "New"
 msgstr "Nový"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: data/simple-scan.ui:689 data/simple-scan.ui:836
 msgid "Scan a single page from the scanner"
 msgstr "Oskenuje jednu stránku zo skeneru"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: data/simple-scan.ui:691 data/simple-scan.ui:837
 msgid "Scan"
 msgstr "Skenovať"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: data/simple-scan.ui:707 data/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "Uloží dokument do súboru"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1842
+#: data/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "Uložiť"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: data/simple-scan.ui:724 data/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "Zastaví aktuálne skenovanie"
 
-#: ../data/simple-scan.ui.h:77
+#: data/simple-scan.ui:725 data/simple-scan.ui:825
 msgid "Stop"
 msgstr "Zastaviť"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: data/simple-scan.ui:749 data/simple-scan.ui:936
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Otočí stránku doľava (v protismere hodinových ručičiek)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: data/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "Otočiť doľava"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: data/simple-scan.ui:764 data/simple-scan.ui:914
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Otočí stránku doprava (v smere hodinových ručičiek)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: data/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "Otočiť doprava"
 
 # tooltip
-#: ../data/simple-scan.ui.h:86
+#: data/simple-scan.ui:779 data/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "Oreže vybratú stránku"
 
-#: ../data/simple-scan.ui.h:87
+#: data/simple-scan.ui:781
 msgid "Crop"
 msgstr "Orezanie"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1849
+#: data/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "Nastavenia"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: data/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "Zdroj s_kenovania:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: data/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "Rozlíšenie _textu:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: data/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "Rozlíšenie _fotografií:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: data/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "Skenovaná strana:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: data/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "Veľkosť stránky:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: data/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "Jas:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: data/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "Kontrast:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: data/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "Kvalita:"
 
-#: ../data/simple-scan.desktop.in.h:2
+#: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr "Skener dokumentov"
 
-#: ../data/simple-scan.desktop.in.h:3
+#: data/simple-scan.desktop.in:5
 msgid "Scan Documents"
 msgstr "Skenuje dokumenty"
 
-#: ../data/simple-scan.desktop.in.h:4
+#: data/simple-scan.desktop.in:6
 msgid "scan;scanner;flatbed;adf;"
 msgstr "skenovanie;skenovať;skener;plochý;adf;"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Device to scan from"
-msgstr "Zariadenie z ktorého skenovať"
+#: data/simple-scan.desktop.in:8
+msgid "scanner"
+msgstr "skener"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "SANE device to acquire images from."
-msgstr "Zariadenie SANE z ktorého získať obrázky."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "Type of document being scanned"
-msgstr "Druh dokumentu ktorý sa skenuje"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
-msgid ""
-"Type of document being scanned. This setting decides on the scan resolution, "
-"colors and post-processing."
-msgstr ""
-"Typ dokumentu ktorý sa skenuje. Toto nastavenie určuje rozlíšenie, farby a "
-"spracovanie tohto skenu."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
-msgid "Width of paper in tenths of a mm"
-msgstr "Šírka papiera v desatinách mm"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-"Šírka papiera v desatinách mm (alebo hodnota 0 pre automatické rozpoznanie "
-"papiera)"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
-msgid "Height of paper in tenths of a mm"
-msgstr "Výška papiera v desatinách mm"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-"Výška papiera v desatinách mm (alebo hodnota 0 pre automatické rozpoznanie "
-"papiera)"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "Brightness of scan"
-msgstr "Jas skenu"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "The brightness adjustment from -100 to 100 (0 being none)."
-msgstr "Úprava jasu od -100 do 100 (0 znamená bez úpravy)"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid "Contrast of scan"
-msgstr "Kontrast skenu"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "The contrast adjustment from -100 to 100 (0 being none)."
-msgstr "Úprava kontrastu od -100 do 100 (0 znamená bez úpravy)"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid "Resolution for text scans"
-msgstr "Rozlíšenie pre skenovanie textu"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
-msgid "The resolution in dots-per-inch to use when scanning text."
-msgstr ""
-"Rozlíšenie v bodoch na palec (DPI), ktoré sa má použiť pri skenovaní textu."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
-msgid "Resolution for photo scans"
-msgstr "Rozlíšenie pre skenovanie fotografií"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr ""
-"Rozlíšenie v bodoch na palec (DPI), ktoré sa má použiť pri skenovaní "
-"fotografií."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
-msgid "Page side to scan"
-msgstr "Strana stránky na skenovanie"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
-msgid "The page side to scan."
-msgstr "Strana stránky, ktorá sa má oskenovať."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
-msgid "Directory to save files to"
-msgstr "Adresár na ukladanie súborov"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
-msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
-msgstr ""
-"Adresár, do ktorého sa majú ukladať súbory. Ak je nenastavený, použije sa "
-"predvolený adresár dokumentov."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
-msgid "Quality value to use for JPEG compression"
-msgstr "Hodnota kvality kompresie obrázkov JPEG"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Quality value to use for JPEG compression."
-msgstr "Hodnota kvality, ktorá sa má použiť pre kompresiu obrázkov JPEG."
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+#: data/simple-scan.appdata.xml.in:8
 msgid ""
 "A really easy way to scan both documents and photos. You can crop out the "
 "bad parts of a photo and rotate it if it is the wrong way round. You can "
@@ -425,202 +324,168 @@ msgstr ""
 "dokumenty môžete vytlačiť, exportovať ich do pdf, alebo ich uložiť v rôznych "
 "formátoch obrázkov."
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+#: data/simple-scan.appdata.xml.in:13
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 "Aplikácia Jednoduché skenovanie využíva rozhranie SANE, kvôli podpore "
 "väčšiny existujúcich skenerov."
 
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Nie sú dostupné žiadne skenery. Prosím, pripojte skener."
 
-#. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "Nie je možné pripojiť sa ku skeneru"
 
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "Nie je možné začať skenovať"
 
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1236 src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr "Chyba v komunikácii so skenerom"
 
-#. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "Zobrazí verziu vydania"
 
-#. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr "Vypíše správy ladenia"
 
-#: ../src/simple-scan.vala:26
+#: src/simple-scan.vala:26
 msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr ""
 "Opraviť .pdf súbory vytvorené staršími verziami programu Jednoduché "
 "skenovanie"
 
-#. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:391
+#: src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Skenovanie zlyhalo"
 
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[ZARIADENIE…] - Nástroj na skenovanie"
 
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Zoznam všetkých dostupných volieb príkazového riadka zobrazíte spustením „%s "
 "--help“."
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:318 src/ui.vala:1602 src/ui.vala:1887
 msgid "_Close"
 msgstr "_Zavrieť"
 
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:327
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Meno používateľa a heslo je vyžadované pre prístup k '%s'"
 
-#. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:375
 msgid "No scanners detected"
 msgstr "Nezistili sa žiadne skenery"
 
-#. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:377
 msgid "Please check your scanner is connected and powered on"
 msgstr "Prosím, skontrolujte, či je skener pripojený a zapnutý"
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:382
 msgid "Additional software needed"
 msgstr "Vyžaduje sa dodatočný softvér"
 
-#. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr "Musíte nainštalovať softvér ovládača pre váš skener."
 
-#. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:506 src/ui.vala:1843
 msgid "Save As..."
 msgstr "Uložiť ako..."
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:509 src/ui.vala:675
 msgid "_Cancel"
 msgstr "Z_rušiť"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:510 src/ui.vala:676
 msgid "_Save"
 msgstr "_Uložiť"
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "Naskenovaný dokument.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:521
 msgid "Image Files"
 msgstr "Súbory obrázkov"
 
-#. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:527
 msgid "All Files"
 msgstr "Všetky súbory"
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (dokument s viacerými stránkami)"
 
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (komprimovaný)"
 
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (bezstratový)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:557
 msgid "File format:"
 msgstr "Formát súboru:"
 
-#. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:650
 msgid "Failed to save file"
 msgstr "Ukladanie súboru zlyhalo"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:673
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Ak dokument neuložíte, zmeny budú natrvalo stratené."
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:708
+#: src/ui.vala:708
 msgid "Save current document?"
 msgstr "Uložiť aktuálny dokument?"
 
-#. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:710
 msgid "Discard Changes"
 msgstr "Zahodiť zmeny"
 
-#. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "Nepodarilo sa uložiť obraz na náhľad"
 
-#. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "Nie je možné otvoriť aplikáciu na náhľad obrázku"
 
-#. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1206
 msgid "Combine sides"
 msgstr "Kombinovať strany"
 
-#. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr "Kombinovať strany (obrátene)"
 
-#. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1226
 msgid "Reverse"
 msgstr "Obrátiť"
 
-#. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr "Ponechať nezmenené"
 
-#. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "Nie je možné otvoriť súbor pomocníka"
 
-#. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1472
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -649,17 +514,15 @@ msgstr ""
 "Spolu s týmto programom by ste mali obdržať kópiu Všeobecnej verejnej "
 "licencie GNU. Ak sa tak nestalo, navštívte <http://www.gnu.org/licenses/>."
 
-#. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "O programe Jednoduché skenovanie"
 
-#. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "Nástroj na jednoduché skenovanie dokumentov"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -671,23 +534,19 @@ msgstr ""
 "  Pavol Klačanský https://launchpad.net/~pavolzetor-deactivatedaccount\n"
 "  Robert Ancell https://launchpad.net/~robert-ancell"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "Uložiť dokument pred ukončením?"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "Ukončiť bez uloženia"
 
-#. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr "Zdá sa, že máte skener značky Brother."
 
-#. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1581
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
@@ -696,13 +555,11 @@ msgstr ""
 "href=\"http://support.brother.com/g/b/countrytop.aspx?c=cz&lang=cs\">Brother "
 "website</a>."
 
-#. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr "Zdá sa, že máte skener značky Samsung."
 
-#. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1587
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
@@ -710,18 +567,15 @@ msgstr ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/sk/support\">Samsung website</a>."
 
-#. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr "Zdá sa, že máte skener značky HP."
 
-#. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr "Zdá sa, že máte skener značky Epson."
 
-#. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1598
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
@@ -730,140 +584,126 @@ msgstr ""
 "href=\"http://www.epson.sk/sk/sk/viewcon/corporatesite/support\">webovej "
 "stránke výrobcu Epson</a>."
 
-#. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1602
 msgid "Install drivers"
 msgstr "Inštalácia ovládačov"
 
-#. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 "Po inštalácii budete musieť aplikáciu Jednoduché skenovanie reštartovať."
 
-#. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr "Inštalujú sa ovládače..."
 
-#. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr "Ovládače boli úspešne nainštalované!"
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Zlyhala inštalácia ovládačov (kód chyby %d)."
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr "Zlyhala inštalácia ovládačov."
 
-#. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1676
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr "Musíte nainštalovať balík(y) %s."
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (predvolené)"
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (koncept)"
 
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (vysoké rozlíšenie)"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/ui.vala:1793
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1835
 msgid "New Document"
 msgstr "Nový dokument"
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1840
 msgid "Document"
 msgstr "Dokument"
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1844
 msgid "Email..."
 msgstr "Email..."
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1845
 msgid "Print..."
 msgstr "Tlačiť..."
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1853
 msgid "Help"
 msgstr "Pomocník"
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1854
 msgid "About"
 msgstr "O programe"
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1855
 msgid "Quit"
 msgstr "Ukončiť"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "Zmeniť _skener"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr "Na_inštalovať ovládače"
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1897
 msgid "Automatic"
 msgstr "Automatická"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1947
 msgid "Darker"
 msgstr "Tmavší"
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1949
 msgid "Lighter"
 msgstr "Svetlejší"
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:1957
 msgid "Less"
 msgstr "Menší"
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:1959
 msgid "More"
 msgstr "Väčší"
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:1967
 msgid "Minimum"
 msgstr "Minimálna"
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:1969
 msgid "Maximum"
 msgstr "Maximálna"
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2008
 msgid "Saving document..."
 msgstr "Ukladá sa dokument…"
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Ukladá sa %d. stránka z %d"
@@ -884,9 +724,18 @@ msgstr "Ukladá sa %d. stránka z %d"
 #~ "Smer skeneru naprieč skenovanou stránkou. Môže to byť jedno z následujúcich: "
 #~ "'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
 
+#~ msgid "Type of document being scanned"
+#~ msgstr "Druh dokumentu ktorý sa skenuje"
+
 #~ msgid "TRUE if the application window is maximized"
 #~ msgstr "TRUE pokiaľ je aplikačné okno v maximálnej veľkosti"
 
+#~ msgid "Device to scan from"
+#~ msgstr "Zariadenie z ktorého skenovať"
+
+#~ msgid "SANE device to acquire images from."
+#~ msgstr "Zariadenie SANE z ktorého získať obrázky."
+
 #~ msgid "Direction of scan"
 #~ msgstr "Smer skenovania"
 
@@ -969,6 +818,81 @@ msgstr "Ukladá sa %d. stránka z %d"
 #~ msgid "Width of scanned image in pixels"
 #~ msgstr "Šírka skenovaného obrázku v pixeloch"
 
+#~ msgid "Resolution for photo scans"
+#~ msgstr "Rozlíšenie pre skenovanie fotografií"
+
+#~ msgid "Resolution for text scans"
+#~ msgstr "Rozlíšenie pre skenovanie textu"
+
+#~ msgid ""
+#~ "Type of document being scanned. This setting decides on the scan resolution, "
+#~ "colors and post-processing."
+#~ msgstr ""
+#~ "Typ dokumentu ktorý sa skenuje. Toto nastavenie určuje rozlíšenie, farby a "
+#~ "spracovanie tohto skenu."
+
+#~ msgid "Contrast of scan"
+#~ msgstr "Kontrast skenu"
+
+#~ msgid "Brightness of scan"
+#~ msgstr "Jas skenu"
+
+#~ msgid "Width of paper in tenths of a mm"
+#~ msgstr "Šírka papiera v desatinách mm"
+
+#~ msgid ""
+#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr ""
+#~ "Šírka papiera v desatinách mm (alebo hodnota 0 pre automatické rozpoznanie "
+#~ "papiera)"
+
+#~ msgid "Height of paper in tenths of a mm"
+#~ msgstr "Výška papiera v desatinách mm"
+
+#~ msgid ""
+#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr ""
+#~ "Výška papiera v desatinách mm (alebo hodnota 0 pre automatické rozpoznanie "
+#~ "papiera)"
+
+#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
+#~ msgstr "Úprava jasu od -100 do 100 (0 znamená bez úpravy)"
+
+#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
+#~ msgstr "Úprava kontrastu od -100 do 100 (0 znamená bez úpravy)"
+
+#~ msgid "The resolution in dots-per-inch to use when scanning text."
+#~ msgstr ""
+#~ "Rozlíšenie v bodoch na palec (DPI), ktoré sa má použiť pri skenovaní textu."
+
+#~ msgid "The resolution in dots-per-inch to use when scanning photos."
+#~ msgstr ""
+#~ "Rozlíšenie v bodoch na palec (DPI), ktoré sa má použiť pri skenovaní "
+#~ "fotografií."
+
+#~ msgid "Page side to scan"
+#~ msgstr "Strana stránky na skenovanie"
+
+#~ msgid "The page side to scan."
+#~ msgstr "Strana stránky, ktorá sa má oskenovať."
+
+#~ msgid "Directory to save files to"
+#~ msgstr "Adresár na ukladanie súborov"
+
+#~ msgid ""
+#~ "The directory to save files to. Defaults to the documents directory if unset."
+#~ msgstr ""
+#~ "Adresár, do ktorého sa majú ukladať súbory. Ak je nenastavený, použije sa "
+#~ "predvolený adresár dokumentov."
+
+#~ msgid "Quality value to use for JPEG compression"
+#~ msgstr "Hodnota kvality kompresie obrázkov JPEG"
+
+#~ msgid "Quality value to use for JPEG compression."
+#~ msgstr "Hodnota kvality, ktorá sa má použiť pre kompresiu obrázkov JPEG."
+
 #~ msgid "Scanned Document"
 #~ msgstr "Oskenovaný dokument"
 
diff --git a/po/sl.gmo b/po/sl.gmo
new file mode 100644
index 0000000..d40eb62
--- /dev/null
+++ b/po/sl.gmo
diff --git a/po/sl.po b/po/sl.po
index 24f7977..48123b0 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -7,405 +7,309 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-06 14:16+1200\n"
+"POT-Creation-Date: 2016-07-29 12:47+1200\n"
 "PO-Revision-Date: 2012-07-23 09:19+0000\n"
 "Last-Translator: Andrej Znidarsic <andrej.znidarsic@gmail.com>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-04-14 05:40+0000\n"
-"X-Generator: Launchpad (build 17990)\n"
+"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 
 #. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:2
+#: data/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_Pooblasti"
 
 #. Label beside username entry
-#: ../data/simple-scan.ui.h:4
+#: data/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "_Uporabniško ime za vir:"
 
 #. Label beside password entry
-#: ../data/simple-scan.ui.h:6
+#: data/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Geslo:"
 
 #. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:8
+#: data/simple-scan.ui:188
 msgid "Front and Back"
 msgstr "Prednja in hrbtna stran"
 
 #. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:10
+#: data/simple-scan.ui:192
 msgid "Front"
 msgstr "Prednja stran"
 
 #. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:12
+#: data/simple-scan.ui:196
 msgid "Back"
 msgstr "Hrbtna stran"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
-#: ../data/appdata/simple-scan.appdata.xml.in.h:1
+#: data/simple-scan.ui:225 data/simple-scan.ui:809
+#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr "Enostavno optično branje"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:16
+#: data/simple-scan.ui:241
 msgid "_Document"
 msgstr "_Dokument"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:18
+#: data/simple-scan.ui:260
 msgid "Sc_an"
 msgstr "Op_tično branje"
 
+#. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:20
+#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
 msgid "Single _Page"
 msgstr "Ena _stran"
 
+#. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:22
+#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr "Vse strani iz _podajalnika"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:24
+#: data/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "_Zaustavi optično branje"
 
-#: ../data/simple-scan.ui.h:25
+#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
 msgid "Text"
 msgstr "Besedilo"
 
-#: ../data/simple-scan.ui.h:26
+#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
 msgid "Photo"
 msgstr "Fotografija"
 
 #. Menu item to reorder pages
-#. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1183 ../src/ui.vala:1841
+#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr "Prerazporeditev strani"
 
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: data/simple-scan.ui:367
 msgid "_Email"
 msgstr "_Elektronska pošta"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: data/simple-scan.ui:430
 msgid "_Page"
 msgstr "_Stran"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: data/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "Zavrti _levo"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: data/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "Zavrti _desno"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: data/simple-scan.ui:460
 msgid "_Crop"
 msgstr "_Obreži"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: data/simple-scan.ui:470
 msgid "_None"
 msgstr "_Brez"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: data/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: data/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: data/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: data/simple-scan.ui:514
 msgid "_Letter"
 msgstr "_Pismo"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: data/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "Velikost ZDA Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: data/simple-scan.ui:536
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: data/simple-scan.ui:547
 msgid "_Custom"
 msgstr "_Po meri"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: data/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr "_Zavrti obrezovano območje"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: data/simple-scan.ui:578
 msgid "Move Left"
 msgstr "Premakni levo"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: data/simple-scan.ui:587
 msgid "Move Right"
 msgstr "Premakni desno"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: data/simple-scan.ui:624
 msgid "_Help"
 msgstr "Pomo_č"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: data/simple-scan.ui:632
 msgid "_Contents"
 msgstr "_Vsebina"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: data/simple-scan.ui:674 data/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "Začni nov dokument"
 
-#: ../data/simple-scan.ui.h:67
+#: data/simple-scan.ui:675
 msgid "New"
 msgstr "Novo"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: data/simple-scan.ui:689 data/simple-scan.ui:836
 msgid "Scan a single page from the scanner"
 msgstr "Optično branje ene strani iz optičnega bralnika"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: data/simple-scan.ui:691 data/simple-scan.ui:837
 msgid "Scan"
 msgstr "Optično branje"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: data/simple-scan.ui:707 data/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "Shrani dokument v datoteko"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1842
+#: data/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "Shrani"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: data/simple-scan.ui:724 data/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "Zaustavi trenutno optično branje"
 
-#: ../data/simple-scan.ui.h:77
+#: data/simple-scan.ui:725 data/simple-scan.ui:825
 msgid "Stop"
 msgstr "Zaustavi"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: data/simple-scan.ui:749 data/simple-scan.ui:936
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Obrni stran v levo (nasprotna smer urinega kazalca)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: data/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "Zavrti levo"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: data/simple-scan.ui:764 data/simple-scan.ui:914
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Obrni stran v desno (smer urinega kazalca)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: data/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "Zavrti desno"
 
-#: ../data/simple-scan.ui.h:86
+#: data/simple-scan.ui:779 data/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "Obreži izbrano stran"
 
-#: ../data/simple-scan.ui.h:87
+#: data/simple-scan.ui:781
 msgid "Crop"
 msgstr "Obreži"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1849
+#: data/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "Možnosti"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: data/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "_Vir optičnega branja:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: data/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "_Ločljivost besedila:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: data/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "_Ločljivost fotografij:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: data/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "Stran optičnega branja:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: data/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "Velikost strani:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: data/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "Svetlost:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: data/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "Kontrast:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: data/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "Kakovost:"
 
-#: ../data/simple-scan.desktop.in.h:2
+#: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr "Optični bralnik dokumentov"
 
-#: ../data/simple-scan.desktop.in.h:3
+#: data/simple-scan.desktop.in:5
 msgid "Scan Documents"
 msgstr "Optično preberite dokumente"
 
-#: ../data/simple-scan.desktop.in.h:4
+#: data/simple-scan.desktop.in:6
 msgid "scan;scanner;flatbed;adf;"
 msgstr "optični bralnik;adf;"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Device to scan from"
-msgstr "Naprava za optično branje"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "SANE device to acquire images from."
-msgstr "Naprava SANE za pridobivanje slik."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "Type of document being scanned"
-msgstr "Vrsta optično branega dokumenta"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
-msgid ""
-"Type of document being scanned. This setting decides on the scan resolution, "
-"colors and post-processing."
+#: data/simple-scan.desktop.in:8
+msgid "scanner"
 msgstr ""
-"Vrsta dokumenta za optično branje. Ta nastavitev določi ločljivost tiskanja, "
-"barve in poobdelovo."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
-msgid "Width of paper in tenths of a mm"
-msgstr "Širina papirja v desetinkah milimetra"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-"Širina papirja v desetinkah milimetra (ali 0 za samodejno zaznavanje)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
-msgid "Height of paper in tenths of a mm"
-msgstr "Višina papirja v desetinkah milimetra"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-"Višina papirja v desetinkah milimetra (ali 0 za samodejno zaznavanje "
-"papirja)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "Brightness of scan"
-msgstr "Svetlost optičnega branja"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "The brightness adjustment from -100 to 100 (0 being none)."
-msgstr "Prilagoditev svetlosti od -100 do 100 (0 kot brez)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid "Contrast of scan"
-msgstr "Kontrast optičnega branja"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "The contrast adjustment from -100 to 100 (0 being none)."
-msgstr "Prilagoditev kontrasta od -100 do 100 (0 kot brez)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid "Resolution for text scans"
-msgstr "Ločljivost za optično branje besedil"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
-msgid "The resolution in dots-per-inch to use when scanning text."
-msgstr "Ločljivost optičnega branja besedil v točkah na palec (dpi)"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
-msgid "Resolution for photo scans"
-msgstr "Ločljivost za optično branje fotografij"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr "Ločljivost optičnega branja fotografij v točkah na palec (dpi)"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
-msgid "Page side to scan"
-msgstr "Stran strani za optično branje"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
-msgid "The page side to scan."
-msgstr "Stran strani za optično branje."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
-msgid "Directory to save files to"
-msgstr "Mapa za shranjevanje datotek"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
-msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
-msgstr ""
-"Mapa za shranjevanje datotek. Privzeto mapa dokumentov, če ni nastavljena."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
-msgid "Quality value to use for JPEG compression"
-msgstr "Vrednost kakovosti za stiskanje JPEG"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Quality value to use for JPEG compression."
-msgstr "Vrednost kakovosti za stiskanje JPEG."
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+#: data/simple-scan.appdata.xml.in:8
 msgid ""
 "A really easy way to scan both documents and photos. You can crop out the "
 "bad parts of a photo and rotate it if it is the wrong way round. You can "
@@ -417,199 +321,165 @@ msgstr ""
 "Prebrane dokumente lahko natisnete, izvozite v pdf ali shranite v eno od "
 "mnogih oblik."
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+#: data/simple-scan.appdata.xml.in:13
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 "Enostavno optično branje zahteva ogrodje SANE, da lahko podpira večino "
 "obstoječih optičnih bralnikov."
 
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Ni optičnih bralnikov na voljo. Priklopite optični bralnik."
 
-#. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "Z optičnim bralnikom se ni mogoče povezati"
 
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "Optičnega branja ni mogoče začeti"
 
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1236 src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr "Napaka med sporazumevanjem z optičnim bralnikom"
 
-#. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "Pokaži podrobnosti različice"
 
-#. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr "Izpiši razhroščevalna sporočila"
 
-#: ../src/simple-scan.vala:26
+#: src/simple-scan.vala:26
 msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr ""
 "Popravi datoteke PDF ustvarjene s starejšimi različicami programa Simple Scan"
 
-#. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:391
+#: src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Optično branje je spodletelo"
 
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[NAPRAVA ...] - pripomoček optičnega branja"
 
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr "Za popoln seznam možnosti ukazne vrstice zaženite '%s --help'."
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:318 src/ui.vala:1602 src/ui.vala:1887
 msgid "_Close"
 msgstr "_Zapri"
 
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:327
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Za dostop do '%s' je zahtevano uporabniško ime in geslo"
 
-#. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:375
 msgid "No scanners detected"
 msgstr "Optičnega bralnika ni mogoče zaznati"
 
-#. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:377
 msgid "Please check your scanner is connected and powered on"
 msgstr "Preverite, če je vaš optični bralnik povezan in vklopljen"
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:382
 msgid "Additional software needed"
 msgstr "Potrebna je dodatna programska oprema"
 
-#. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr "Za svoj optični bralnik morate namestiti gonilnik."
 
-#. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:506 src/ui.vala:1843
 msgid "Save As..."
 msgstr "Shrani kot ..."
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:509 src/ui.vala:675
 msgid "_Cancel"
 msgstr "_Prekliči"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:510 src/ui.vala:676
 msgid "_Save"
 msgstr "_Shrani"
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "Optično bran dokument.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:521
 msgid "Image Files"
 msgstr "Slikovne datoteke"
 
-#. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:527
 msgid "All Files"
 msgstr "Vse datoteke"
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (večstranski dokument)"
 
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (stisnjen)"
 
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (brez izgub)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:557
 msgid "File format:"
 msgstr "Vrsta datoteke:"
 
-#. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:650
 msgid "Failed to save file"
 msgstr "Shranjevanje datoteke je spodletelo"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:673
 msgid "If you don't save, changes will be permanently lost."
 msgstr "V primeru, da sprememb ne shranite, bodo trajno izgubljene."
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:708
+#: src/ui.vala:708
 msgid "Save current document?"
 msgstr "Naj bo trenutni dokument shranjen?"
 
-#. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:710
 msgid "Discard Changes"
 msgstr "Zavrzi vse spremembe"
 
-#. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "Ni bilo mogoče shraniti slike za predogled"
 
-#. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "Ni mogoče odpreti programa predogleda slik"
 
-#. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1206
 msgid "Combine sides"
 msgstr "Spoji strani"
 
-#. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr "Spoji strani (obratno)"
 
-#. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1226
 msgid "Reverse"
 msgstr "Obrnjeno"
 
-#. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr "Ohrani nespremenjeno"
 
-#. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "Ni mogoče odpreti datoteke pomoči"
 
-#. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1472
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -640,17 +510,15 @@ msgstr ""
 "\n"
 "v primeru, da kopije niste prejeli si oglejte <http://www.gnu.org/licenses/>."
 
-#. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "O programu"
 
-#. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "Preprosto orodje za optično branje dokumentov"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -664,23 +532,19 @@ msgstr ""
 "  Sasa Batistic https://launchpad.net/~sasa-batistic\n"
 "  grofaty https://launchpad.net/~grofaty"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "Ali naj bo dokument pred končanjem programa shranjen?"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "Končaj brez shranjevanja"
 
-#. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr "Videti je, da imate optični bralnik Brother."
 
-#. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1581
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
@@ -688,13 +552,11 @@ msgstr ""
 "Za ta optični bralnik so gonilniki na voljo na  <a "
 "href=\"http://support.brother.com\">spletni strani Brother</a>."
 
-#. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr "Videti je, da imate optični bralnik Samsung."
 
-#. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1587
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
@@ -702,18 +564,15 @@ msgstr ""
 "Za ta optični bralnik so gonilniki na voljo na  <a "
 "href=\"http://samsung.com/support\">spletni strani Samsung</a>."
 
-#. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr "Videti je, da imate optični bralnik HP."
 
-#. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr "Videti je, da imate optični bralnik Epson."
 
-#. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1598
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
@@ -721,141 +580,127 @@ msgstr ""
 "Gonilniki za to so na voljo na <a "
 "href=\"http://support.epson.com\">spletišču Epson</a>."
 
-#. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1602
 msgid "Install drivers"
 msgstr "Namesti gonilnike"
 
-#. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 "Ko se namestijo, boste morali program Enostavno optično branje ponovno "
 "zagnati."
 
-#. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr "Nameščanje gonilnikov ..."
 
-#. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr "Gonilniki uspešno nameščeni!"
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Namestitev gonilnikov je spodletela (koda napake %d)."
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr "Namestitev gonilnikov je spodletela."
 
-#. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1676
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr "Morate namestiti paket(e) %s."
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d točk na palec (privzeto)"
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d točk na palec (osnutek)"
 
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d točk na palec (visoka ločljivost)"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/ui.vala:1793
 #, c-format
 msgid "%d dpi"
 msgstr "%d točk na palec"
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1835
 msgid "New Document"
 msgstr "Nov dokument"
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1840
 msgid "Document"
 msgstr "Dokument"
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1844
 msgid "Email..."
 msgstr "E-pošta ..."
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1845
 msgid "Print..."
 msgstr "Natisni ..."
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1853
 msgid "Help"
 msgstr "Pomoč"
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1854
 msgid "About"
 msgstr "O programu"
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1855
 msgid "Quit"
 msgstr "Izhod"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "Spremeni _optični bralnik"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr "_Namesti gonilnike"
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1897
 msgid "Automatic"
 msgstr "Samodejno"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1947
 msgid "Darker"
 msgstr "Temenjše"
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1949
 msgid "Lighter"
 msgstr "Svetlejše"
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:1957
 msgid "Less"
 msgstr "Manj"
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:1959
 msgid "More"
 msgstr "Več"
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:1967
 msgid "Minimum"
 msgstr "Najmanj"
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:1969
 msgid "Maximum"
 msgstr "Največ"
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2008
 msgid "Saving document..."
 msgstr "Shranjevanje dokumenta ..."
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Shranjevanje strani %d od %d"
@@ -869,6 +714,9 @@ msgstr "Shranjevanje strani %d od %d"
 #~ msgid "TRUE if the application window is maximized"
 #~ msgstr "PRAV, če je okno programa razpeto"
 
+#~ msgid "SANE device to acquire images from."
+#~ msgstr "Naprava SANE za pridobivanje slik."
+
 #~ msgid "Window height in pixels"
 #~ msgstr "Višina okna v točkah"
 
@@ -895,14 +743,53 @@ msgstr "Shranjevanje strani %d od %d"
 #~ msgstr "Izberite _vrsto datoteke"
 
 #~ msgid ""
+#~ "The directory to save files to. Defaults to the documents directory if unset."
+#~ msgstr ""
+#~ "Mapa za shranjevanje datotek. Privzeto mapa dokumentov, če ni nastavljena."
+
+#~ msgid "Directory to save files to"
+#~ msgstr "Mapa za shranjevanje datotek"
+
+#~ msgid ""
+#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr ""
+#~ "Višina papirja v desetinkah milimetra (ali 0 za samodejno zaznavanje "
+#~ "papirja)."
+
+#~ msgid "Height of paper in tenths of a mm"
+#~ msgstr "Višina papirja v desetinkah milimetra"
+
+#~ msgid "Width of paper in tenths of a mm"
+#~ msgstr "Širina papirja v desetinkah milimetra"
+
+#~ msgid ""
+#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr ""
+#~ "Širina papirja v desetinkah milimetra (ali 0 za samodejno zaznavanje)."
+
+#~ msgid ""
 #~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
 #~ msgstr ""
 #~ "Stran strani za optično branje. Lahko je eno od naslednjega: 'obe' 'spredaj' "
 #~ "'zadaj'"
 
+#~ msgid "Page side to scan"
+#~ msgstr "Stran strani za optično branje"
+
 #~ msgid "Height of scanned image in pixels"
 #~ msgstr "Višina optično prebrane slike v točkah"
 
+#~ msgid "Resolution for photo scans"
+#~ msgstr "Ločljivost za optično branje fotografij"
+
+#~ msgid "Resolution for text scans"
+#~ msgstr "Ločljivost za optično branje besedil"
+
+#~ msgid "Device to scan from"
+#~ msgstr "Naprava za optično branje"
+
 #~ msgid "Direction of scan"
 #~ msgstr "Smer optičnega branja"
 
@@ -927,6 +814,15 @@ msgstr "Shranjevanje strani %d od %d"
 #~ msgid "The resolution in dots-per-inch of the previously scanned image."
 #~ msgstr "Ločljivost zadnjega optičnega branja v točkah na palec (dpi)"
 
+#~ msgid "The resolution in dots-per-inch to use when scanning text."
+#~ msgstr "Ločljivost optičnega branja besedil v točkah na palec (dpi)"
+
+#~ msgid "The resolution in dots-per-inch to use when scanning photos."
+#~ msgstr "Ločljivost optičnega branja fotografij v točkah na palec (dpi)"
+
+#~ msgid "Type of document being scanned"
+#~ msgstr "Vrsta optično branega dokumenta"
+
 #~ msgid ""
 #~ "Type of document being scanned. 'text' for text documents, 'photo' for "
 #~ "photos. This setting decides on the scan resolution, colors and post-"
@@ -980,5 +876,33 @@ msgstr "Shranjevanje strani %d od %d"
 #~ msgid "Please check your installation"
 #~ msgstr "Preverite svojo namestitev"
 
+#~ msgid "The page side to scan."
+#~ msgstr "Stran strani za optično branje."
+
+#~ msgid ""
+#~ "Type of document being scanned. This setting decides on the scan resolution, "
+#~ "colors and post-processing."
+#~ msgstr ""
+#~ "Vrsta dokumenta za optično branje. Ta nastavitev določi ločljivost tiskanja, "
+#~ "barve in poobdelovo."
+
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "Smer optičnega bralnika na optično brani strani."
+
+#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
+#~ msgstr "Prilagoditev kontrasta od -100 do 100 (0 kot brez)."
+
+#~ msgid "Contrast of scan"
+#~ msgstr "Kontrast optičnega branja"
+
+#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
+#~ msgstr "Prilagoditev svetlosti od -100 do 100 (0 kot brez)."
+
+#~ msgid "Brightness of scan"
+#~ msgstr "Svetlost optičnega branja"
+
+#~ msgid "Quality value to use for JPEG compression."
+#~ msgstr "Vrednost kakovosti za stiskanje JPEG."
+
+#~ msgid "Quality value to use for JPEG compression"
+#~ msgstr "Vrednost kakovosti za stiskanje JPEG"
diff --git a/po/sq.gmo b/po/sq.gmo
new file mode 100644
index 0000000..ddff748
--- /dev/null
+++ b/po/sq.gmo
diff --git a/po/sq.po b/po/sq.po
index 40d96cf..cc70e4d 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -7,405 +7,309 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-06 14:16+1200\n"
+"POT-Creation-Date: 2016-07-29 12:47+1200\n"
 "PO-Revision-Date: 2012-07-23 09:08+0000\n"
 "Last-Translator: Alket Rexhepi <alketii@gmail.com>\n"
 "Language-Team: Albanian <sq@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-04-14 05:39+0000\n"
-"X-Generator: Launchpad (build 17990)\n"
+"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 
 #. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:2
+#: data/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_Autorizo"
 
 #. Label beside username entry
-#: ../data/simple-scan.ui.h:4
+#: data/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "_Emri i përdoruesit për resursin:"
 
 #. Label beside password entry
-#: ../data/simple-scan.ui.h:6
+#: data/simple-scan.ui:117
 msgid "_Password:"
-msgstr "_Fjalëkalim:"
+msgstr "_Fjalëkalimi:"
 
 #. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:8
+#: data/simple-scan.ui:188
 msgid "Front and Back"
 msgstr "Para dhe Mbrapa"
 
 #. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:10
+#: data/simple-scan.ui:192
 msgid "Front"
 msgstr "Përball"
 
 #. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:12
+#: data/simple-scan.ui:196
 msgid "Back"
 msgstr "Mbrapa"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
-#: ../data/appdata/simple-scan.appdata.xml.in.h:1
+#: data/simple-scan.ui:225 data/simple-scan.ui:809
+#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr "Skanim i thjeshtë"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:16
+#: data/simple-scan.ui:241
 msgid "_Document"
 msgstr "_Dokumenti"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:18
+#: data/simple-scan.ui:260
 msgid "Sc_an"
 msgstr "Sk_anim"
 
+#. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:20
+#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
 msgid "Single _Page"
-msgstr "Faqe_e_vetme"
+msgstr "Faqe e _vetme"
 
+#. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:22
+#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr "Të Gjitha Faqet Nga _Ushqyesi"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:24
+#: data/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "_Ndalo Skanimin"
 
-#: ../data/simple-scan.ui.h:25
+#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
 msgid "Text"
 msgstr "Tekst"
 
-#: ../data/simple-scan.ui.h:26
+#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
 msgid "Photo"
 msgstr "Foto"
 
 #. Menu item to reorder pages
-#. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1183 ../src/ui.vala:1841
+#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
 msgid "Reorder Pages"
-msgstr ""
+msgstr "Riorganizo faqet"
 
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: data/simple-scan.ui:367
 msgid "_Email"
 msgstr "_Email"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: data/simple-scan.ui:430
 msgid "_Page"
 msgstr "_Faqe"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: data/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "Rrotullo _Majtas"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: data/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "Rrotullo _Djathtas"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: data/simple-scan.ui:460
 msgid "_Crop"
-msgstr "Preje"
+msgstr "_Prije"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: data/simple-scan.ui:470
 msgid "_None"
 msgstr "_Asnjë"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: data/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: data/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: data/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: data/simple-scan.ui:514
 msgid "_Letter"
-msgstr "_Shkronjë"
+msgstr "_Letër SHBA"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: data/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: data/simple-scan.ui:536
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: data/simple-scan.ui:547
 msgid "_Custom"
 msgstr "_Sipas përdoruesit"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: data/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr "_Prerje me Rrotullim"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: data/simple-scan.ui:578
 msgid "Move Left"
 msgstr "Lëvize Majtas"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: data/simple-scan.ui:587
 msgid "Move Right"
 msgstr "Lëvize Djathtas"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: data/simple-scan.ui:624
 msgid "_Help"
 msgstr "_Ndihmë"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: data/simple-scan.ui:632
 msgid "_Contents"
 msgstr "_Përmbajtje"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: data/simple-scan.ui:674 data/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "Filloje një dokument të ri"
 
-#: ../data/simple-scan.ui.h:67
+#: data/simple-scan.ui:675
 msgid "New"
 msgstr "I ri"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: data/simple-scan.ui:689 data/simple-scan.ui:836
 msgid "Scan a single page from the scanner"
 msgstr "Skanoje një faqe të thjeshtë prej skanerit"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: data/simple-scan.ui:691 data/simple-scan.ui:837
 msgid "Scan"
 msgstr "Skanim"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: data/simple-scan.ui:707 data/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "Ruaje dokumentin tek një fajll"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1842
+#: data/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "Ruaj"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: data/simple-scan.ui:724 data/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "Ndaloje skanimin e tanishëm"
 
-#: ../data/simple-scan.ui.h:77
+#: data/simple-scan.ui:725 data/simple-scan.ui:825
 msgid "Stop"
 msgstr "Ndalo"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: data/simple-scan.ui:749 data/simple-scan.ui:936
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Rrotulloje faqen majtas (kundër akrepave të orës)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: data/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "Rrotullo Majtas"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: data/simple-scan.ui:764 data/simple-scan.ui:914
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Rrotullo faqen në të djathtë"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: data/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "Rrotullo Djathtas"
 
-#: ../data/simple-scan.ui.h:86
+#: data/simple-scan.ui:779 data/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "Preje faqen e përzgjedhur"
 
-#: ../data/simple-scan.ui.h:87
+#: data/simple-scan.ui:781
 msgid "Crop"
 msgstr "Prej"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1849
+#: data/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "Parapëlqimet"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: data/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "Skanoje b_urimin"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: data/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "_Rezolucioni i Tekstit:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: data/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "_Rezolucioni i Fotos:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: data/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "Skanoje anën"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: data/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "Përmasa e Faqes:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: data/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "Ndriçimi:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: data/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "Kontrasti:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: data/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "Cilësia:"
 
-#: ../data/simple-scan.desktop.in.h:2
+#: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:3
+#: data/simple-scan.desktop.in:5
 msgid "Scan Documents"
 msgstr "Skanoj Dokumentet"
 
-#: ../data/simple-scan.desktop.in.h:4
+#: data/simple-scan.desktop.in:6
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Device to scan from"
-msgstr "Paisje për te skanuar prej"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "SANE device to acquire images from."
-msgstr "Pajisja SANE prej të cilës do merren imazhet."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "Type of document being scanned"
-msgstr "Lloji i dokumentit që do të skanohet"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
-msgid ""
-"Type of document being scanned. This setting decides on the scan resolution, "
-"colors and post-processing."
+#: data/simple-scan.desktop.in:8
+msgid "scanner"
 msgstr ""
-"Tipi i dokumentit që do të skanohet. Ky parametër vendos rezolucionin e "
-"skanimit, ngjyrat dhe pas përpunimin."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
-msgid "Width of paper in tenths of a mm"
-msgstr "Gjerësia e letrës në të dhjetat e mm"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-"Gjerësia e letrës në të dhjetat e mm (ose 0 për dallim automatik të letrës)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
-msgid "Height of paper in tenths of a mm"
-msgstr "Lartësia e letrës në dhjetat e një mm"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-"Lartësia e letrës në të dhjetat e mm (ose 0 për dallim automatik të letrës)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "Brightness of scan"
-msgstr "Ndriçimi i shkëlqimit"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "The brightness adjustment from -100 to 100 (0 being none)."
-msgstr "Rregullimi i ndriçimit nga -100 tek 100 (0 është asnjë)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid "Contrast of scan"
-msgstr "Kontrasti i skanimit"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "The contrast adjustment from -100 to 100 (0 being none)."
-msgstr "Rregullimi i kontrastit nga -100 tek 100 (0 është asnjë)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid "Resolution for text scans"
-msgstr "Rezulucion per skanimet e teksteve"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
-msgid "The resolution in dots-per-inch to use when scanning text."
-msgstr "Rezolucioni në pika për inç që do të përdoret kur skanohet tekst."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
-msgid "Resolution for photo scans"
-msgstr "Rezulucion për skanimet e fotove"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr "Rezolucioni në pika për inç që do të përdoret kur skanohen foto."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
-msgid "Page side to scan"
-msgstr "Anë e faqes për tu skanuar"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
-msgid "The page side to scan."
-msgstr "Ana e faqes që do të skanohet."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
-msgid "Directory to save files to"
-msgstr "Vend për ti ruajtur gjërat"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
-msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
-msgstr ""
-"Drejtoria ku do të ruhen skedarët. Parazgjedhja është drejtoria e "
-"dokumentëve nëse nuk zgjidhet ndonjë tjetër."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
-msgid "Quality value to use for JPEG compression"
-msgstr "Vlera e cilësisë që do të përdoret në ngjashjen e JPEG"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Quality value to use for JPEG compression."
-msgstr "Vlera e cilësisë që do të përdoret në ngjashjen e JPEG."
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+#: data/simple-scan.appdata.xml.in:8
 msgid ""
 "A really easy way to scan both documents and photos. You can crop out the "
 "bad parts of a photo and rotate it if it is the wrong way round. You can "
@@ -413,201 +317,167 @@ msgid ""
 "formats."
 msgstr ""
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+#: data/simple-scan.appdata.xml.in:13
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Nuk ka skanera të disponueshëm. Ju lutemi të lidhni një skaner."
 
-#. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "Nuk jemi në gjendje të lidhim një skaner"
 
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "Nuk munda të nis skanimin"
 
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1236 src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr "Gabim gjatë komunikimit me skanerin"
 
-#. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "Shfaq versionin e programit"
 
-#. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr "Printo mesazhet e gabimeve"
 
-#: ../src/simple-scan.vala:26
+#: src/simple-scan.vala:26
 msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr ""
 "Rregullo skedarët PDF të krijuar nga versione më të vjetra të Skanimit të "
 "Thjeshtë"
 
-#. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:391
+#: src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Skanimi dështoi"
 
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DEVICE...] - Mjet i skanimit"
 
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Nis '%s --ndihmë' për të parë një listë të plotë të linjave të disponueshme "
 "të komandës."
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:318 src/ui.vala:1602 src/ui.vala:1887
 msgid "_Close"
 msgstr "_Mbylle"
 
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:327
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Emri i përdoruesit dhe skanimi kërkohet për të hyrë në '%s'"
 
-#. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:375
 msgid "No scanners detected"
 msgstr "Nuk u dalluan skanera"
 
-#. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:377
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 "Ju lutemi të kontrolloni nëse skaneri juaj është i lidhur dhe i ndezur"
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:382
 msgid "Additional software needed"
 msgstr ""
 
-#. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr ""
 
-#. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:506 src/ui.vala:1843
 msgid "Save As..."
 msgstr "Ruaje Si..."
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:509 src/ui.vala:675
 msgid "_Cancel"
 msgstr "_Anullo"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:510 src/ui.vala:676
 msgid "_Save"
 msgstr "_Ruaje"
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "Dokumenti i Skanuar.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:521
 msgid "Image Files"
 msgstr "Kartela Pamje"
 
-#. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:527
 msgid "All Files"
 msgstr "Të Gjithë Skedarët"
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (dokument shumë faqësh)"
 
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (i ngjeshur)"
 
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (pa humbje)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:557
 msgid "File format:"
-msgstr ""
+msgstr "Formati i skedarit:"
 
-#. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:650
 msgid "Failed to save file"
 msgstr "Dështuam në ruajtjen e skedarit"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:673
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Nëse nuk  ruani, ndryshimet do të humbasin përgjithmonë."
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:708
+#: src/ui.vala:708
 msgid "Save current document?"
 msgstr "Ta ruaj dokumentin e tanishëm?"
 
-#. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:710
 msgid "Discard Changes"
 msgstr "Anullo Ndryshimet"
 
-#. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "Nuk jemi në gjendje ta ruajmë imazhin për parapamje"
 
-#. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "Nuk jam në gjendje të hap programin për parapamjen e imazhit"
 
-#. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1206
 msgid "Combine sides"
 msgstr ""
 
-#. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr ""
 
-#. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1226
 msgid "Reverse"
-msgstr ""
+msgstr "Mbrapsht"
 
-#. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1236
 msgid "Keep unchanged"
-msgstr ""
+msgstr "Mbaje të pandryshuar"
 
-#. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "E pamundur hapja e file të ndihmës"
 
-#. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1472
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -635,208 +505,184 @@ msgstr ""
 "Ju duhet të keni marrë një kopje të Liçensës së Përgjithshme Publike të GNU\n"
 "me këtë program. Nëse jo, shikoni <http://www.gnu.org/licenses/>."
 
-#. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "Rreth Skanimit të Thjeshtë"
 
-#. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "Mjet i thjeshtë për skanimin e dokumenteve"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Alket Rexhepi https://launchpad.net/~alketii\n"
 "  Gent Thaçi https://launchpad.net/~gentthaci\n"
+"  Indrit Bashkimi https://launchpad.net/~indritbsh\n"
 "  Vilson Gjeci https://launchpad.net/~vilsongjeci"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "Ta ruaj dokumentin para daljes?"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "Dil pa e ruajtur"
 
-#. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
-#. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1581
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
 msgstr ""
 
-#. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
-#. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1587
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
 msgstr ""
 
-#. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr ""
 
-#. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
-#. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1598
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
 msgstr ""
 
-#. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1602
 msgid "Install drivers"
 msgstr ""
 
-#. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
-#. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr ""
 
-#. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr ""
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr ""
 
-#. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1676
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr ""
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (e parazgjedhur)"
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (i thjeshtë)"
 
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (rezolucion i lartë)"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/ui.vala:1793
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1835
 msgid "New Document"
-msgstr ""
+msgstr "Dokument i ri"
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1840
 msgid "Document"
-msgstr ""
+msgstr "Dokument"
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1844
 msgid "Email..."
-msgstr ""
+msgstr "Email..."
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1845
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1853
 msgid "Help"
-msgstr ""
+msgstr "Ndihmë"
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1854
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1855
 msgid "Quit"
 msgstr ""
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "Ndrysho _Skanerin"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr ""
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1897
 msgid "Automatic"
 msgstr "Automatik"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1947
 msgid "Darker"
 msgstr "Më e Errët"
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1949
 msgid "Lighter"
 msgstr "Më e lehtë"
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:1957
 msgid "Less"
 msgstr "Më Pak"
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:1959
 msgid "More"
 msgstr "Më tepër"
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:1967
 msgid "Minimum"
 msgstr "Minimum"
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:1969
 msgid "Maximum"
 msgstr "Maksimum"
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2008
 msgid "Saving document..."
 msgstr "Ruajtje e dokumentit..."
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Ruajtja e faqes %d nga %d"
@@ -866,15 +712,36 @@ msgstr "Ruajtja e faqes %d nga %d"
 #~ msgid "4&#xD7;6"
 #~ msgstr "4&#xD7;6"
 
+#~ msgid "Height of paper in tenths of a mm"
+#~ msgstr "Lartësia e letrës në dhjetat e një mm"
+
+#~ msgid "Device to scan from"
+#~ msgstr "Paisje për te skanuar prej"
+
 #~ msgid "Direction of scan"
 #~ msgstr "Drjetim i skanimit"
 
+#~ msgid "Directory to save files to"
+#~ msgstr "Vend për ti ruajtur gjërat"
+
+#~ msgid "Page side to scan"
+#~ msgstr "Anë e faqes për tu skanuar"
+
 #~ msgid "Height of scanned image in pixels"
 #~ msgstr "Lartësia e figurës së skanuar në pixella"
 
+#~ msgid "Resolution for text scans"
+#~ msgstr "Rezulucion per skanimet e teksteve"
+
+#~ msgid "Resolution for photo scans"
+#~ msgstr "Rezulucion për skanimet e fotove"
+
 #~ msgid "Select File _Type"
 #~ msgstr "Zgjidh Llojin e _Skedarit"
 
+#~ msgid "Type of document being scanned"
+#~ msgstr "Lloji i dokumentit që do të skanohet"
+
 #~ msgid "Window height in pixels"
 #~ msgstr "Lartësia e dritares në piksel"
 
@@ -901,13 +768,25 @@ msgstr "Ruajtja e faqes %d nga %d"
 #~ msgid "TRUE if the application window is maximized"
 #~ msgstr "E VËRTETË nëse dritarja e programit është maksimizuar"
 
+#~ msgid "SANE device to acquire images from."
+#~ msgstr "Pajisja SANE prej të cilës do merren imazhet."
+
 #~ msgid "Resolution of last scanned image"
 #~ msgstr "Rezulucioni i imazhit të fundit të skanuar"
 
+#~ msgid "The page side to scan."
+#~ msgstr "Ana e faqes që do të skanohet."
+
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "Drejtimi i skanerit përmes faqes së skanuar."
 
 #~ msgid ""
+#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr ""
+#~ "Gjerësia e letrës në të dhjetat e mm (ose 0 për dallim automatik të letrës)."
+
+#~ msgid ""
 #~ "The width of scanned image in pixels. This value is updated to what the last "
 #~ "scanned page was."
 #~ msgstr ""
@@ -924,5 +803,51 @@ msgstr "Ruajtja e faqes %d nga %d"
 #~ msgid "The resolution in dots-per-inch of the previously scanned image."
 #~ msgstr "Rezolucioni në pika për inç i faqes së mëparshme të skanuar."
 
+#~ msgid "The resolution in dots-per-inch to use when scanning text."
+#~ msgstr "Rezolucioni në pika për inç që do të përdoret kur skanohet tekst."
+
+#~ msgid "The resolution in dots-per-inch to use when scanning photos."
+#~ msgstr "Rezolucioni në pika për inç që do të përdoret kur skanohen foto."
+
+#~ msgid ""
+#~ "The directory to save files to. Defaults to the documents directory if unset."
+#~ msgstr ""
+#~ "Drejtoria ku do të ruhen skedarët. Parazgjedhja është drejtoria e "
+#~ "dokumentëve nëse nuk zgjidhet ndonjë tjetër."
+
+#~ msgid ""
+#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr ""
+#~ "Lartësia e letrës në të dhjetat e mm (ose 0 për dallim automatik të letrës)."
+
+#~ msgid ""
+#~ "Type of document being scanned. This setting decides on the scan resolution, "
+#~ "colors and post-processing."
+#~ msgstr ""
+#~ "Tipi i dokumentit që do të skanohet. Ky parametër vendos rezolucionin e "
+#~ "skanimit, ngjyrat dhe pas përpunimin."
+
+#~ msgid "Width of paper in tenths of a mm"
+#~ msgstr "Gjerësia e letrës në të dhjetat e mm"
+
 #~ msgid "Width of scanned image in pixels"
 #~ msgstr "Gjerësia e imazhit të skanuar në pikselë"
+
+#~ msgid "Quality value to use for JPEG compression."
+#~ msgstr "Vlera e cilësisë që do të përdoret në ngjashjen e JPEG."
+
+#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
+#~ msgstr "Rregullimi i kontrastit nga -100 tek 100 (0 është asnjë)."
+
+#~ msgid "Contrast of scan"
+#~ msgstr "Kontrasti i skanimit"
+
+#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
+#~ msgstr "Rregullimi i ndriçimit nga -100 tek 100 (0 është asnjë)."
+
+#~ msgid "Brightness of scan"
+#~ msgstr "Ndriçimi i shkëlqimit"
+
+#~ msgid "Quality value to use for JPEG compression"
+#~ msgstr "Vlera e cilësisë që do të përdoret në ngjashjen e JPEG"
diff --git a/po/sr.gmo b/po/sr.gmo
new file mode 100644
index 0000000..2add200
--- /dev/null
+++ b/po/sr.gmo
diff --git a/po/sr.po b/po/sr.po
index d0a0f6d..444b5cf 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,412 +6,310 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-06 14:16+1200\n"
+"POT-Creation-Date: 2016-07-29 12:47+1200\n"
 "PO-Revision-Date: 2016-02-08 06:49+0000\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <gnom@prevod.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-04-14 05:40+0000\n"
-"X-Generator: Launchpad (build 17990)\n"
+"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 "Language: sr\n"
 
 #. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:2
+#: data/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_Овласти"
 
 #. Label beside username entry
-#: ../data/simple-scan.ui.h:4
+#: data/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "_Корисничко име за извор:"
 
 #. Label beside password entry
-#: ../data/simple-scan.ui.h:6
+#: data/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Лозинка:"
 
 #. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:8
+#: data/simple-scan.ui:188
 msgid "Front and Back"
 msgstr "Лице и позадина"
 
 #. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:10
+#: data/simple-scan.ui:192
 msgid "Front"
 msgstr "Лице"
 
 #. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:12
+#: data/simple-scan.ui:196
 msgid "Back"
 msgstr "Позадина"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
-#: ../data/appdata/simple-scan.appdata.xml.in.h:1
+#: data/simple-scan.ui:225 data/simple-scan.ui:809
+#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr "Обично скенирање"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:16
+#: data/simple-scan.ui:241
 msgid "_Document"
 msgstr "_Документ"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:18
+#: data/simple-scan.ui:260
 msgid "Sc_an"
 msgstr "С_кенирај"
 
+#. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:20
+#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
 msgid "Single _Page"
 msgstr "Једну _страницу"
 
+#. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:22
+#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr "Све странице из _фиоке"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:24
+#: data/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "_Заустави скенирање"
 
-#: ../data/simple-scan.ui.h:25
+#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
 msgid "Text"
 msgstr "Текст"
 
-#: ../data/simple-scan.ui.h:26
+#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
 msgid "Photo"
 msgstr "Слика"
 
 #. Menu item to reorder pages
-#. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1183 ../src/ui.vala:1841
+#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr "Промени ред страница"
 
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: data/simple-scan.ui:367
 msgid "_Email"
 msgstr "_Ел. пошта"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: data/simple-scan.ui:430
 msgid "_Page"
 msgstr "_Страница"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: data/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "Окрени на _лево"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: data/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "Окрени на _десно"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: data/simple-scan.ui:460
 msgid "_Crop"
 msgstr "_Опсеци"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: data/simple-scan.ui:470
 msgid "_None"
 msgstr "_Ништа"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: data/simple-scan.ui:481
 msgid "A_4"
 msgstr "А_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: data/simple-scan.ui:492
 msgid "A_5"
 msgstr "А_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: data/simple-scan.ui:503
 msgid "A_6"
 msgstr "А_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: data/simple-scan.ui:514
 msgid "_Letter"
 msgstr "_Америчко писмо"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: data/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "_Легал"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: data/simple-scan.ui:536
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: data/simple-scan.ui:547
 msgid "_Custom"
 msgstr "_Произвољно"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: data/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr "_Заокрени опсечено"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: data/simple-scan.ui:578
 msgid "Move Left"
 msgstr "Помери улево"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: data/simple-scan.ui:587
 msgid "Move Right"
 msgstr "Помери удесно"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: data/simple-scan.ui:624
 msgid "_Help"
 msgstr "По_моћ"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: data/simple-scan.ui:632
 msgid "_Contents"
 msgstr "_Садржај"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: data/simple-scan.ui:674 data/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "Покрените нови документ"
 
-#: ../data/simple-scan.ui.h:67
+#: data/simple-scan.ui:675
 msgid "New"
 msgstr "Ново"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: data/simple-scan.ui:689 data/simple-scan.ui:836
 msgid "Scan a single page from the scanner"
 msgstr "Скенирајте једну страницу са скенера"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: data/simple-scan.ui:691 data/simple-scan.ui:837
 msgid "Scan"
 msgstr "Скенирај"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: data/simple-scan.ui:707 data/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "Сачувајте документ у датотеку"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1842
+#: data/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "Сачувај"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: data/simple-scan.ui:724 data/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "Зауставите текуће скенирање"
 
-#: ../data/simple-scan.ui.h:77
+#: data/simple-scan.ui:725 data/simple-scan.ui:825
 msgid "Stop"
 msgstr "Заустави"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: data/simple-scan.ui:749 data/simple-scan.ui:936
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Окрените страницу на лево (супротно смеру казаљке на сату)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: data/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "Окрени на лево"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: data/simple-scan.ui:764 data/simple-scan.ui:914
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Окрените страницу на десно (у смеру казаљке на сату)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: data/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "Окрени на десно"
 
-#: ../data/simple-scan.ui.h:86
+#: data/simple-scan.ui:779 data/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "Одрежите изабрану страницу"
 
-#: ../data/simple-scan.ui.h:87
+#: data/simple-scan.ui:781
 msgid "Crop"
 msgstr "Одрежи"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1849
+#: data/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "Поставке"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: data/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "_Извор скенирања:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: data/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "Резолуција _текста:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: data/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "Резолуција _слике:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: data/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "Странице за скенирање:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: data/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "Величина странице:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: data/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "Осветљај:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: data/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "Контраст:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: data/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "Квалитет:"
 
-#: ../data/simple-scan.desktop.in.h:2
+#: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr "Скенер докумената"
 
-#: ../data/simple-scan.desktop.in.h:3
+#: data/simple-scan.desktop.in:5
 msgid "Scan Documents"
 msgstr "Скенирајте документе"
 
-#: ../data/simple-scan.desktop.in.h:4
+#: data/simple-scan.desktop.in:6
 msgid "scan;scanner;flatbed;adf;"
 msgstr "скенирај;скенер;flatbed;adf;"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Device to scan from"
-msgstr "Уређај са ког ће се скенирати"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "SANE device to acquire images from."
-msgstr "САНЕ уређај са ког ће се унети слике."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "Type of document being scanned"
-msgstr "Врста документа који ће бити скениран"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
-msgid ""
-"Type of document being scanned. This setting decides on the scan resolution, "
-"colors and post-processing."
-msgstr ""
-"Врста документа који ће бити скениран. Ово подешавање одлучује о резолуцији, "
-"бојама и завршној обради скенирања."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
-msgid "Width of paper in tenths of a mm"
-msgstr "Ширина папира у десетом делу милиметра"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
+#: data/simple-scan.desktop.in:8
+msgid "scanner"
 msgstr ""
-"Ширина папира у десетом делу милиметра (или 0 за самостално откривање "
-"папира)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
-msgid "Height of paper in tenths of a mm"
-msgstr "Висина папира у десетом делу милиметра"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-"Висина папира у десетом делу милиметра (или 0 за самостално откривање "
-"папира)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "Brightness of scan"
-msgstr "Осветљај скенирања"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "The brightness adjustment from -100 to 100 (0 being none)."
-msgstr "Дотеривање осветљаја од -100 до 100 (0 значи ништа)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid "Contrast of scan"
-msgstr "Контраст скенирања"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "The contrast adjustment from -100 to 100 (0 being none)."
-msgstr "Дотеривање контраста од -100 до 100 (0 значи ништа)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid "Resolution for text scans"
-msgstr "Резолуција за скенирања текста"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
-msgid "The resolution in dots-per-inch to use when scanning text."
-msgstr ""
-"Резолуција у тачкама-по-палцу (dpi) која ће бити коришћена при скенирању "
-"текста."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
-msgid "Resolution for photo scans"
-msgstr "Резолуција за скенирања слика"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr ""
-"Резолуција у тачкама-по-палцу (dpi) која ће бити коришћена при скенирању "
-"фотографија."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
-msgid "Page side to scan"
-msgstr "Страна странице за скенирање"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
-msgid "The page side to scan."
-msgstr "Страна странице за скенирање."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
-msgid "Directory to save files to"
-msgstr "Директоријум за чување датотека"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
-msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
-msgstr ""
-"Директоријум у коме ће бити сачуване датотеке. Ако није постављено онда је "
-"то основни директоријум докумената."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
-msgid "Quality value to use for JPEG compression"
-msgstr "Вредност квалитета за ЈПЕГ сажимање"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Quality value to use for JPEG compression."
-msgstr "Вредност квалитета која ће се користити за ЈПЕГ сажимање."
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+#: data/simple-scan.appdata.xml.in:8
 msgid ""
 "A really easy way to scan both documents and photos. You can crop out the "
 "bad parts of a photo and rotate it if it is the wrong way round. You can "
@@ -422,200 +320,166 @@ msgstr ""
 "делове слика и окренути скенирано. Можете штампати скенирано, одрадити извоз "
 "у ПДФ или сачувати скенирано у један од мноштва подржаних формата слика."
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+#: data/simple-scan.appdata.xml.in:13
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 "Обично скенирање користи САНЕ радни оквир да би додатно подржао већину "
 "тренутних скенера."
 
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Нема доступних скенера.  Прикључите скенер."
 
-#. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "Не могу да се повежем са скенером"
 
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "Не могу да започнем скенирање"
 
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1236 src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr "Грешка у коминикацији са скенером"
 
-#. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "Приказује издање програма"
 
-#. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr "Исписује поруке за отклањање грешака"
 
-#: ../src/simple-scan.vala:26
+#: src/simple-scan.vala:26
 msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr ""
 "Поправља ПДФ датотеке створене старијим издањима Једноставног скенирања"
 
-#. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:391
+#: src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Нисам успео да скенирам"
 
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[УРЕЂАЈ...] — алатка за скенирање"
 
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Покрените „%s --help“ за потпуни списак свих опција из командне линије."
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:318 src/ui.vala:1602 src/ui.vala:1887
 msgid "_Close"
 msgstr "_Затвори"
 
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:327
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Корисничко име и лозинка су обавезни за приступ „%s“"
 
-#. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:375
 msgid "No scanners detected"
 msgstr "Нема откривених скенера"
 
-#. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:377
 msgid "Please check your scanner is connected and powered on"
 msgstr "Проверите да ли је скенер повезан и укључен"
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:382
 msgid "Additional software needed"
 msgstr "Потребан је додатни софтвер"
 
-#. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr "Морате да инсталирате управљачке програме за ваш скенер."
 
-#. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:506 src/ui.vala:1843
 msgid "Save As..."
 msgstr "Сачувај као..."
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:509 src/ui.vala:675
 msgid "_Cancel"
 msgstr "_Откажи"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:510 src/ui.vala:676
 msgid "_Save"
 msgstr "_Сачувај"
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "Скенирани документ.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:521
 msgid "Image Files"
 msgstr "Датотеке слика"
 
-#. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:527
 msgid "All Files"
 msgstr "Све датотеке"
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "ПДФ (документ са више страна)"
 
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "ЈПЕГ (сажето)"
 
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "ПНГ (без губитака)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:557
 msgid "File format:"
 msgstr "Запис датотеке:"
 
-#. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:650
 msgid "Failed to save file"
 msgstr "Нисам успео да сачувам датотеку"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:673
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Уколико не сачувате, измене ће бити трајно изгубљене."
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:708
+#: src/ui.vala:708
 msgid "Save current document?"
 msgstr "Да сачувам текући документ?"
 
-#. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:710
 msgid "Discard Changes"
 msgstr "Одбаци измене"
 
-#. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "Не могу да сачувам слику за преглед"
 
-#. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "Не могу да отворим програм за приказивање слика"
 
-#. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1206
 msgid "Combine sides"
 msgstr "Обједини стране"
 
-#. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr "Обједини стране (преокрени)"
 
-#. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1226
 msgid "Reverse"
 msgstr "Преокрени"
 
-#. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr "Задржи неизмењено"
 
-#. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "Не могу да отворим датотеку помоћи"
 
-#. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1472
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -644,17 +508,15 @@ msgstr ""
 "уз овај програм. Ако нисте, погледајте:\n"
 "http://www.gnu.org/licenses/."
 
-#. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "О Једноставном скенирању"
 
-#. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "Једноставна алатка за скенирање докумената"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -665,23 +527,19 @@ msgstr ""
 "  Марко М. Костић https://launchpad.net/~marko-m-kostic\n"
 "  Мирослав Николић https://launchpad.net/~lipek"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "Да сачувам документ пре него што изађем?"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "Изађи без чувања"
 
-#. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr "Изгледа да имате Бродеров скенер."
 
-#. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1581
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
@@ -689,13 +547,11 @@ msgstr ""
 "Управљачки програми су доступни на <a "
 "href=\"http://support.brother.com\">веб сајту Бродера</a>."
 
-#. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr "Изгледа да имате Самсунгов скенер."
 
-#. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1587
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
@@ -703,18 +559,15 @@ msgstr ""
 "Управљачки програми су доступни на <a "
 "href=\"http://samsung.com/support\">веб сајту Самсунга</a>."
 
-#. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr "Изгледа да имате Хевлет-Пакардов скенер."
 
-#. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr "Изгледа да имате Епсонов скенер."
 
-#. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1598
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
@@ -722,140 +575,126 @@ msgstr ""
 "Управљачки програми су доступни на <a href=\"http://support.epson.com\">веб "
 "сајту Епсона</a>."
 
-#. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1602
 msgid "Install drivers"
 msgstr "Инсталација управљачких програма"
 
-#. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 "Након инсталације мораћете поново да покренете Једноставно скенирање."
 
-#. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr "Инсталирам управљачке програме..."
 
-#. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr "Управљачки програми су успешно инсталирани!"
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Нисам успео да инсталирам управљачке програме (грешка %d)."
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr "Нисам успео да инсталирам управљачке програме."
 
-#. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1676
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr "Треба да инсталирате пакет „%s“."
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d тпи (основно)"
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d тпи (нацрт)"
 
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d тпи (висока резолуција)"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/ui.vala:1793
 #, c-format
 msgid "%d dpi"
 msgstr "%d тпи"
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1835
 msgid "New Document"
 msgstr "Нови документ"
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1840
 msgid "Document"
 msgstr "Документ"
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1844
 msgid "Email..."
 msgstr "Ел. пошта..."
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1845
 msgid "Print..."
 msgstr "Штампај..."
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1853
 msgid "Help"
 msgstr "Помоћ"
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1854
 msgid "About"
 msgstr "О програму"
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1855
 msgid "Quit"
 msgstr "Изађи"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "Промени _скенер"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr "_Инсталирај управљачке програме"
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1897
 msgid "Automatic"
 msgstr "Самостално"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1947
 msgid "Darker"
 msgstr "Тамније"
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1949
 msgid "Lighter"
 msgstr "Светлије"
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:1957
 msgid "Less"
 msgstr "Мањи"
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:1959
 msgid "More"
 msgstr "Већи"
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:1967
 msgid "Minimum"
 msgstr "Најнижи"
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:1969
 msgid "Maximum"
 msgstr "Највиши"
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2008
 msgid "Saving document..."
 msgstr "Чувам документ..."
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Чувам %d. страницу од укупно %d"
@@ -878,9 +717,24 @@ msgstr "Чувам %d. страницу од укупно %d"
 #~ msgid "The resolution in dots-per-inch of the previously scanned image."
 #~ msgstr "Резолуција у тачкама-по-инчу (dpi) претходно скениране слике."
 
+#~ msgid "Resolution for photo scans"
+#~ msgstr "Резолуција за скенирања слика"
+
+#~ msgid "Resolution for text scans"
+#~ msgstr "Резолуција за скенирања текста"
+
+#~ msgid "Directory to save files to"
+#~ msgstr "Директоријум за чување датотека"
+
 #~ msgid "Scanned Document"
 #~ msgstr "Скенирани документ"
 
+#~ msgid "Page side to scan"
+#~ msgstr "Страна странице за скенирање"
+
+#~ msgid "Height of paper in tenths of a mm"
+#~ msgstr "Висина папира у десетом делу милиметра"
+
 #~ msgid "Height of scanned image in pixels"
 #~ msgstr "Висина скениране слике у тачкама"
 
@@ -890,6 +744,28 @@ msgstr "Чувам %d. страницу од укупно %d"
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "Усмерење скенера преко скениране странице."
 
+#~ msgid ""
+#~ "The directory to save files to. Defaults to the documents directory if unset."
+#~ msgstr ""
+#~ "Директоријум у коме ће бити сачуване датотеке. Ако није постављено онда је "
+#~ "то основни директоријум докумената."
+
+#~ msgid "The page side to scan."
+#~ msgstr "Страна странице за скенирање."
+
+#~ msgid "Type of document being scanned"
+#~ msgstr "Врста документа који ће бити скениран"
+
+#~ msgid ""
+#~ "Type of document being scanned. This setting decides on the scan resolution, "
+#~ "colors and post-processing."
+#~ msgstr ""
+#~ "Врста документа који ће бити скениран. Ово подешавање одлучује о резолуцији, "
+#~ "бојама и завршној обради скенирања."
+
+#~ msgid "Width of paper in tenths of a mm"
+#~ msgstr "Ширина папира у десетом делу милиметра"
+
 #~ msgid "Width of scanned image in pixels"
 #~ msgstr "Ширина скениране слике у тачкама"
 
@@ -982,5 +858,53 @@ msgstr "Чувам %d. страницу од укупно %d"
 #~ "Висина скениране слике у тачкама. Ова вредност се аутоматски поставља на "
 #~ "величину последње скениране странице."
 
+#~ msgid "Device to scan from"
+#~ msgstr "Уређај са ког ће се скенирати"
+
+#~ msgid "SANE device to acquire images from."
+#~ msgstr "САНЕ уређај са ког ће се унети слике."
+
+#~ msgid ""
+#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr ""
+#~ "Ширина папира у десетом делу милиметра (или 0 за самостално откривање "
+#~ "папира)."
+
+#~ msgid ""
+#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr ""
+#~ "Висина папира у десетом делу милиметра (или 0 за самостално откривање "
+#~ "папира)."
+
+#~ msgid "Brightness of scan"
+#~ msgstr "Осветљај скенирања"
+
+#~ msgid "Contrast of scan"
+#~ msgstr "Контраст скенирања"
+
+#~ msgid "Quality value to use for JPEG compression"
+#~ msgstr "Вредност квалитета за ЈПЕГ сажимање"
+
+#~ msgid "Quality value to use for JPEG compression."
+#~ msgstr "Вредност квалитета која ће се користити за ЈПЕГ сажимање."
+
 #~ msgid "Select File _Type"
 #~ msgstr "_Изабери врсту датотеке"
+
+#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
+#~ msgstr "Дотеривање осветљаја од -100 до 100 (0 значи ништа)."
+
+#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
+#~ msgstr "Дотеривање контраста од -100 до 100 (0 значи ништа)."
+
+#~ msgid "The resolution in dots-per-inch to use when scanning text."
+#~ msgstr ""
+#~ "Резолуција у тачкама-по-палцу (dpi) која ће бити коришћена при скенирању "
+#~ "текста."
+
+#~ msgid "The resolution in dots-per-inch to use when scanning photos."
+#~ msgstr ""
+#~ "Резолуција у тачкама-по-палцу (dpi) која ће бити коришћена при скенирању "
+#~ "фотографија."
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..3e900cf
--- /dev/null
+++ b/po/sv.gmo
diff --git a/po/sv.po b/po/sv.po
index 14608b0..de339ce 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,407 +7,309 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-06 14:16+1200\n"
+"POT-Creation-Date: 2016-07-29 12:47+1200\n"
 "PO-Revision-Date: 2015-08-25 06:00+0000\n"
 "Last-Translator: Daniel Nylander <yeager@ubuntu.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-04-14 05:40+0000\n"
-"X-Generator: Launchpad (build 17990)\n"
+"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 
 #. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:2
+#: data/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "A_uktorisera"
 
 #. Label beside username entry
-#: ../data/simple-scan.ui.h:4
+#: data/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "_Användarnamn för källa:"
 
 #. Label beside password entry
-#: ../data/simple-scan.ui.h:6
+#: data/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Lösenord:"
 
 #. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:8
+#: data/simple-scan.ui:188
 msgid "Front and Back"
 msgstr "Fram- och baksida"
 
 #. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:10
+#: data/simple-scan.ui:192
 msgid "Front"
 msgstr "Framsida"
 
 #. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:12
+#: data/simple-scan.ui:196
 msgid "Back"
 msgstr "Baksida"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
-#: ../data/appdata/simple-scan.appdata.xml.in.h:1
+#: data/simple-scan.ui:225 data/simple-scan.ui:809
+#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr "Enkel bildinläsning"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:16
+#: data/simple-scan.ui:241
 msgid "_Document"
 msgstr "_Dokument"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:18
+#: data/simple-scan.ui:260
 msgid "Sc_an"
 msgstr "Läs _in"
 
+#. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:20
+#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
 msgid "Single _Page"
 msgstr "Enkel _sida"
 
+#. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:22
+#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr "Alla sidor från _matare"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:24
+#: data/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "_Stoppa inläsning"
 
-#: ../data/simple-scan.ui.h:25
+#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
 msgid "Text"
 msgstr "Text"
 
-#: ../data/simple-scan.ui.h:26
+#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
 msgid "Photo"
 msgstr "Foto"
 
 #. Menu item to reorder pages
-#. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1183 ../src/ui.vala:1841
+#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr "Ändra sidordning"
 
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: data/simple-scan.ui:367
 msgid "_Email"
 msgstr "_E-post"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: data/simple-scan.ui:430
 msgid "_Page"
 msgstr "_Sida"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: data/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "Rotera åt _vänster"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: data/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "Rotera åt _höger"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: data/simple-scan.ui:460
 msgid "_Crop"
 msgstr "_Beskär"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: data/simple-scan.ui:470
 msgid "_None"
 msgstr "_Ingen"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: data/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: data/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: data/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: data/simple-scan.ui:514
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: data/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: data/simple-scan.ui:536
 msgid "4×6"
 msgstr "4x6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: data/simple-scan.ui:547
 msgid "_Custom"
 msgstr "An_passad"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: data/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr "_Rotera beskär"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: data/simple-scan.ui:578
 msgid "Move Left"
 msgstr "Flytta åt vänster"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: data/simple-scan.ui:587
 msgid "Move Right"
 msgstr "Flytta åt höger"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: data/simple-scan.ui:624
 msgid "_Help"
 msgstr "_Hjälp"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: data/simple-scan.ui:632
 msgid "_Contents"
 msgstr "_Innehåll"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: data/simple-scan.ui:674 data/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "Starta ett nytt dokument"
 
-#: ../data/simple-scan.ui.h:67
+#: data/simple-scan.ui:675
 msgid "New"
 msgstr "Nytt"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: data/simple-scan.ui:689 data/simple-scan.ui:836
 msgid "Scan a single page from the scanner"
 msgstr "Läs in en enstaka sida från bildläsaren"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: data/simple-scan.ui:691 data/simple-scan.ui:837
 msgid "Scan"
 msgstr "Läs in"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: data/simple-scan.ui:707 data/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "Spara dokument till en fil"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1842
+#: data/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "Spara"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: data/simple-scan.ui:724 data/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "Stoppa den aktuella bildinläsningen"
 
-#: ../data/simple-scan.ui.h:77
+#: data/simple-scan.ui:725 data/simple-scan.ui:825
 msgid "Stop"
 msgstr "Stoppa"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: data/simple-scan.ui:749 data/simple-scan.ui:936
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Rotera sidan åt vänster (motsols)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: data/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "Rotera åt vänster"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: data/simple-scan.ui:764 data/simple-scan.ui:914
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Rotera sidan åt höger (medsols)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: data/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "Rotera åt höger"
 
-#: ../data/simple-scan.ui.h:86
+#: data/simple-scan.ui:779 data/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "Beskär den valda sidan"
 
-#: ../data/simple-scan.ui.h:87
+#: data/simple-scan.ui:781
 msgid "Crop"
 msgstr "Beskär"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1849
+#: data/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "Inställningar"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: data/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "Inläsnings_källa:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: data/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "_Textupplösning:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: data/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "_Fotoupplösning:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: data/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "Inläsningssida:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: data/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "Sidstorlek:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: data/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "Ljusstyrka:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: data/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "Kontrast:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: data/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "Kvalitet:"
 
-#: ../data/simple-scan.desktop.in.h:2
+#: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr "Dokumentskanner"
 
-#: ../data/simple-scan.desktop.in.h:3
+#: data/simple-scan.desktop.in:5
 msgid "Scan Documents"
 msgstr "Läs in dokument"
 
-#: ../data/simple-scan.desktop.in.h:4
+#: data/simple-scan.desktop.in:6
 msgid "scan;scanner;flatbed;adf;"
 msgstr "scan;scanner;flatbädd;adf;skan;skanner;"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Device to scan from"
-msgstr "Enhet att läsa in från"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "SANE device to acquire images from."
-msgstr "SANE-enhet att hämta in bilder från."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "Type of document being scanned"
-msgstr "Typ av dokument som ska läsas in"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
-msgid ""
-"Type of document being scanned. This setting decides on the scan resolution, "
-"colors and post-processing."
+#: data/simple-scan.desktop.in:8
+msgid "scanner"
 msgstr ""
-"Typ av dokument att läsa in. Denna inställning bestämmer inläsningens "
-"upplösning, färger och efterbehandling."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
-msgid "Width of paper in tenths of a mm"
-msgstr "Bredd på pappret i tiondels millimeter"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-"Bredd på pappret i tiondels millimeter (eller 0 för automatisk "
-"pappersidentifiering)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
-msgid "Height of paper in tenths of a mm"
-msgstr "Höjd på pappret i tiondels millimeter"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-"Höjd på pappret i tiondels millimeter (eller 0 för automatisk "
-"pappersidentifiering)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "Brightness of scan"
-msgstr "Ljusstyrka i skanningen"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "The brightness adjustment from -100 to 100 (0 being none)."
-msgstr "Instöllningen av ljusstyrkan från -100 till 100 (0 betyder ingen)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid "Contrast of scan"
-msgstr "Kontrasten på skanningen"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "The contrast adjustment from -100 to 100 (0 being none)."
-msgstr "Inställningen av kontrast från -100 till 100 (0 betyder ingen)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid "Resolution for text scans"
-msgstr "Upplösning för textinläsningar"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
-msgid "The resolution in dots-per-inch to use when scanning text."
-msgstr "Upplösning i punkter per tum att använda när text läses in."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
-msgid "Resolution for photo scans"
-msgstr "Upplösning för fotoinläsningar"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr "Upplösningen i punkter per tum att använda när foton läses in."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
-msgid "Page side to scan"
-msgstr "Sida att läsa in"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
-msgid "The page side to scan."
-msgstr "Papprets sida att läsa in."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
-msgid "Directory to save files to"
-msgstr "Katalog att spara filer i"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
-msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
-msgstr ""
-"Katalogen att spara filer i. Standardvärdet är dokumentkatalogen om den inte "
-"är inställd."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
-msgid "Quality value to use for JPEG compression"
-msgstr "Kvalitets värde i JPEG kompression"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Quality value to use for JPEG compression."
-msgstr "Kvalitets värde i JPEG kompression"
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+#: data/simple-scan.appdata.xml.in:8
 msgid ""
 "A really easy way to scan both documents and photos. You can crop out the "
 "bad parts of a photo and rotate it if it is the wrong way round. You can "
@@ -419,200 +321,166 @@ msgstr ""
 "skriva ut det du skannat in, exportera till pdf, eller spara dem i ett brett "
 "utbud av bildformat."
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+#: data/simple-scan.appdata.xml.in:13
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 "Simple Scan använder ramverket SANE för att hantera de flesta skannrar som "
 "finns på marknaden."
 
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Inga bildläsare finns tillgängliga. Anslut en bildläsare."
 
-#. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "Kan inte ansluta till bildläsare"
 
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "Kan inte starta inläsning"
 
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1236 src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr "Fel i kommunikation med bildläsare"
 
-#. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "Visa utgåvans version"
 
-#. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr "Skriv ut felsökningsmeddelanden"
 
-#: ../src/simple-scan.vala:26
+#: src/simple-scan.vala:26
 msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr "Laga PDF-filer som skapades med äldre versioner av Simple Scan"
 
-#. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:391
+#: src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Misslyckades med att läsa in"
 
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[ENHET...] - Bildinläsningsverktyg"
 
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Kör \"%s --help\" för en komplett lista över tillgängliga "
 "kommandoradsflaggor."
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:318 src/ui.vala:1602 src/ui.vala:1887
 msgid "_Close"
 msgstr "_Stäng"
 
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:327
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Användarnamn och lösenord krävs för åtkomst till \"%s\""
 
-#. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:375
 msgid "No scanners detected"
 msgstr "Inga bildinläsare hittades"
 
-#. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:377
 msgid "Please check your scanner is connected and powered on"
 msgstr "Kontrollera att din bildläsare är ansluten och påslagen"
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:382
 msgid "Additional software needed"
 msgstr "Ytterligare programvara behövs"
 
-#. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr "Du behöver installera drivrutiner för din skanner."
 
-#. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:506 src/ui.vala:1843
 msgid "Save As..."
 msgstr "Spara som..."
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:509 src/ui.vala:675
 msgid "_Cancel"
 msgstr "_Avbryt"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:510 src/ui.vala:676
 msgid "_Save"
 msgstr "_Spara"
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "Inläst dokument.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:521
 msgid "Image Files"
 msgstr "Bildfiler"
 
-#. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:527
 msgid "All Files"
 msgstr "Alla filer"
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (flersidigt dokument)"
 
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (komprimerad)"
 
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (förlustfri)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:557
 msgid "File format:"
 msgstr "Filformat:"
 
-#. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:650
 msgid "Failed to save file"
 msgstr "Misslyckades med att spara filen"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:673
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Om du inte sparar så kommer ändringarna att gå förlorade."
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:708
+#: src/ui.vala:708
 msgid "Save current document?"
 msgstr "Spara aktuellt dokument?"
 
-#. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:710
 msgid "Discard Changes"
 msgstr "Förkasta ändringar"
 
-#. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "Kunde inte spara bild för förhandsvisning"
 
-#. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "Kunde inte öppna förhandsvisningsprogrammet för bilder"
 
-#. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1206
 msgid "Combine sides"
 msgstr "Kombinera sidor"
 
-#. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr "Kombinera sidor (omvänt)"
 
-#. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1226
 msgid "Reverse"
 msgstr "Omvänt"
 
-#. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr "Behåll oförändrad"
 
-#. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "Kunde inte öppna hjälpfilen"
 
-#. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1472
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -641,17 +509,15 @@ msgstr ""
 "Du bör ha fått en kopia av GNU General Public License tillsammans\n"
 "med detta program. Om inte, se <http://www.gnu.org/licenses/>."
 
-#. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "Om Enkel bildinläsning"
 
-#. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "Enkelt verktyg för inläsning av dokument"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -668,23 +534,19 @@ msgstr ""
 "  Teodor Jönsson https://launchpad.net/~teodor-jonsson-sogeti-"
 "deactivatedaccount"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "Spara dokumment innan du avslutar?"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "Avsluta utan att spara"
 
-#. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr "Du verkar ha en skanner från Brother."
 
-#. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1581
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
@@ -692,13 +554,11 @@ msgstr ""
 "Drivrutinerna finns på <a href=\"http://support.brother.com\">Brothers "
 "webbplats</a>."
 
-#. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr "Du verkar ha en skanner från Samsung."
 
-#. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1587
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
@@ -706,18 +566,15 @@ msgstr ""
 "Drivrutinerna finns på <a href=\"http://samsung.com/support\">Samsungs "
 "webbplats</a>."
 
-#. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr "Du verkar ha en skanner från HP."
 
-#. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr "Du verkar ha en skanner från Epson."
 
-#. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1598
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
@@ -725,139 +582,125 @@ msgstr ""
 "Drivrutiner är tillgängliga på <a href=\"http://support.epson.com\">Epsons "
 "webbplats</a>."
 
-#. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1602
 msgid "Install drivers"
 msgstr "Installera drivrutiner"
 
-#. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "Efter installation kan du behöva starta om Simple Scan."
 
-#. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr "Installerar drivrutiner..."
 
-#. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr "Drivrutinerna installerades!"
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Kunde inte installera drivrutiner (felkod %d)."
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr "Kunde inte installera drivrutiner."
 
-#. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1676
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr "Du behöver installera paket(en) %s."
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (standard)"
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (utkast)"
 
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (hög upplösning)"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/ui.vala:1793
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1835
 msgid "New Document"
 msgstr "Nytt dokument"
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1840
 msgid "Document"
 msgstr "Dokument"
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1844
 msgid "Email..."
 msgstr "E-post..."
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1845
 msgid "Print..."
 msgstr "Skriv ut..."
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1853
 msgid "Help"
 msgstr "Hjälp"
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1854
 msgid "About"
 msgstr "Om"
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1855
 msgid "Quit"
 msgstr "Avsluta"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "Byt _bildinläsare"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr "_Installera drivrutiner"
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1897
 msgid "Automatic"
 msgstr "Automatiskt"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1947
 msgid "Darker"
 msgstr "Mörkare"
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1949
 msgid "Lighter"
 msgstr "Ljusare"
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:1957
 msgid "Less"
 msgstr "Mindre"
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:1959
 msgid "More"
 msgstr "Mer"
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:1967
 msgid "Minimum"
 msgstr "Minimum"
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:1969
 msgid "Maximum"
 msgstr "Maximum"
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2008
 msgid "Saving document..."
 msgstr "Sparar dokument..."
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Sparar sida %d av %d"
@@ -865,6 +708,9 @@ msgstr "Sparar sida %d av %d"
 #~ msgid "4&#xD7;6"
 #~ msgstr "4&#xD7;6"
 
+#~ msgid "Device to scan from"
+#~ msgstr "Enhet att läsa in från"
+
 #~ msgid "Direction of scan"
 #~ msgstr "Riktning för inläsning"
 
@@ -885,6 +731,15 @@ msgstr "Sparar sida %d av %d"
 #~ msgid "Height of scanned image in pixels"
 #~ msgstr "Höjd för den inlästa bilden i bildpunkter"
 
+#~ msgid "SANE device to acquire images from."
+#~ msgstr "SANE-enhet att hämta in bilder från."
+
+#~ msgid "Resolution for text scans"
+#~ msgstr "Upplösning för textinläsningar"
+
+#~ msgid "Resolution for photo scans"
+#~ msgstr "Upplösning för fotoinläsningar"
+
 #~ msgid "Resolution of last scanned image"
 #~ msgstr "Upplösning för senaste inlästa bild"
 
@@ -941,6 +796,9 @@ msgstr "Sparar sida %d av %d"
 #~ "  --gtk-module=MODULER            Läs in ytterligare GTK+-moduler\n"
 #~ "  --g-fatal-warnings              Gör alla varningar ödesdigra"
 
+#~ msgid "Type of document being scanned"
+#~ msgstr "Typ av dokument som ska läsas in"
+
 #~ msgid "Scanned Document"
 #~ msgstr "Inläst dokument"
 
@@ -962,6 +820,21 @@ msgstr "Sparar sida %d av %d"
 #~ msgid "The resolution in dots-per-inch of the previously scanned image."
 #~ msgstr "Upplösningen i punkter per tum för den föregående inlästa bilden."
 
+#~ msgid "The resolution in dots-per-inch to use when scanning text."
+#~ msgstr "Upplösning i punkter per tum att använda när text läses in."
+
+#~ msgid "The resolution in dots-per-inch to use when scanning photos."
+#~ msgstr "Upplösningen i punkter per tum att använda när foton läses in."
+
+#~ msgid ""
+#~ "The directory to save files to. Defaults to the documents directory if unset."
+#~ msgstr ""
+#~ "Katalogen att spara filer i. Standardvärdet är dokumentkatalogen om den inte "
+#~ "är inställd."
+
+#~ msgid "Directory to save files to"
+#~ msgstr "Katalog att spara filer i"
+
 #~ msgid ""
 #~ "The width of scanned image in pixels. This value is updated to what the last "
 #~ "scanned page was."
@@ -983,5 +856,56 @@ msgstr "Sparar sida %d av %d"
 #~ msgstr ""
 #~ "Sidan att läsa in. Det kan vara en av följande: \"both\" \"front\" \"back\""
 
+#~ msgid "Page side to scan"
+#~ msgstr "Sida att läsa in"
+
+#~ msgid ""
+#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr ""
+#~ "Höjd på pappret i tiondels millimeter (eller 0 för automatisk "
+#~ "pappersidentifiering)."
+
+#~ msgid "Height of paper in tenths of a mm"
+#~ msgstr "Höjd på pappret i tiondels millimeter"
+
+#~ msgid ""
+#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr ""
+#~ "Bredd på pappret i tiondels millimeter (eller 0 för automatisk "
+#~ "pappersidentifiering)."
+
+#~ msgid "Width of paper in tenths of a mm"
+#~ msgstr "Bredd på pappret i tiondels millimeter"
+
+#~ msgid "The page side to scan."
+#~ msgstr "Papprets sida att läsa in."
+
+#~ msgid ""
+#~ "Type of document being scanned. This setting decides on the scan resolution, "
+#~ "colors and post-processing."
+#~ msgstr ""
+#~ "Typ av dokument att läsa in. Denna inställning bestämmer inläsningens "
+#~ "upplösning, färger och efterbehandling."
+
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "Riktningen för bildläsaren över den inlästa sidan."
+
+#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
+#~ msgstr "Inställningen av kontrast från -100 till 100 (0 betyder ingen)."
+
+#~ msgid "Contrast of scan"
+#~ msgstr "Kontrasten på skanningen"
+
+#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
+#~ msgstr "Instöllningen av ljusstyrkan från -100 till 100 (0 betyder ingen)."
+
+#~ msgid "Brightness of scan"
+#~ msgstr "Ljusstyrka i skanningen"
+
+#~ msgid "Quality value to use for JPEG compression."
+#~ msgstr "Kvalitets värde i JPEG kompression"
+
+#~ msgid "Quality value to use for JPEG compression"
+#~ msgstr "Kvalitets värde i JPEG kompression"
diff --git a/po/ta.gmo b/po/ta.gmo
new file mode 100644
index 0000000..79fcccf
--- /dev/null
+++ b/po/ta.gmo
diff --git a/po/ta.po b/po/ta.po
index 3ec3dc0..202eedc 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -7,399 +7,309 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-06 14:16+1200\n"
+"POT-Creation-Date: 2016-07-29 12:47+1200\n"
 "PO-Revision-Date: 2014-03-22 13:36+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Tamil <ta@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-04-14 05:40+0000\n"
-"X-Generator: Launchpad (build 17990)\n"
+"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 
 #. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:2
+#: data/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_அனுமதியளி"
 
 #. Label beside username entry
-#: ../data/simple-scan.ui.h:4
+#: data/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr ""
 
 #. Label beside password entry
-#: ../data/simple-scan.ui.h:6
+#: data/simple-scan.ui:117
 msgid "_Password:"
 msgstr ""
 
 #. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:8
+#: data/simple-scan.ui:188
 msgid "Front and Back"
 msgstr "முன் மற்றும் பின்"
 
 #. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:10
+#: data/simple-scan.ui:192
 msgid "Front"
 msgstr "முன்னால்"
 
 #. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:12
+#: data/simple-scan.ui:196
 msgid "Back"
 msgstr "பின் செல்க"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
-#: ../data/appdata/simple-scan.appdata.xml.in.h:1
+#: data/simple-scan.ui:225 data/simple-scan.ui:809
+#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr ""
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:16
+#: data/simple-scan.ui:241
 msgid "_Document"
 msgstr ""
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:18
+#: data/simple-scan.ui:260
 msgid "Sc_an"
 msgstr ""
 
+#. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:20
+#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
 msgid "Single _Page"
 msgstr "தனி _பக்கம்"
 
+#. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:22
+#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr "அனைத்து பக்கங்களை பீடர் இருந்து உள்ளன"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:24
+#: data/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:25
+#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
 msgid "Text"
 msgstr "உரை"
 
-#: ../data/simple-scan.ui.h:26
+#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
 msgid "Photo"
 msgstr ""
 
 #. Menu item to reorder pages
-#. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1183 ../src/ui.vala:1841
+#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr ""
 
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: data/simple-scan.ui:367
 msgid "_Email"
 msgstr "_மின்னஞ்சல்"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: data/simple-scan.ui:430
 msgid "_Page"
 msgstr ""
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: data/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "இடதுபுறமாக சுழற்று"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: data/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr ""
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: data/simple-scan.ui:460
 msgid "_Crop"
 msgstr "_ வெட்டு"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: data/simple-scan.ui:470
 msgid "_None"
 msgstr ""
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: data/simple-scan.ui:481
 msgid "A_4"
 msgstr ""
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: data/simple-scan.ui:492
 msgid "A_5"
 msgstr ""
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: data/simple-scan.ui:503
 msgid "A_6"
 msgstr ""
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: data/simple-scan.ui:514
 msgid "_Letter"
 msgstr ""
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: data/simple-scan.ui:525
 msgid "Le_gal"
 msgstr ""
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: data/simple-scan.ui:536
 msgid "4×6"
 msgstr ""
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: data/simple-scan.ui:547
 msgid "_Custom"
 msgstr "(_C) தனிப்பயன்"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: data/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr ""
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: data/simple-scan.ui:578
 msgid "Move Left"
 msgstr ""
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: data/simple-scan.ui:587
 msgid "Move Right"
 msgstr "வலப்பக்கம் நகர்"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: data/simple-scan.ui:624
 msgid "_Help"
 msgstr "_உதவி"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: data/simple-scan.ui:632
 msgid "_Contents"
 msgstr "_உள்ளடக்கங்கள்"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: data/simple-scan.ui:674 data/simple-scan.ui:885
 msgid "Start a new document"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:67
+#: data/simple-scan.ui:675
 msgid "New"
 msgstr ""
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: data/simple-scan.ui:689 data/simple-scan.ui:836
 msgid "Scan a single page from the scanner"
 msgstr ""
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: data/simple-scan.ui:691 data/simple-scan.ui:837
 msgid "Scan"
 msgstr ""
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: data/simple-scan.ui:707 data/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1842
+#: data/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr ""
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: data/simple-scan.ui:724 data/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:77
+#: data/simple-scan.ui:725 data/simple-scan.ui:825
 msgid "Stop"
 msgstr ""
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: data/simple-scan.ui:749 data/simple-scan.ui:936
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr ""
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: data/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr ""
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: data/simple-scan.ui:764 data/simple-scan.ui:914
 msgid "Rotate the page to the right (clockwise)"
 msgstr ""
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: data/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "வலப்பக்கம் சுழற்று"
 
-#: ../data/simple-scan.ui.h:86
+#: data/simple-scan.ui:779 data/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "தேர்வு செய்த பக்கத்தை வெட்டு"
 
-#: ../data/simple-scan.ui.h:87
+#: data/simple-scan.ui:781
 msgid "Crop"
 msgstr ""
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1849
+#: data/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: data/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: data/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: data/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr ""
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: data/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr ""
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: data/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "பக்க அளவு:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: data/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: data/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: data/simple-scan.ui:1260
 msgid "Quality:"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:2
+#: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:3
+#: data/simple-scan.desktop.in:5
 msgid "Scan Documents"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:4
+#: data/simple-scan.desktop.in:6
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Device to scan from"
+#: data/simple-scan.desktop.in:8
+msgid "scanner"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "SANE device to acquire images from."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "Type of document being scanned"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
-msgid ""
-"Type of document being scanned. This setting decides on the scan resolution, "
-"colors and post-processing."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
-msgid "Width of paper in tenths of a mm"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
-msgid "Height of paper in tenths of a mm"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "Brightness of scan"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "The brightness adjustment from -100 to 100 (0 being none)."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid "Contrast of scan"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "The contrast adjustment from -100 to 100 (0 being none)."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid "Resolution for text scans"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
-msgid "The resolution in dots-per-inch to use when scanning text."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
-msgid "Resolution for photo scans"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
-msgid "Page side to scan"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
-msgid "The page side to scan."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
-msgid "Directory to save files to"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
-msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
-msgid "Quality value to use for JPEG compression"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Quality value to use for JPEG compression."
-msgstr ""
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+#: data/simple-scan.appdata.xml.in:8
 msgid ""
 "A really easy way to scan both documents and photos. You can crop out the "
 "bad parts of a photo and rotate it if it is the wrong way round. You can "
@@ -407,196 +317,162 @@ msgid ""
 "formats."
 msgstr ""
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+#: data/simple-scan.appdata.xml.in:13
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr ""
 
-#. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr ""
 
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr ""
 
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1236 src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr ""
 
-#. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr ""
 
-#. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr ""
 
-#: ../src/simple-scan.vala:26
+#: src/simple-scan.vala:26
 msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr ""
 
-#. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:391
+#: src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr ""
 
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:318 src/ui.vala:1602 src/ui.vala:1887
 msgid "_Close"
 msgstr ""
 
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:327
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr ""
 
-#. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:375
 msgid "No scanners detected"
 msgstr ""
 
-#. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:377
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:382
 msgid "Additional software needed"
 msgstr ""
 
-#. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr ""
 
-#. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:506 src/ui.vala:1843
 msgid "Save As..."
 msgstr ""
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:509 src/ui.vala:675
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:510 src/ui.vala:676
 msgid "_Save"
 msgstr ""
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr ""
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:521
 msgid "Image Files"
 msgstr ""
 
-#. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:527
 msgid "All Files"
 msgstr ""
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr ""
 
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr ""
 
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr ""
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:557
 msgid "File format:"
 msgstr ""
 
-#. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:650
 msgid "Failed to save file"
 msgstr ""
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:673
 msgid "If you don't save, changes will be permanently lost."
 msgstr ""
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:708
+#: src/ui.vala:708
 msgid "Save current document?"
 msgstr ""
 
-#. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:710
 msgid "Discard Changes"
 msgstr ""
 
-#. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr ""
 
-#. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr ""
 
-#. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1206
 msgid "Combine sides"
 msgstr ""
 
-#. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr ""
 
-#. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1226
 msgid "Reverse"
 msgstr ""
 
-#. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr ""
 
-#. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr ""
 
-#. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1472
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -612,17 +488,15 @@ msgid ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
 
-#. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr ""
 
-#. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -631,190 +505,167 @@ msgstr ""
 "  Ramesh https://launchpad.net/~rame20002007\n"
 "  mano-மனோ https://launchpad.net/~manoj-neyveli"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr ""
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr ""
 
-#. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
-#. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1581
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
 msgstr ""
 
-#. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
-#. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1587
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
 msgstr ""
 
-#. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr ""
 
-#. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
-#. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1598
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
 msgstr ""
 
-#. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1602
 msgid "Install drivers"
 msgstr ""
 
-#. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
-#. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr ""
 
-#. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr ""
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr ""
 
-#. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1676
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr ""
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/ui.vala:1793
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1835
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1840
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1844
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1845
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1853
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1854
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1855
 msgid "Quit"
 msgstr ""
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr ""
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr ""
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1897
 msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1947
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1949
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:1957
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:1959
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:1967
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:1969
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2008
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/te.gmo b/po/te.gmo
new file mode 100644
index 0000000..95fd395
--- /dev/null
+++ b/po/te.gmo
diff --git a/po/te.po b/po/te.po
index 43fea07..0fb5f49 100644
--- a/po/te.po
+++ b/po/te.po
@@ -7,405 +7,309 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-06 14:16+1200\n"
+"POT-Creation-Date: 2016-07-29 12:47+1200\n"
 "PO-Revision-Date: 2012-07-23 09:08+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Telugu <te@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-04-14 05:40+0000\n"
-"X-Generator: Launchpad (build 17990)\n"
+"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 
 #. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:2
+#: data/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "అధికారమిచ్చు(_A)"
 
 #. Label beside username entry
-#: ../data/simple-scan.ui.h:4
+#: data/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "వనరుకు వాడుకరిపేరు(_U):"
 
 #. Label beside password entry
-#: ../data/simple-scan.ui.h:6
+#: data/simple-scan.ui:117
 msgid "_Password:"
 msgstr "సంకేతపదం(_P):"
 
 #. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:8
+#: data/simple-scan.ui:188
 msgid "Front and Back"
 msgstr "ముందు మరియు వెనుక"
 
 #. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:10
+#: data/simple-scan.ui:192
 msgid "Front"
 msgstr "ముందుభాగం"
 
 #. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:12
+#: data/simple-scan.ui:196
 msgid "Back"
 msgstr "వెనుకకు"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
-#: ../data/appdata/simple-scan.appdata.xml.in.h:1
+#: data/simple-scan.ui:225 data/simple-scan.ui:809
+#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr "సింపుల్ స్కాన్"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:16
+#: data/simple-scan.ui:241
 msgid "_Document"
 msgstr "పత్రం (_D)"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:18
+#: data/simple-scan.ui:260
 msgid "Sc_an"
 msgstr "స్కాన్(_a)"
 
+#. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:20
+#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
 msgid "Single _Page"
 msgstr "ఒక పేజీ(_P)"
 
+#. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:22
+#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr "ఫీడర్ నుండి అన్ని పేజీలు(_F)"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:24
+#: data/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "స్కాన్ ఆపు(_S)"
 
-#: ../data/simple-scan.ui.h:25
+#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
 msgid "Text"
 msgstr "పాఠ్యం"
 
-#: ../data/simple-scan.ui.h:26
+#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
 msgid "Photo"
 msgstr "ఫొటో"
 
 #. Menu item to reorder pages
-#. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1183 ../src/ui.vala:1841
+#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr ""
 
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: data/simple-scan.ui:367
 msgid "_Email"
 msgstr "ఈమెయిల్(_E)"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: data/simple-scan.ui:430
 msgid "_Page"
 msgstr "పేజీ(_P)"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: data/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "ఎడమవైపు తిప్పు (_L)"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: data/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "కుడివైపు తిప్పు(_R)"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: data/simple-scan.ui:460
 msgid "_Crop"
 msgstr "క్రాప్ చేయి(_C)"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: data/simple-scan.ui:470
 msgid "_None"
 msgstr "ఏదీకాదు(_N)"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: data/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: data/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: data/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: data/simple-scan.ui:514
 msgid "_Letter"
 msgstr "లెటర్ (_L)"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: data/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "లీగల్ (_g)"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: data/simple-scan.ui:536
 msgid "4×6"
 msgstr ""
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: data/simple-scan.ui:547
 msgid "_Custom"
 msgstr "మలచుకొను(_C)"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: data/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr "క్రాప్‌చేసినదానిని తిప్పు(_R)"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: data/simple-scan.ui:578
 msgid "Move Left"
 msgstr "ఎడమకు జరుపు"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: data/simple-scan.ui:587
 msgid "Move Right"
 msgstr "కుడి వైపు జరుపు"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: data/simple-scan.ui:624
 msgid "_Help"
 msgstr "సహాయం (_H)"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: data/simple-scan.ui:632
 msgid "_Contents"
 msgstr "విషయసూచిక(_C)"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: data/simple-scan.ui:674 data/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "ఒక కొత్త పత్రాన్ని ప్రాంరంభించు"
 
-#: ../data/simple-scan.ui.h:67
+#: data/simple-scan.ui:675
 msgid "New"
 msgstr "కొత్త"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: data/simple-scan.ui:689 data/simple-scan.ui:836
 msgid "Scan a single page from the scanner"
 msgstr "స్కానర్ నుండి ఒకే ఒక పేజీ స్కాన్ చేయి"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: data/simple-scan.ui:691 data/simple-scan.ui:837
 msgid "Scan"
 msgstr "స్కాన్"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: data/simple-scan.ui:707 data/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "పత్రాన్ని ఫైలులో దాచు"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1842
+#: data/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "భద్రపరచు"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: data/simple-scan.ui:724 data/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "ప్రస్తుత స్కాన్ ఆపు"
 
-#: ../data/simple-scan.ui.h:77
+#: data/simple-scan.ui:725 data/simple-scan.ui:825
 msgid "Stop"
 msgstr "ఆపు"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: data/simple-scan.ui:749 data/simple-scan.ui:936
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "ఎడమవైపుకు త్రిప్పు (అపసవ్య)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: data/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "ఎడమవైపు తిప్పు"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: data/simple-scan.ui:764 data/simple-scan.ui:914
 msgid "Rotate the page to the right (clockwise)"
 msgstr "కుడి వైపుకు త్రిప్పు (సవ్య)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: data/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "కుడివైపు తిప్పు"
 
-#: ../data/simple-scan.ui.h:86
+#: data/simple-scan.ui:779 data/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "ఎంపికైన పెజీ అంచులుసవరించు"
 
-#: ../data/simple-scan.ui.h:87
+#: data/simple-scan.ui:781
 msgid "Crop"
 msgstr "అంచులుసవరించు"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1849
+#: data/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "ప్రాధాన్యతలు"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: data/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "స్కాన్ మూలం (_o):"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: data/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "పాఠ విభాజకత (_T)"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: data/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "ఫొటో విభాజకత(_P)"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: data/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "స్కాన్ చేయు ప్రక్క:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: data/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "పేజీ పరిమాణం:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: data/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: data/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: data/simple-scan.ui:1260
 msgid "Quality:"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:2
+#: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:3
+#: data/simple-scan.desktop.in:5
 msgid "Scan Documents"
 msgstr "పత్రాలు స్కాన్ చేయు"
 
-#: ../data/simple-scan.desktop.in.h:4
+#: data/simple-scan.desktop.in:6
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Device to scan from"
-msgstr "స్కాన్ చేయుటకు పరికరం"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "SANE device to acquire images from."
-msgstr "బొమ్మలు తెచ్చుకొనుటకు SANE పరికరం."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "Type of document being scanned"
-msgstr "స్కాన్ చేయబడుచున్న పత్ర రకం"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
-msgid ""
-"Type of document being scanned. This setting decides on the scan resolution, "
-"colors and post-processing."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
-msgid "Width of paper in tenths of a mm"
-msgstr "పేపర్ వెడల్పు (మిమీ లో దశాంశభాగం)"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-"పేపర్ వెడల్పు మిల్లీమీటర్ లో దశాంశభాగాలలో (లేక 0 స్వయంచాలక పేపర్ పొడవు "
-"కనుగొనటానికి)"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
-msgid "Height of paper in tenths of a mm"
-msgstr "పేపర్ ఎత్తు (మిమీలో దశాంశభాగం)"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-"పేపర్ పొడవు మిల్లీమీటర్ లో దశాంశభాగాలలో (లేక 0 స్వయంచాలక పేపర్ పొడవు "
-"కనుగొనటానికి)"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "Brightness of scan"
+#: data/simple-scan.desktop.in:8
+msgid "scanner"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "The brightness adjustment from -100 to 100 (0 being none)."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid "Contrast of scan"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "The contrast adjustment from -100 to 100 (0 being none)."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid "Resolution for text scans"
-msgstr "పాఠ్య స్కాన్‌లకు విభాజకత"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
-msgid "The resolution in dots-per-inch to use when scanning text."
-msgstr "పాఠం స్కాన్ చేయుటకు వాడవలసిన విభాజకత (అంగుళానికి చుక్కలు)"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
-msgid "Resolution for photo scans"
-msgstr "ఫొటో స్కాన్‌లకు విభాజకత"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr "ఫొటోలు స్కాన్ చేయుటకు వాడవలసిన విభాజకత (అంగుళానికి చుక్కలు)"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
-msgid "Page side to scan"
-msgstr "ఏ వైపునుంచి పేజీని స్కాన్‌చేయాలి"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
-msgid "The page side to scan."
-msgstr "పేజీని స్కాన్ చేయవలసిన భాగం."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
-msgid "Directory to save files to"
-msgstr "ఫైళ్లు దాచవలసిన సంచయం"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
-msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
-msgstr ""
-"ఫైళ్లు దాచవలసిన సంచయం. గమ్యస్థానం ఇవ్వనట్లైతే పత్రాల (Documents) అప్రమేయ "
-"సంచయం వాడబడుతుంది."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
-msgid "Quality value to use for JPEG compression"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Quality value to use for JPEG compression."
-msgstr ""
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+#: data/simple-scan.appdata.xml.in:8
 msgid ""
 "A really easy way to scan both documents and photos. You can crop out the "
 "bad parts of a photo and rotate it if it is the wrong way round. You can "
@@ -413,197 +317,163 @@ msgid ""
 "formats."
 msgstr ""
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+#: data/simple-scan.appdata.xml.in:13
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr "ఏ స్కానర్‌లు అందుబాటులోలేవు. దయచేసి ఒక స్కానర్‌ను అనుసంధానించండి."
 
-#. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "స్కానర్‌కు అనుసంధానించలేకపోతోంది"
 
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "స్కాన్ ప్రారంభించుట వీలుకాలేదు"
 
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1236 src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr "స్కానర్‌తో వర్తమాన దోషం"
 
-#. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "విడుదల రూపాంతరాన్ని చూపించు"
 
-#. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr "దోషశుద్ధి సందేశాలను ముద్రించు"
 
-#: ../src/simple-scan.vala:26
+#: src/simple-scan.vala:26
 msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr ""
 
-#. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:391
+#: src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "స్కాన్‌చేయుటలో విఫలమైంది"
 
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr "అందుబాటులో వున్న అదేశ వరుస ఐచ్చికముల కొరకు '%s --help' నడుపు."
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:318 src/ui.vala:1602 src/ui.vala:1887
 msgid "_Close"
 msgstr ""
 
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:327
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "'%s' వాడుటకు వాడుకరిపేరు మరియు సంకేతపదం కావాలి"
 
-#. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:375
 msgid "No scanners detected"
 msgstr "ఏ స్కానర్‌లు కనిపెట్టబడలేదు"
 
-#. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:377
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 "మీ స్కానర్ విద్యుత్తుచే చేతనమై కంప్యూటర్‌కు అనుసంధానమైనదో లేదో చూడండి."
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:382
 msgid "Additional software needed"
 msgstr ""
 
-#. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr ""
 
-#. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:506 src/ui.vala:1843
 msgid "Save As..."
 msgstr "ఇలా దాచు..."
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:509 src/ui.vala:675
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:510 src/ui.vala:676
 msgid "_Save"
 msgstr ""
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "స్కాన్‌చేయబడిన పత్రం.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:521
 msgid "Image Files"
 msgstr "బొమ్మ ఫైళ్లు"
 
-#. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:527
 msgid "All Files"
 msgstr "అన్ని ఫైళ్ళు"
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (బహుళ-పేజి పత్రం)"
 
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (కుదించిన)"
 
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (నష్టంలేని)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:557
 msgid "File format:"
 msgstr ""
 
-#. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:650
 msgid "Failed to save file"
 msgstr "ఫైల్ దాచుటలో విఫలమైంది"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:673
 msgid "If you don't save, changes will be permanently lost."
 msgstr "ఒకవేళ మీరు దాచకపోతే, మార్పులను శాశ్వతముగా కోల్పోతారు."
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:708
+#: src/ui.vala:708
 msgid "Save current document?"
 msgstr "ప్రస్తుత పత్రాన్ని దాచాలా?"
 
-#. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:710
 msgid "Discard Changes"
 msgstr "మార్పులు వదలివేయి"
 
-#. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "మునుజూపు కొరకు బొమ్మను భద్రపరుచులేకపోతున్నది"
 
-#. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "బొమ్మ మునుజూపు అనువర్తనం తెరచుట వీలుకాలేదు"
 
-#. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1206
 msgid "Combine sides"
 msgstr ""
 
-#. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr ""
 
-#. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1226
 msgid "Reverse"
 msgstr ""
 
-#. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr ""
 
-#. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "సహాయ ఫైలు తెరువలేకపోయింది"
 
-#. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1472
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -630,17 +500,15 @@ msgstr ""
 "GNU General Public License మీకు దీనితో ఇచ్చి వుండాలి\n"
 " లేనిచో చూడండి <http://www.gnu.org/licenses/>."
 
-#. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "సింపుల్ స్కాన్ గురించి"
 
-#. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "సులభంగా పత్ర స్కానింగ్‌చేయు సాధనం"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -649,201 +517,201 @@ msgstr ""
 "  arjuna rao chavala https://launchpad.net/~arjunaraoc\n"
 "  వీవెన్ https://launchpad.net/~veeven"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "నిష్క్రమించేముందు పత్రాన్ని దాచాలా?"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "దాచకుండా నిష్క్రమించు"
 
-#. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
-#. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1581
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
 msgstr ""
 
-#. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
-#. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1587
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
 msgstr ""
 
-#. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr ""
 
-#. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
-#. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1598
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
 msgstr ""
 
-#. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1602
 msgid "Install drivers"
 msgstr ""
 
-#. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
-#. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr ""
 
-#. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr ""
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr ""
 
-#. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1676
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr ""
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (అప్రమేయ)"
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (చిత్తు)"
 
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (ఉన్నత విభాజకత)"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/ui.vala:1793
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1835
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1840
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1844
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1845
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1853
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1854
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1855
 msgid "Quit"
 msgstr ""
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "స్కానర్‌ను మార్చు(_S)"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr ""
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1897
 msgid "Automatic"
 msgstr "స్వయంచాలక"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1947
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1949
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:1957
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:1959
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:1967
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:1969
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2008
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
 
+#~ msgid "SANE device to acquire images from."
+#~ msgstr "బొమ్మలు తెచ్చుకొనుటకు SANE పరికరం."
+
 #~ msgid "TRUE if the application window is maximized"
 #~ msgstr "TRUE అనువర్తనం విండో గరిష్ఠ పరిమాణంలో చూపబడుతున్నట్లైతే"
 
+#~ msgid "The resolution in dots-per-inch to use when scanning photos."
+#~ msgstr "ఫొటోలు స్కాన్ చేయుటకు వాడవలసిన విభాజకత (అంగుళానికి చుక్కలు)"
+
+#~ msgid "The resolution in dots-per-inch to use when scanning text."
+#~ msgstr "పాఠం స్కాన్ చేయుటకు వాడవలసిన విభాజకత (అంగుళానికి చుక్కలు)"
+
 #~ msgid ""
 #~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
 #~ msgstr "స్కాన్ చేయుటకు పేజీ భాగం. రెండువైపుల పైన, వెనుక,"
 
+#~ msgid ""
+#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr ""
+#~ "పేపర్ పొడవు మిల్లీమీటర్ లో దశాంశభాగాలలో (లేక 0 స్వయంచాలక పేపర్ పొడవు "
+#~ "కనుగొనటానికి)"
+
+#~ msgid ""
+#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr ""
+#~ "పేపర్ వెడల్పు మిల్లీమీటర్ లో దశాంశభాగాలలో (లేక 0 స్వయంచాలక పేపర్ పొడవు "
+#~ "కనుగొనటానికి)"
+
 #~ msgid "The resolution in dots-per-inch of the previously scanned image."
 #~ msgstr "ఇటీవల స్కాన్ చేయబడిన బొమ్మ విభాజకత (అంగుళానికి చుక్కలు)"
 
@@ -854,6 +722,9 @@ msgstr ""
 #~ "స్కాన్ మార్గం స్కాన్ పేజీపై. 'పైనుండి క్రిందికి' ' క్రింది నుండి పైకి'  "
 #~ "'ఎడమనుండికుడి' 'కుడినుండిఎడమ'"
 
+#~ msgid "Width of paper in tenths of a mm"
+#~ msgstr "పేపర్ వెడల్పు (మిమీ లో దశాంశభాగం)"
+
 #~ msgid ""
 #~ "Type of document being scanned. 'text' for text documents, 'photo' for "
 #~ "photos. This setting decides on the scan resolution, colors and post-"
@@ -862,15 +733,33 @@ msgstr ""
 #~ "స్కాన్ చేయబడుచున్న పత్ర రకం  'పాఠం' పాఠ్యపత్రములకు, 'ఫోటో' ఫొటోలకొరకు.  ఈ "
 #~ "అమరిక స్కాన్ విభాజకత, రంగులు మరియు స్కాన్ చేసినతరువాత పనులు నిర్ణయించును"
 
+#~ msgid "Page side to scan"
+#~ msgstr "ఏ వైపునుంచి పేజీని స్కాన్‌చేయాలి"
+
+#~ msgid "Height of paper in tenths of a mm"
+#~ msgstr "పేపర్ ఎత్తు (మిమీలో దశాంశభాగం)"
+
 #~ msgid "Height of scanned image in pixels"
 #~ msgstr "స్కాన్‌చేయబడిన బొమ్మ ఎత్తు(పిక్సెళ్ళలో)"
 
+#~ msgid "Device to scan from"
+#~ msgstr "స్కాన్ చేయుటకు పరికరం"
+
 #~ msgid "Direction of scan"
 #~ msgstr "స్కాన్‌చేయు దిశ"
 
+#~ msgid "Resolution for text scans"
+#~ msgstr "పాఠ్య స్కాన్‌లకు విభాజకత"
+
+#~ msgid "Resolution for photo scans"
+#~ msgstr "ఫొటో స్కాన్‌లకు విభాజకత"
+
 #~ msgid "Resolution of last scanned image"
 #~ msgstr "ఇటీవలి స్కాన్‌చేయబడిన బొమ్మ విభాజకత"
 
+#~ msgid "Directory to save files to"
+#~ msgstr "ఫైళ్లు దాచవలసిన సంచయం"
+
 #~ msgid ""
 #~ "The height of scanned image in pixels. This value is updated to what the "
 #~ "last scanned page was."
@@ -878,6 +767,15 @@ msgstr ""
 #~ "స్కాన్ చేయబడిన బొమ్మ  ఎత్తు పిక్సెళ్ళలో. ఇటీవలి స్కాన్‌చేసిన పేజీ అధారంగా ఈ "
 #~ "విలువ మార్చబడుతుంది."
 
+#~ msgid ""
+#~ "The directory to save files to. Defaults to the documents directory if unset."
+#~ msgstr ""
+#~ "ఫైళ్లు దాచవలసిన సంచయం. గమ్యస్థానం ఇవ్వనట్లైతే పత్రాల (Documents) అప్రమేయ "
+#~ "సంచయం వాడబడుతుంది."
+
+#~ msgid "Type of document being scanned"
+#~ msgstr "స్కాన్ చేయబడుచున్న పత్ర రకం"
+
 #~ msgid "Window height in pixels"
 #~ msgstr "విండో ఎత్తు పిక్సెళ్ళలో"
 
@@ -954,3 +852,6 @@ msgstr ""
 
 #~ msgid "4&#xD7;6"
 #~ msgstr "4&#xD7;6"
+
+#~ msgid "The page side to scan."
+#~ msgstr "పేజీని స్కాన్ చేయవలసిన భాగం."
diff --git a/po/th.gmo b/po/th.gmo
new file mode 100644
index 0000000..81f4009
--- /dev/null
+++ b/po/th.gmo
diff --git a/po/th.po b/po/th.po
index 9f9d287..e1bafac 100644
--- a/po/th.po
+++ b/po/th.po
@@ -7,404 +7,309 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-06 14:16+1200\n"
+"POT-Creation-Date: 2016-07-29 12:47+1200\n"
 "PO-Revision-Date: 2012-07-23 09:09+0000\n"
 "Last-Translator: AnuchitChalothorn <anoochit@gmail.com>\n"
 "Language-Team: Thai <th@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-04-14 05:40+0000\n"
-"X-Generator: Launchpad (build 17990)\n"
+"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 
 #. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:2
+#: data/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_อนุญาต"
 
 #. Label beside username entry
-#: ../data/simple-scan.ui.h:4
+#: data/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "_ชื่อผู้ใช้ทรัพยากร :"
 
 #. Label beside password entry
-#: ../data/simple-scan.ui.h:6
+#: data/simple-scan.ui:117
 msgid "_Password:"
 msgstr "รหัส_ผ่าน:"
 
 #. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:8
+#: data/simple-scan.ui:188
 msgid "Front and Back"
 msgstr "หน้าและหลัง"
 
 #. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:10
+#: data/simple-scan.ui:192
 msgid "Front"
 msgstr "หน้า"
 
 #. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:12
+#: data/simple-scan.ui:196
 msgid "Back"
 msgstr "หลัง"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
-#: ../data/appdata/simple-scan.appdata.xml.in.h:1
+#: data/simple-scan.ui:225 data/simple-scan.ui:809
+#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr "Simple Scan"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:16
+#: data/simple-scan.ui:241
 msgid "_Document"
 msgstr "เ_อกสาร"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:18
+#: data/simple-scan.ui:260
 msgid "Sc_an"
 msgstr "สแกน"
 
+#. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:20
+#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
 msgid "Single _Page"
 msgstr "_หน้าเดี่ยว"
 
+#. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:22
+#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr "ทุกหน้าจาก_ตัวป้อนกระดาษ"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:24
+#: data/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "_หยุดสแกน:"
 
-#: ../data/simple-scan.ui.h:25
+#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
 msgid "Text"
 msgstr "ข้อความ"
 
-#: ../data/simple-scan.ui.h:26
+#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
 msgid "Photo"
 msgstr "ภาพถ่าย"
 
 #. Menu item to reorder pages
-#. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1183 ../src/ui.vala:1841
+#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr ""
 
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: data/simple-scan.ui:367
 msgid "_Email"
 msgstr "_อีเมล"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: data/simple-scan.ui:430
 msgid "_Page"
 msgstr "_หน้า"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: data/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "หมุน_ซ้าย"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: data/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "หมุน_ขวา"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: data/simple-scan.ui:460
 msgid "_Crop"
 msgstr "_ตัด"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: data/simple-scan.ui:470
 msgid "_None"
 msgstr "ไ_ม่มี"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: data/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: data/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: data/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: data/simple-scan.ui:514
 msgid "_Letter"
 msgstr "_จดหมาย"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: data/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: data/simple-scan.ui:536
 msgid "4×6"
 msgstr ""
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: data/simple-scan.ui:547
 msgid "_Custom"
 msgstr "_กำหนดเอง"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: data/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr "หมุ_นภาพตัด"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: data/simple-scan.ui:578
 msgid "Move Left"
 msgstr "ย้ายไปทางซ้าย"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: data/simple-scan.ui:587
 msgid "Move Right"
 msgstr "ย้ายไปทางขวา"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: data/simple-scan.ui:624
 msgid "_Help"
 msgstr "_วิธีใช้"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: data/simple-scan.ui:632
 msgid "_Contents"
 msgstr "เ_นื้อหา"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: data/simple-scan.ui:674 data/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "เริ่มเอกสารใหม่"
 
-#: ../data/simple-scan.ui.h:67
+#: data/simple-scan.ui:675
 msgid "New"
 msgstr "สร้าง"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: data/simple-scan.ui:689 data/simple-scan.ui:836
 msgid "Scan a single page from the scanner"
 msgstr "สแกนหน้าเดียวจากเครื่องสแกน"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: data/simple-scan.ui:691 data/simple-scan.ui:837
 msgid "Scan"
 msgstr "สแกน"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: data/simple-scan.ui:707 data/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "บันทึกเอกสารเป็นแฟ้ม"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1842
+#: data/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "บันทึก"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: data/simple-scan.ui:724 data/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "หยุดการสแกนขณะนี้"
 
-#: ../data/simple-scan.ui.h:77
+#: data/simple-scan.ui:725 data/simple-scan.ui:825
 msgid "Stop"
 msgstr "หยุด"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: data/simple-scan.ui:749 data/simple-scan.ui:936
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "หมุนหน้าไปทางซ้าย (ทวนเข็มนาฬิกา)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: data/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "หมุนซ้าย"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: data/simple-scan.ui:764 data/simple-scan.ui:914
 msgid "Rotate the page to the right (clockwise)"
 msgstr "หมุนหน้าไปทางขวา (ตามเข็มนาฬิกา)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: data/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "หมุนขวา"
 
-#: ../data/simple-scan.ui.h:86
+#: data/simple-scan.ui:779 data/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "ตัดหน้าที่เลือก"
 
-#: ../data/simple-scan.ui.h:87
+#: data/simple-scan.ui:781
 msgid "Crop"
 msgstr "ตัด"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1849
+#: data/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "คุณสมบัติ"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: data/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "แ_หล่งสแกน:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: data/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "ความละเอียด_ข้อความ:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: data/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "ความละเอียด_ภาพถ่าย:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: data/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "สแกนด้าน:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: data/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "ขนาดกระดาษ :"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: data/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: data/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: data/simple-scan.ui:1260
 msgid "Quality:"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:2
+#: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:3
+#: data/simple-scan.desktop.in:5
 msgid "Scan Documents"
 msgstr "สแกนเอกสาร"
 
-#: ../data/simple-scan.desktop.in.h:4
+#: data/simple-scan.desktop.in:6
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Device to scan from"
-msgstr "เครื่องสแกนจาก"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "SANE device to acquire images from."
-msgstr "อุปกรณ์ SANE เพื่อรับภาพจาก"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "Type of document being scanned"
-msgstr "ชนิดของเอกสารที่ถูกสแกน"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
-msgid ""
-"Type of document being scanned. This setting decides on the scan resolution, "
-"colors and post-processing."
-msgstr ""
-"ชนิดของเอกสารที่จะสแกน การตั้งค่านี้มีผลต่อความละเอียดการสแกน สี "
-"และการประมวลผลหลังสแกน"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
-msgid "Width of paper in tenths of a mm"
-msgstr "ความกว้างของกระดาษใน 10 ของมิลลิเมตร"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-"ความกว้างของกระดาษใน 10 ของมิลลิเมตร (หรือ 0 สำหรับการตรวจสอบกระดาษอัตโนมัติ)"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
-msgid "Height of paper in tenths of a mm"
-msgstr "ความสูงของกระดาษใน 10 ของมิลลิเมตร"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-"ความสูงของกระดาษใน 10 ของมิลลิเมตร (หรือ 0 สำหรับการตรวจสอบกระดาษอัตโนมัติ)"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "Brightness of scan"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "The brightness adjustment from -100 to 100 (0 being none)."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid "Contrast of scan"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "The contrast adjustment from -100 to 100 (0 being none)."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid "Resolution for text scans"
-msgstr "ความละเอียดการสแกนข้อความ"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
-msgid "The resolution in dots-per-inch to use when scanning text."
-msgstr "ความละเอียด เป็นจุดต่อนิ้วที่จะใช้เมื่อการสแกนข้อความ"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
-msgid "Resolution for photo scans"
-msgstr "ความละเอียดการสแกนภาพถ่าย"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr "ความละเอียด เป็นจุดต่อนิ้วที่จะใช้เมื่อการสแกนภาพ"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
-msgid "Page side to scan"
-msgstr "หน้ากระดาษ ด้านที่จะสแกน"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
-msgid "The page side to scan."
-msgstr "ด้านกระดาษที่จะสแกน"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
-msgid "Directory to save files to"
-msgstr "ไดเรคทอรีเพื่อบันทึกไฟล์"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
-msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
-msgstr ""
-"ไดเรกทอรีที่ใช้บันทึกแฟ้ม ค่าเริ่มต้นไดเรกทอรีสำหรับเอกสารถ้าไม่มีการตั้งค่า"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
-msgid "Quality value to use for JPEG compression"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Quality value to use for JPEG compression."
+#: data/simple-scan.desktop.in:8
+msgid "scanner"
 msgstr ""
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+#: data/simple-scan.appdata.xml.in:8
 msgid ""
 "A really easy way to scan both documents and photos. You can crop out the "
 "bad parts of a photo and rotate it if it is the wrong way round. You can "
@@ -412,196 +317,162 @@ msgid ""
 "formats."
 msgstr ""
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+#: data/simple-scan.appdata.xml.in:13
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr "เครื่องสแกนไม่สามารถใช้ได้ โปรดเชื่อมต่อเครื่องสแกน"
 
-#. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "ไม่สามารถเชื่อมต่อเครื่องสแกน"
 
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "ไม่สามารถเริ่มต้นการสแกน"
 
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1236 src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr "การสื่อสารกับเครื่องสแกนผิดพลาด"
 
-#. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "แสดงรุ่นที่ออก"
 
-#. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr "แสดงข้อความข้อบกพร่อง"
 
-#: ../src/simple-scan.vala:26
+#: src/simple-scan.vala:26
 msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr "ซ่อมแฟ้ม PDF ที่ถูกสร้างด้วย Simple Scan รุ่นที่เก่ากว่า"
 
-#. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:391
+#: src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "การสแกนล้มเหลว"
 
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DEVICE...] - เครื่องมือกำลังสแกน"
 
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr "เรียก '%s --help' เพื่อดูตัวเลือกทั้งหมดที่มีของบรรทัดคำสั่ง"
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:318 src/ui.vala:1602 src/ui.vala:1887
 msgid "_Close"
 msgstr ""
 
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:327
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "ต้องการชื่อผู้ใช้และรหัสผ่านเพื่อเข้าใช้ '%s'"
 
-#. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:375
 msgid "No scanners detected"
 msgstr "ไม่พบเครื่องสแกน"
 
-#. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:377
 msgid "Please check your scanner is connected and powered on"
 msgstr "กรุณาตรวจสอบการเชื่อมต่อเครื่องสแกนของคุณและเปิดเครื่อง"
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:382
 msgid "Additional software needed"
 msgstr ""
 
-#. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr ""
 
-#. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:506 src/ui.vala:1843
 msgid "Save As..."
 msgstr "บันทึกเป็น..."
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:509 src/ui.vala:675
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:510 src/ui.vala:676
 msgid "_Save"
 msgstr ""
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "สแกน Document.pdf แล้ว"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:521
 msgid "Image Files"
 msgstr "แฟ้มภาพ"
 
-#. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:527
 msgid "All Files"
 msgstr "แฟ้มทั้งหมด"
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (เอกสารหลายหน้า)"
 
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (บีบอัดแล้ว)"
 
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (lossless)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:557
 msgid "File format:"
 msgstr ""
 
-#. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:650
 msgid "Failed to save file"
 msgstr "การบันทึกแฟ้มล้มเหลว"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:673
 msgid "If you don't save, changes will be permanently lost."
 msgstr "ถ้าคุณไม่บันทึกการแก้ไขทั้งหมดจะสูญหายอย่างถาวร"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:708
+#: src/ui.vala:708
 msgid "Save current document?"
 msgstr "บันทึกเอกสารปัจจุบัน"
 
-#. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:710
 msgid "Discard Changes"
 msgstr "ยกเลิกการเปลี่ยนแปลง"
 
-#. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "ไม่สามารถบัญทึกรูปภาพตัวอย่าง"
 
-#. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "ไม่สามารถเปิดโปรแกรมแสดงภาพได้"
 
-#. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1206
 msgid "Combine sides"
 msgstr ""
 
-#. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr ""
 
-#. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1226
 msgid "Reverse"
 msgstr ""
 
-#. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr ""
 
-#. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "ไม่สามารถเปิดแฟ้มเอกสารวิธีใช้"
 
-#. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1472
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -629,17 +500,15 @@ msgstr ""
 "You should have received a copy of the GNU General Public License\n"
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 
-#. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "เกี่ยวกับ Simple Scan"
 
-#. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "เครื่องมือสแกนเอกสารอย่างง่าย"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -651,190 +520,167 @@ msgstr ""
 "  SiraNokyoongtong https://launchpad.net/~gumara\n"
 "  kijjaz https://launchpad.net/~kijjaz-gmail"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "บันทึกเอกสารก่อนปิดหรือไม่?"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "ปิดโดยไม่บันทึก"
 
-#. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
-#. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1581
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
 msgstr ""
 
-#. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
-#. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1587
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
 msgstr ""
 
-#. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr ""
 
-#. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
-#. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1598
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
 msgstr ""
 
-#. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1602
 msgid "Install drivers"
 msgstr ""
 
-#. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
-#. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr ""
 
-#. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr ""
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr ""
 
-#. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1676
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr ""
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (ค่าปริยาย)"
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (ภาพร่าง)"
 
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (ความละเอียดสูง)"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/ui.vala:1793
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1835
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1840
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1844
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1845
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1853
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1854
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1855
 msgid "Quit"
 msgstr ""
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "เ_ปลี่ยนเครื่องสแกน"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr ""
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1897
 msgid "Automatic"
 msgstr "อัตโนมัติ"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1947
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1949
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:1957
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:1959
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:1967
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:1969
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2008
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
@@ -842,15 +688,36 @@ msgstr ""
 #~ msgid "4&#xD7;6"
 #~ msgstr "4&#xD7;6"
 
+#~ msgid "Device to scan from"
+#~ msgstr "เครื่องสแกนจาก"
+
 #~ msgid "Direction of scan"
 #~ msgstr "ทิศทางของการสแกน"
 
+#~ msgid "Directory to save files to"
+#~ msgstr "ไดเรคทอรีเพื่อบันทึกไฟล์"
+
+#~ msgid "Height of paper in tenths of a mm"
+#~ msgstr "ความสูงของกระดาษใน 10 ของมิลลิเมตร"
+
 #~ msgid "Height of scanned image in pixels"
 #~ msgstr "ความสูงของภาพที่สแกน เป็นพิกเซล"
 
+#~ msgid "Page side to scan"
+#~ msgstr "หน้ากระดาษ ด้านที่จะสแกน"
+
+#~ msgid "Resolution for photo scans"
+#~ msgstr "ความละเอียดการสแกนภาพถ่าย"
+
+#~ msgid "Resolution for text scans"
+#~ msgstr "ความละเอียดการสแกนข้อความ"
+
 #~ msgid "Resolution of last scanned image"
 #~ msgstr "ความละเอียดของภาพที่สแกนล่าสุด"
 
+#~ msgid "SANE device to acquire images from."
+#~ msgstr "อุปกรณ์ SANE เพื่อรับภาพจาก"
+
 #~ msgid "TRUE if the application window is maximized"
 #~ msgstr "เป็นจริง ถ้าหน้าต่างโปรแกรมขนายเต็มหน้าจอ"
 
@@ -862,18 +729,35 @@ msgstr ""
 #~ "'ซ้าย-ไป-ขวา' 'ขวา-ไป-ซ้าย'"
 
 #~ msgid ""
+#~ "The directory to save files to. Defaults to the documents directory if unset."
+#~ msgstr ""
+#~ "ไดเรกทอรีที่ใช้บันทึกแฟ้ม ค่าเริ่มต้นไดเรกทอรีสำหรับเอกสารถ้าไม่มีการตั้งค่า"
+
+#~ msgid ""
 #~ "The height of scanned image in pixels. This value is updated to what the "
 #~ "last scanned page was."
 #~ msgstr ""
 #~ "ความสูงของภาพที่สแกน เป็นพิกเซล ค่านี้มีการปรับปรุงจากหน้าที่สแกนล่าสุด"
 
 #~ msgid ""
+#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr ""
+#~ "ความสูงของกระดาษใน 10 ของมิลลิเมตร (หรือ 0 สำหรับการตรวจสอบกระดาษอัตโนมัติ)"
+
+#~ msgid ""
 #~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
 #~ msgstr "สแกนหน้ากระดาษ สามารถสแกนได้จากนี้ :'ทั้งคู่' 'หน้า' 'หลัง'"
 
 #~ msgid "The resolution in dots-per-inch of the previously scanned image."
 #~ msgstr "ความละเอียด เป็นจุดต่อ นิ้วของภาพที่สแกนก่อนหน้านี้"
 
+#~ msgid "The resolution in dots-per-inch to use when scanning photos."
+#~ msgstr "ความละเอียด เป็นจุดต่อนิ้วที่จะใช้เมื่อการสแกนภาพ"
+
+#~ msgid "The resolution in dots-per-inch to use when scanning text."
+#~ msgstr "ความละเอียด เป็นจุดต่อนิ้วที่จะใช้เมื่อการสแกนข้อความ"
+
 #~ msgid ""
 #~ "The width of scanned image in pixels. This value is updated to what the last "
 #~ "scanned page was."
@@ -881,6 +765,15 @@ msgstr ""
 #~ "ความกว้างของภาพที่สแกน เป็นพิกเซล ค่านี้มีการปรับปรุงจากหน้าที่สแกนล่าสุด"
 
 #~ msgid ""
+#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr ""
+#~ "ความกว้างของกระดาษใน 10 ของมิลลิเมตร (หรือ 0 สำหรับการตรวจสอบกระดาษอัตโนมัติ)"
+
+#~ msgid "Type of document being scanned"
+#~ msgstr "ชนิดของเอกสารที่ถูกสแกน"
+
+#~ msgid ""
 #~ "Type of document being scanned. 'text' for text documents, 'photo' for "
 #~ "photos. This setting decides on the scan resolution, colors and post-"
 #~ "processing."
@@ -888,6 +781,9 @@ msgstr ""
 #~ "ชนิดของเอกสารที่ถูกสแกน 'ข้อความ'สำหรับเอกสารข้อความ'รูปภาพ'สำหรับภาพถ่าย "
 #~ "การตั้งค่านี้ตัดสินใจในการสแกนความละเอียดของสีและหลังการประมวลผล"
 
+#~ msgid "Width of paper in tenths of a mm"
+#~ msgstr "ความกว้างของกระดาษใน 10 ของมิลลิเมตร"
+
 #~ msgid "Width of scanned image in pixels"
 #~ msgstr "ความกว้างของภาพที่ สแกนเป็นพิกเซล"
 
@@ -957,5 +853,15 @@ msgstr ""
 #~ msgid "Please check your installation"
 #~ msgstr "กรุณาตรวจสอบการติดตั้งของคุณ"
 
+#~ msgid "The page side to scan."
+#~ msgstr "ด้านกระดาษที่จะสแกน"
+
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "ทิศทางของสแกนเนอร์ตอนสแกนผ่านหน้ากระดาษ"
+
+#~ msgid ""
+#~ "Type of document being scanned. This setting decides on the scan resolution, "
+#~ "colors and post-processing."
+#~ msgstr ""
+#~ "ชนิดของเอกสารที่จะสแกน การตั้งค่านี้มีผลต่อความละเอียดการสแกน สี "
+#~ "และการประมวลผลหลังสแกน"
diff --git a/po/tr.gmo b/po/tr.gmo
new file mode 100644
index 0000000..80d9b3c
--- /dev/null
+++ b/po/tr.gmo
diff --git a/po/tr.po b/po/tr.po
index cf19aea..300f15c 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -7,410 +7,309 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-06 14:16+1200\n"
+"POT-Creation-Date: 2016-07-29 12:47+1200\n"
 "PO-Revision-Date: 2012-07-23 09:09+0000\n"
 "Last-Translator: Robert Ancell <robert.ancell@canonical.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-04-14 05:40+0000\n"
-"X-Generator: Launchpad (build 17990)\n"
+"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 
 #. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:2
+#: data/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_Yetkilendir"
 
 #. Label beside username entry
-#: ../data/simple-scan.ui.h:4
+#: data/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "Kaynak için _kullanıcı adı:"
 
 #. Label beside password entry
-#: ../data/simple-scan.ui.h:6
+#: data/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Parola:"
 
 #. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:8
+#: data/simple-scan.ui:188
 msgid "Front and Back"
 msgstr "Ön ve Arka taraf"
 
 #. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:10
+#: data/simple-scan.ui:192
 msgid "Front"
 msgstr "Ön taraf"
 
 #. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:12
+#: data/simple-scan.ui:196
 msgid "Back"
 msgstr "Arka taraf"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
-#: ../data/appdata/simple-scan.appdata.xml.in.h:1
+#: data/simple-scan.ui:225 data/simple-scan.ui:809
+#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr "Basit Tarama"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:16
+#: data/simple-scan.ui:241
 msgid "_Document"
 msgstr "_Belge"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:18
+#: data/simple-scan.ui:260
 msgid "Sc_an"
 msgstr "T_ara"
 
+#. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:20
+#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
 msgid "Single _Page"
 msgstr "_Tek Sayfa"
 
+#. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:22
+#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr "Kaynaktaki Tüm _Sayfalar"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:24
+#: data/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "_Taramayı Durdur"
 
-#: ../data/simple-scan.ui.h:25
+#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
 msgid "Text"
 msgstr "Metin"
 
-#: ../data/simple-scan.ui.h:26
+#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
 msgid "Photo"
 msgstr "Fotoğraf"
 
 #. Menu item to reorder pages
-#. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1183 ../src/ui.vala:1841
+#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr "Sayfaları Yeniden Sırala"
 
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: data/simple-scan.ui:367
 msgid "_Email"
 msgstr "_E-posta"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: data/simple-scan.ui:430
 msgid "_Page"
 msgstr "_Sayfa"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: data/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "_Sola Döndür"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: data/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "Sa_ğa Çevir"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: data/simple-scan.ui:460
 msgid "_Crop"
 msgstr "_Kırp"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: data/simple-scan.ui:470
 msgid "_None"
 msgstr "_Hiçbiri"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: data/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: data/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: data/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: data/simple-scan.ui:514
 msgid "_Letter"
 msgstr "_Harf"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: data/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "Ya_sal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: data/simple-scan.ui:536
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: data/simple-scan.ui:547
 msgid "_Custom"
 msgstr "_Özel"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: data/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr "_Kırpmayı Döndür"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: data/simple-scan.ui:578
 msgid "Move Left"
 msgstr "Sola Taşı"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: data/simple-scan.ui:587
 msgid "Move Right"
 msgstr "Sağa Taşı"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: data/simple-scan.ui:624
 msgid "_Help"
 msgstr "_Yardım"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: data/simple-scan.ui:632
 msgid "_Contents"
 msgstr "_İçindekiler"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: data/simple-scan.ui:674 data/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "Yeni bir belge başlat"
 
-#: ../data/simple-scan.ui.h:67
+#: data/simple-scan.ui:675
 msgid "New"
 msgstr "Yeni"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: data/simple-scan.ui:689 data/simple-scan.ui:836
 msgid "Scan a single page from the scanner"
 msgstr "Tarayıcıdan tek bir sayfa tara"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: data/simple-scan.ui:691 data/simple-scan.ui:837
 msgid "Scan"
 msgstr "Tara"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: data/simple-scan.ui:707 data/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "Belgeyi bir dosyaya kaydet"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1842
+#: data/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "Kaydet"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: data/simple-scan.ui:724 data/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "Geçerli taramayı durdur"
 
-#: ../data/simple-scan.ui.h:77
+#: data/simple-scan.ui:725 data/simple-scan.ui:825
 msgid "Stop"
 msgstr "Durdur"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: data/simple-scan.ui:749 data/simple-scan.ui:936
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Sayfayı sola döndür (saat yönünün tersine)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: data/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "Sola Döndür"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: data/simple-scan.ui:764 data/simple-scan.ui:914
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Sayfayı sağa döndür (saat yönünde)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: data/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "Sağa Döndür"
 
-#: ../data/simple-scan.ui.h:86
+#: data/simple-scan.ui:779 data/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "Seçili sayfayı kırp"
 
-#: ../data/simple-scan.ui.h:87
+#: data/simple-scan.ui:781
 msgid "Crop"
 msgstr "Kırp"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1849
+#: data/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "Tercihler"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: data/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "Ta_rama Kaynağı:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: data/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "_Metin Çözünürlüğü:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: data/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "_Fotoğraf Çözünürlüğü:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: data/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "Taranacak taraf:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: data/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "Sayfa Boyutu:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: data/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "Parlaklık:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: data/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "Karşıtlık:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: data/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "Kalite:"
 
-#: ../data/simple-scan.desktop.in.h:2
+#: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr "Belge Tarayıcı"
 
-#: ../data/simple-scan.desktop.in.h:3
+#: data/simple-scan.desktop.in:5
 msgid "Scan Documents"
 msgstr "Belgeleri Tara"
 
-#: ../data/simple-scan.desktop.in.h:4
+#: data/simple-scan.desktop.in:6
 msgid "scan;scanner;flatbed;adf;"
 msgstr "tara;tarayıcı;flatbed;adf;"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Device to scan from"
-msgstr "Tarama yapılacak aygıt"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "SANE device to acquire images from."
-msgstr "Görüntülerin alınacağı SANE aygıtı"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "Type of document being scanned"
-msgstr "Taranacak belgenin türü"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
-msgid ""
-"Type of document being scanned. This setting decides on the scan resolution, "
-"colors and post-processing."
-msgstr ""
-"Taranacak belge türü. Bu ayar tarama kalitesi, renkler ve son işlemlere göre "
-"belirlenir."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
-msgid "Width of paper in tenths of a mm"
-msgstr "Ondabirlik mm cinsinden kağıdın genişliği"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-"Ondabirlik mm cinsinden kağıdın genişliği ( ya da otomatik kağıt tespiti "
-"için 0)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
-msgid "Height of paper in tenths of a mm"
-msgstr "Ondabirlik mm cinsinden kağıdın yüksekliği"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-"Ondabirlik mm cinsinden kağıdın yüksekliği ( ya da otomatik kağıt tespiti "
-"için 0)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "Brightness of scan"
-msgstr "Tarama parlaklığı"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "The brightness adjustment from -100 to 100 (0 being none)."
-msgstr "-100'den 100'e (0 hiçbiri) parlaklık ayarlaması"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid "Contrast of scan"
-msgstr "Tarama karşıtlığı"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "The contrast adjustment from -100 to 100 (0 being none)."
-msgstr "-100'den 100'e (0 hiçbiri) karşıtlık ayarlaması"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid "Resolution for text scans"
-msgstr "Metin taramaları için çözünürlük"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
-msgid "The resolution in dots-per-inch to use when scanning text."
+#: data/simple-scan.desktop.in:8
+msgid "scanner"
 msgstr ""
-"Metin tararken kullanılacak inç başına nokta sayısı cinsinden çözünürlük."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
-msgid "Resolution for photo scans"
-msgstr "Fotoğraf taramaları için çözünürlük"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr ""
-"Fotoğrafları tararken kullanılacak inç başına nokta sayısı cinsinden "
-"çözünürlük."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
-msgid "Page side to scan"
-msgstr "Taranacak sayfa tarafı"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
-msgid "The page side to scan."
-msgstr "Taranacak sayfa yüzü."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
-msgid "Directory to save files to"
-msgstr "Dosyaların kaydedileceği dizin"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
-msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
-msgstr ""
-"Dosyaların kaydedileceği dizin. Ayarlanmadıysa, belgeler dizini "
-"varsayılandır."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
-msgid "Quality value to use for JPEG compression"
-msgstr "JPEG sıkıştırması için kalite değeri"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Quality value to use for JPEG compression."
-msgstr "JPEG sıkıştırması için kalite değeri"
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+#: data/simple-scan.appdata.xml.in:8
 msgid ""
 "A really easy way to scan both documents and photos. You can crop out the "
 "bad parts of a photo and rotate it if it is the wrong way round. You can "
@@ -418,198 +317,166 @@ msgid ""
 "formats."
 msgstr ""
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+#: data/simple-scan.appdata.xml.in:13
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
+"Basit Tarayıcı mevcut bir çok tarayıcı desteği için SANE altyapısını "
+"kullanır."
 
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Mevcut hiçbir tarayıcı yok. Lütfen bir tarayıcı bağlayın."
 
-#. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "Tarayıcıya bağlanılamadı"
 
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "Tarama başlatılamadı"
 
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1236 src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr "Tarayıcı ile iletişim kurulamıyor"
 
-#. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "Dağıtım sürümünü göster"
 
-#. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr "Hata ayıklama iletilerini yazdır"
 
-#: ../src/simple-scan.vala:26
+#: src/simple-scan.vala:26
 msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr "Basit Tarama'nın eski sürümlerince üretilen PDF dosyalarını düzelt"
 
-#. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:391
+#: src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Tarama başarısız oldu"
 
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[AYGIT...] - Tarama uygulaması"
 
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Kullanılabilir komut satırı seçeneklerinin tam listesini görmek için '%s --"
 "help' komutunu çalıştırın."
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:318 src/ui.vala:1602 src/ui.vala:1887
 msgid "_Close"
 msgstr "_Kapat"
 
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:327
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "'%s' kaynağına erişmek için kullanıcı adı ve parola gerekiyor"
 
-#. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:375
 msgid "No scanners detected"
 msgstr "Tarayıcı bulunamadı"
 
-#. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:377
 msgid "Please check your scanner is connected and powered on"
 msgstr "Lütfen tarayıcınızın bağlı ve açık olduğundan emin olun"
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:382
 msgid "Additional software needed"
-msgstr ""
+msgstr "Ek yazılıma ihtiyaç var"
 
-#. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:384
 msgid "You need to install driver software for your scanner."
-msgstr ""
+msgstr "Tarayıcınız için ek sürücü yazılımını kurmanız gerekir."
 
-#. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:506 src/ui.vala:1843
 msgid "Save As..."
 msgstr "Farklı Kaydet..."
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:509 src/ui.vala:675
 msgid "_Cancel"
 msgstr "_Vazgeç"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:510 src/ui.vala:676
 msgid "_Save"
 msgstr "_Kaydet"
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "Taranan Belge.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:521
 msgid "Image Files"
 msgstr "Resim Dosyaları"
 
-#. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:527
 msgid "All Files"
 msgstr "Tüm Dosyalar"
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (çok sayfalı belge)"
 
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (sıkıştırılmış)"
 
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (kayıpsız)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:557
 msgid "File format:"
-msgstr ""
+msgstr "Dosya biçimi:"
 
-#. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:650
 msgid "Failed to save file"
 msgstr "Dosya kaydedilemedi"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:673
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Eğer kaydetmezseniz, değişiklikler tamamen kaybedilecek."
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:708
+#: src/ui.vala:708
 msgid "Save current document?"
 msgstr "Mevcut belgeyi kaydet?"
 
-#. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:710
 msgid "Discard Changes"
 msgstr "Değişiklikleri Geri Al"
 
-#. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "Görüntü, önizleme için kaydedilemiyor"
 
-#. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "Görüntü ön izleme uygulaması açılamıyor"
 
-#. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1206
 msgid "Combine sides"
 msgstr "Yüzleri birleştir"
 
-#. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr "Yüzleri birleştir (ters)"
 
-#. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1226
 msgid "Reverse"
 msgstr "Tersine çevir"
 
-#. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr "Değiştirmeden bırak"
 
-#. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "Yardım dosyası açılamıyor"
 
-#. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1472
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -637,17 +504,15 @@ msgstr ""
 "olmalısınız.\n"
 "Eğer almadıysanız bile şuraya bakınız: <http://www.gnu.org/licenses/>"
 
-#. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "Basit Tarama Hakkında"
 
-#. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "Basit bir belge tarama aracı"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -666,195 +531,179 @@ msgstr ""
 "  Volkan Gezer https://launchpad.net/~volkangezer\n"
 "  Yalçın Can https://launchpad.net/~yalcin.can\n"
 "  aries https://launchpad.net/~sonagirbas\n"
+"  kelebek333 https://launchpad.net/~kelebek333\n"
 "  kulkke https://launchpad.net/~kulkke\n"
 "  mandza https://launchpad.net/~filmovi\n"
 "  ubuntuki https://launchpad.net/~aleverzurumlu\n"
 "  İbrahim Çelik https://launchpad.net/~ibrahimcelik89"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "Çıkmadan önce belgeyi kaydet?"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "Kaydetmeden Çık"
 
-#. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
-msgstr ""
+msgstr "Bir Brother tarayıcıya sahip olduğunuz görünüyor."
 
-#. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1581
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
 msgstr ""
+"Bunun sürücüleri <a href=\"http://support.brother.com\">Brother "
+"websitesinde</a> mevcuttur."
 
-#. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
-msgstr ""
+msgstr "Bir Samsung tarayıcıya sahip olduğunuz görünüyor."
 
-#. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1587
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
 msgstr ""
+"Bunun sürücüleri <a href=\"http://samsung.com/support\">Samsung "
+"websitesinde</a> mevcuttur."
 
-#. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1591
 msgid "You appear to have an HP scanner."
-msgstr ""
+msgstr "Bir HP tarayıcıya sahip olduğunuz görünüyor."
 
-#. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
-msgstr ""
+msgstr "Bir Epson tarayıcıya sahip olduğunuz görünüyor."
 
-#. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1598
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
 msgstr ""
+"Bunun sürücüleri <a href=\"http://samsung.com/support\">Epson "
+"websitesinde</a> mevcuttur."
 
-#. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1602
 msgid "Install drivers"
-msgstr ""
+msgstr "Sürücüleri kur"
 
-#. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
-#. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1645
 msgid "Installing drivers..."
-msgstr ""
+msgstr "Sürücüler kuruluyor..."
 
-#. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1653
 msgid "Drivers installed successfully!"
-msgstr ""
+msgstr "Sürücüler başarıyla kuruldu!"
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
-msgstr ""
+msgstr "Sürücülerin kurulumu başarısız oldu (error code %d)."
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1669
 msgid "Failed to install drivers."
-msgstr ""
+msgstr "Sürücülerin kurulumu başarısız oldu."
 
-#. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1676
 #, c-format
 msgid "You need to install the %s package(s)."
-msgstr ""
+msgstr "%s paket kurulmasına ihtiyacınız var."
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (varsayılan)"
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (taslak)"
 
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (yüksek çözünürlük)"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/ui.vala:1793
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1835
 msgid "New Document"
 msgstr "Yeni Belge"
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1840
 msgid "Document"
 msgstr "Belge"
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1844
 msgid "Email..."
 msgstr "E-Posta..."
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1845
 msgid "Print..."
 msgstr "Yazdır..."
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1853
 msgid "Help"
 msgstr "Yardım"
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1854
 msgid "About"
 msgstr "Hakkında"
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1855
 msgid "Quit"
 msgstr "Çık"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "_Tarayıcı Değiştir"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1891
 msgid "_Install Drivers"
-msgstr ""
+msgstr "Sürücüleri _Kur"
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1897
 msgid "Automatic"
 msgstr "Otomatik"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1947
 msgid "Darker"
 msgstr "Daha Koyu"
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1949
 msgid "Lighter"
 msgstr "Daha Açık"
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:1957
 msgid "Less"
 msgstr "Daha Az"
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:1959
 msgid "More"
 msgstr "Daha Fazla"
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:1967
 msgid "Minimum"
 msgstr "En Az"
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:1969
 msgid "Maximum"
 msgstr "En Çok"
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2008
 msgid "Saving document..."
 msgstr "Belge kaydediliyor..."
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Kaydedilen sayfa: %d / %d"
@@ -923,9 +772,21 @@ msgstr "Kaydedilen sayfa: %d / %d"
 #~ "  -help-all Tüm yardım seçeneklerini göster\n"
 #~ "  --help-gtk GTK+ seçeneklerini göster"
 
+#~ msgid "Device to scan from"
+#~ msgstr "Tarama yapılacak aygıt"
+
 #~ msgid "Direction of scan"
 #~ msgstr "Tarama yönü"
 
+#~ msgid "Resolution for text scans"
+#~ msgstr "Metin taramaları için çözünürlük"
+
+#~ msgid "Resolution for photo scans"
+#~ msgstr "Fotoğraf taramaları için çözünürlük"
+
+#~ msgid "Directory to save files to"
+#~ msgstr "Dosyaların kaydedileceği dizin"
+
 #~ msgid "Height of scanned image in pixels"
 #~ msgstr "Taranan görüntünün piksel cinsinden yüksekliği"
 
@@ -943,6 +804,13 @@ msgstr "Kaydedilen sayfa: %d / %d"
 #~ "Taranan görüntünün piksel cinsinden yüksekliği. Bu değer en son taranan "
 #~ "sayfaya göre güncellenir."
 
+#~ msgid "SANE device to acquire images from."
+#~ msgstr "Görüntülerin alınacağı SANE aygıtı"
+
+#~ msgid "The resolution in dots-per-inch to use when scanning text."
+#~ msgstr ""
+#~ "Metin tararken kullanılacak inç başına nokta sayısı cinsinden çözünürlük."
+
 #~ msgid "The resolution in dots-per-inch of the previously scanned image."
 #~ msgstr ""
 #~ "Bir önceki taranan görüntünün inç başına nokta sayısı cinsinden çözünürlüğü."
@@ -950,6 +818,17 @@ msgstr "Kaydedilen sayfa: %d / %d"
 #~ msgid "Resolution of last scanned image"
 #~ msgstr "En son taranan görüntünün çözünürlüğü"
 
+#~ msgid "The resolution in dots-per-inch to use when scanning photos."
+#~ msgstr ""
+#~ "Fotoğrafları tararken kullanılacak inç başına nokta sayısı cinsinden "
+#~ "çözünürlük."
+
+#~ msgid ""
+#~ "The directory to save files to. Defaults to the documents directory if unset."
+#~ msgstr ""
+#~ "Dosyaların kaydedileceği dizin. Ayarlanmadıysa, belgeler dizini "
+#~ "varsayılandır."
+
 #~ msgid ""
 #~ "The width of scanned image in pixels. This value is updated to what the last "
 #~ "scanned page was."
@@ -957,6 +836,9 @@ msgstr "Kaydedilen sayfa: %d / %d"
 #~ "Taranan görüntünün piksel cinsinden genişliği. Bu değer en son taranan "
 #~ "sayfaya göre güncellenir."
 
+#~ msgid "Type of document being scanned"
+#~ msgstr "Taranacak belgenin türü"
+
 #~ msgid ""
 #~ "Type of document being scanned. 'text' for text documents, 'photo' for "
 #~ "photos. This setting decides on the scan resolution, colors and post-"
@@ -972,14 +854,65 @@ msgstr "Kaydedilen sayfa: %d / %d"
 #~ msgid "Select File _Type"
 #~ msgstr "Dosya _Türünü Seç"
 
+#~ msgid "Page side to scan"
+#~ msgstr "Taranacak sayfa tarafı"
+
 #~ msgid ""
 #~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
 #~ msgstr ""
 #~ "Taranacak sayfa tarafı. Şu seçeneklerden biri olabilir: 'her iki taraf' 'ön "
 #~ "taraf' 'arka taraf'"
 
+#~ msgid ""
+#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr ""
+#~ "Ondabirlik mm cinsinden kağıdın yüksekliği ( ya da otomatik kağıt tespiti "
+#~ "için 0)."
+
+#~ msgid "Height of paper in tenths of a mm"
+#~ msgstr "Ondabirlik mm cinsinden kağıdın yüksekliği"
+
+#~ msgid ""
+#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr ""
+#~ "Ondabirlik mm cinsinden kağıdın genişliği ( ya da otomatik kağıt tespiti "
+#~ "için 0)."
+
+#~ msgid "Width of paper in tenths of a mm"
+#~ msgstr "Ondabirlik mm cinsinden kağıdın genişliği"
+
 #~ msgid "TRUE if the application window is maximized"
 #~ msgstr "Uygulama penceresi ekranı kapladığında DOĞRU (TRUE)"
 
+#~ msgid ""
+#~ "Type of document being scanned. This setting decides on the scan resolution, "
+#~ "colors and post-processing."
+#~ msgstr ""
+#~ "Taranacak belge türü. Bu ayar tarama kalitesi, renkler ve son işlemlere göre "
+#~ "belirlenir."
+
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "Tarayıcının taranmış sayfa boyunca yönü."
+
+#~ msgid "The page side to scan."
+#~ msgstr "Taranacak sayfa yüzü."
+
+#~ msgid "Brightness of scan"
+#~ msgstr "Tarama parlaklığı"
+
+#~ msgid "Quality value to use for JPEG compression."
+#~ msgstr "JPEG sıkıştırması için kalite değeri"
+
+#~ msgid "Quality value to use for JPEG compression"
+#~ msgstr "JPEG sıkıştırması için kalite değeri"
+
+#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
+#~ msgstr "-100'den 100'e (0 hiçbiri) karşıtlık ayarlaması"
+
+#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
+#~ msgstr "-100'den 100'e (0 hiçbiri) parlaklık ayarlaması"
+
+#~ msgid "Contrast of scan"
+#~ msgstr "Tarama karşıtlığı"
diff --git a/po/ug.gmo b/po/ug.gmo
new file mode 100644
index 0000000..9f8c194
--- /dev/null
+++ b/po/ug.gmo
diff --git a/po/ug.po b/po/ug.po
index 888a0d2..44cc0ee 100644
--- a/po/ug.po
+++ b/po/ug.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-06 14:16+1200\n"
+"POT-Creation-Date: 2016-07-29 12:47+1200\n"
 "PO-Revision-Date: 2012-08-07 01:17+0000\n"
 "Last-Translator: Sahran <Unknown>\n"
 "Language-Team: Uyghur Computer Science Association <ubuntu-l10n-"
@@ -15,402 +15,304 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-04-14 05:40+0000\n"
-"X-Generator: Launchpad (build 17990)\n"
+"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 "X-Poedit-Language: Uighur\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
 #. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:2
+#: data/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "كىملىك دەلىللە(_A)"
 
 #. Label beside username entry
-#: ../data/simple-scan.ui.h:4
+#: data/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "مەنبەنىڭ ئىشلەتكۈچى ئاتى(_U):"
 
 #. Label beside password entry
-#: ../data/simple-scan.ui.h:6
+#: data/simple-scan.ui:117
 msgid "_Password:"
 msgstr "ئىم(_P):"
 
 #. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:8
+#: data/simple-scan.ui:188
 msgid "Front and Back"
 msgstr "ئالدى-كەينى"
 
 #. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:10
+#: data/simple-scan.ui:192
 msgid "Front"
 msgstr "ئالدى"
 
 #. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:12
+#: data/simple-scan.ui:196
 msgid "Back"
 msgstr "كەينى"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
-#: ../data/appdata/simple-scan.appdata.xml.in.h:1
+#: data/simple-scan.ui:225 data/simple-scan.ui:809
+#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr "ئاددىي شويلىلاش"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:16
+#: data/simple-scan.ui:241
 msgid "_Document"
 msgstr "پۈتۈك(_D)"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:18
+#: data/simple-scan.ui:260
 msgid "Sc_an"
 msgstr "شويلىلا(_A)"
 
+#. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:20
+#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
 msgid "Single _Page"
 msgstr "بىرلا بەت(_P)"
 
+#. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:22
+#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr "كىرگۈزۈلگەن ھەممە بەتلەر(_F)"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:24
+#: data/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "شويلىلاشنى توختات(_S)"
 
-#: ../data/simple-scan.ui.h:25
+#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
 msgid "Text"
 msgstr "تېكىست"
 
-#: ../data/simple-scan.ui.h:26
+#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
 msgid "Photo"
 msgstr "سۈرەت"
 
 #. Menu item to reorder pages
-#. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1183 ../src/ui.vala:1841
+#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr "بەتلەرنى قايتا تىزىش"
 
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: data/simple-scan.ui:367
 msgid "_Email"
 msgstr "ئېلخەت(_E)"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: data/simple-scan.ui:430
 msgid "_Page"
 msgstr "بەت(_P)"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: data/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "سولغا چۆرگىلەت(_L)"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: data/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "ئوڭغا چۆرگىلەت(_R)"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: data/simple-scan.ui:460
 msgid "_Crop"
 msgstr "قىرقى(_C)"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: data/simple-scan.ui:470
 msgid "_None"
 msgstr "يوق(_N)"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: data/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: data/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: data/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: data/simple-scan.ui:514
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: data/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "US Legal(_G)"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: data/simple-scan.ui:536
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: data/simple-scan.ui:547
 msgid "_Custom"
 msgstr "ئىختىيارى(_C)"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: data/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr "قىرقىغاننى چۆرگىلەت(_R)"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: data/simple-scan.ui:578
 msgid "Move Left"
 msgstr ""
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: data/simple-scan.ui:587
 msgid "Move Right"
 msgstr "ئوڭغا يۆتكە"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: data/simple-scan.ui:624
 msgid "_Help"
 msgstr "ياردەم(_H)"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: data/simple-scan.ui:632
 msgid "_Contents"
 msgstr "مەزمۇنلار(_C)"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: data/simple-scan.ui:674 data/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "يېڭى ھۆججەت قۇرىدۇ"
 
-#: ../data/simple-scan.ui.h:67
+#: data/simple-scan.ui:675
 msgid "New"
 msgstr "يېڭى"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: data/simple-scan.ui:689 data/simple-scan.ui:836
 msgid "Scan a single page from the scanner"
 msgstr "شويلىلىغۇچتىن پەقەت بىر بەتنىلا شويلىلايدۇ"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: data/simple-scan.ui:691 data/simple-scan.ui:837
 msgid "Scan"
 msgstr "شويلىلاش"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: data/simple-scan.ui:707 data/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "پۈتۈكنى ھۆججەتكە ساقلايدۇ"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1842
+#: data/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "ساقلا"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: data/simple-scan.ui:724 data/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "نۆۋەتتىكى شويلىلاش باسقۇچىنى توختىتىدۇ"
 
-#: ../data/simple-scan.ui.h:77
+#: data/simple-scan.ui:725 data/simple-scan.ui:825
 msgid "Stop"
 msgstr "توختا"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: data/simple-scan.ui:749 data/simple-scan.ui:936
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "بەتنى سولغا چۆرگىلىتىدۇ(سائەت يۆلىنىشىگە قارشى)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: data/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "سولغا چۆرگىلەت"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: data/simple-scan.ui:764 data/simple-scan.ui:914
 msgid "Rotate the page to the right (clockwise)"
 msgstr "بەتنى ئوڭغا چۆرگىلىتىدۇ (سائەت يۆلىنىشىدە)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: data/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "ئوڭغا چۆرگىلەت"
 
-#: ../data/simple-scan.ui.h:86
+#: data/simple-scan.ui:779 data/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "تاللانغان بەتنى قىرقىيدۇ"
 
-#: ../data/simple-scan.ui.h:87
+#: data/simple-scan.ui:781
 msgid "Crop"
 msgstr "قىرقى"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1849
+#: data/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "مايىللىق"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: data/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "شويلىلاش مەنبەسى(_O):"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: data/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "تېكىست ئېنىقلىقى(_T):"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: data/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "سۈرەت ئېنىقلىقى(_P):"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: data/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "شويلىلايدىغان يۈزى:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: data/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "قەغەز چوڭلۇقى:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: data/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "يورۇقلۇقى:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: data/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "سېلىشتۇرما دەرىجىسى:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: data/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "سۈپىتى:"
 
-#: ../data/simple-scan.desktop.in.h:2
+#: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:3
+#: data/simple-scan.desktop.in:5
 msgid "Scan Documents"
 msgstr "پۈتۈك شويلىلاش"
 
-#: ../data/simple-scan.desktop.in.h:4
+#: data/simple-scan.desktop.in:6
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Device to scan from"
-msgstr "شويلىلايدىغان ئۈسكۈنە"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "SANE device to acquire images from."
-msgstr "رەسىمگە ئېرىشىدىغان SANE ئۈسكۈنىسى."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "Type of document being scanned"
-msgstr "شويلىلانغان پۈتۈكنىڭ تىپى"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
-msgid ""
-"Type of document being scanned. This setting decides on the scan resolution, "
-"colors and post-processing."
+#: data/simple-scan.desktop.in:8
+msgid "scanner"
 msgstr ""
-"ھۆججەت تىپى تەكشۈرۈلۈۋاتىدۇ، بۇ تەڭشەك بولسا ئېنىقلىق دەرىجىسى، رەڭگى ۋە "
-"كېيىنكى بىرتەرەپ قىلىشنى بېكىتىدۇ."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
-msgid "Width of paper in tenths of a mm"
-msgstr "قەغەزنىڭ ئوندىن بىر مىللىمېتىرلىق كەڭلىكى"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-"قەغەزنىڭ ئوندىن بىر مىللىمېتىرلىق كەڭلىكى (ياكى قەغەزنى ئۆزلۈكىدىن بايقاش "
-"ئۈچۈن 0 )"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
-msgid "Height of paper in tenths of a mm"
-msgstr "قەغەز ئېگىزلىكى (mm 0.1 ئېنىقلىقىدا)"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-"قەغەزنىڭ ئوندىن بىر مىللىمېتىرلىق ئېگىزلىكى (ياكى قەغەزنى ئۆزلۈكىدىن بايقاش "
-"ئۈچۈن 0 )"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "Brightness of scan"
-msgstr "شويلىلاش يورۇقلۇقى"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "The brightness adjustment from -100 to 100 (0 being none)."
-msgstr "يورۇقلۇق تەڭشىكى -100 دىن 100 گىچە(0 تەڭشەلمىگەن)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid "Contrast of scan"
-msgstr "شويلىلاش ئاق-قارىلىقى"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "The contrast adjustment from -100 to 100 (0 being none)."
-msgstr "ئاق-قارىلىق تەڭشىكى -100 دىن 100 گىچە(0 تەڭشەلمىگەن)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid "Resolution for text scans"
-msgstr "تېكىست شويلىلاشنىڭ ئېنىقلىقى"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
-msgid "The resolution in dots-per-inch to use when scanning text."
-msgstr "DPI (چېكىت ھەر دىيۇيم) تېكىستلەرگە ئىشلىتىدىغان قىممەت"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
-msgid "Resolution for photo scans"
-msgstr "سۈرەت شويلىلاشنىڭ ئېنىقلىقى"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr "DPI (چېكىت ھەر دىيۇيم) سۈرەتلەرگە ئىشلىتىدىغان قىممەت"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
-msgid "Page side to scan"
-msgstr "شويلىلايدىغان بەت يۈزى"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
-msgid "The page side to scan."
-msgstr "شويلىلايدىغان بەت يۈزى."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
-msgid "Directory to save files to"
-msgstr "ھۆججەتنى ساقلايدىغان مۇندەرىجە"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
-msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
-msgstr ""
-"ھۆججەتنى ساقلايدىغان مۇندەرىجە. بەلگىلەنمىگەن ۋاقىتتا ئىشلىتىدىغان "
-"مۇندەرىجىدۇر."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
-msgid "Quality value to use for JPEG compression"
-msgstr "JPEG پرېسىنىڭ سۈپىتىنى بەلگىلەيدىغان قىممەت"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Quality value to use for JPEG compression."
-msgstr "JPEG پرېسىنىڭ سۈپىتىنى بەلگىلەيدىغان قىممىتى."
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+#: data/simple-scan.appdata.xml.in:8
 msgid ""
 "A really easy way to scan both documents and photos. You can crop out the "
 "bad parts of a photo and rotate it if it is the wrong way round. You can "
@@ -418,198 +320,164 @@ msgid ""
 "formats."
 msgstr ""
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+#: data/simple-scan.appdata.xml.in:13
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr "شويلىلىغۇچ مەۋجۇت ئەمەس. شويلىلىغۇچنى چېتىڭ."
 
-#. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "شويلىلىغۇچقا باغلانغىلى بولمىدى"
 
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "شويلىلاشنى باشلىغىلى بولمىدى"
 
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1236 src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr "شويلىلىغۇچ بىلەن ئالاقە باغلاشتا خاتالىق كۆرۈلدى"
 
-#. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "نەشرىنى كۆرسەت"
 
-#. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr "سازلاش ئۇچۇرلىرىنى كۆرسەت"
 
-#: ../src/simple-scan.vala:26
+#: src/simple-scan.vala:26
 msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr ""
 "كونا نەشردىكى «ئاددىي شويلىلاش»  ئارقىلىق ياسالغان PDF ھۆججىتىنى ئوڭلاش"
 
-#. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:391
+#: src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "شويلىلاش مەغلۇپ بولدى"
 
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[ئۈسكۈنە...] - شويلىلاش قورالى."
 
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "'%s --help' ئىجرا قىلىنسا بۇيرۇق قۇرى تاللانمىسىنىڭ تولۇق تىزىمى كۆرۈنىدۇ."
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:318 src/ui.vala:1602 src/ui.vala:1887
 msgid "_Close"
 msgstr "ياپ(_C)"
 
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:327
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "‹%s› كىرىش ئۈچۈن ئىشلەتكۈچى نامى ۋە مەخپىي نومۇر كېرەك"
 
-#. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:375
 msgid "No scanners detected"
 msgstr "شويلىلىغۇچ تېپىلمىدى"
 
-#. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:377
 msgid "Please check your scanner is connected and powered on"
 msgstr "شويلىلىغۇچ چېتىلغانمۇ توكى ئۇلانغانمۇ تەكشۈرۈڭ"
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:382
 msgid "Additional software needed"
 msgstr ""
 
-#. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr ""
 
-#. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:506 src/ui.vala:1843
 msgid "Save As..."
 msgstr "باشقا ئاتتا ساقلا…"
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:509 src/ui.vala:675
 msgid "_Cancel"
 msgstr "ئەمەلدىن قالدۇر(_C)"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:510 src/ui.vala:676
 msgid "_Save"
 msgstr "ساقلا(_S)"
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "شويلىلانغان Document.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:521
 msgid "Image Files"
 msgstr "سۈرەت ھۆججەتلىرى"
 
-#. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:527
 msgid "All Files"
 msgstr "بارلىق ھۆججەتلەر"
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (كۆپ بەتلىك پۈتۈكلەر)"
 
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (پرېسلانغان)"
 
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (خورىماس)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:557
 msgid "File format:"
 msgstr ""
 
-#. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:650
 msgid "Failed to save file"
 msgstr "ھۆججەتكە ساقلىغىلى بولمىدى"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:673
 msgid "If you don't save, changes will be permanently lost."
 msgstr "ساقلانمىسا، ئۆزگەرتىشلەرنىڭ ھەممىسى مەڭگۈلۈككە يوقىلىدۇ"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:708
+#: src/ui.vala:708
 msgid "Save current document?"
 msgstr "ھازىرقى پۈتۈكنى ساقلىسۇنمۇ؟"
 
-#. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:710
 msgid "Discard Changes"
 msgstr "ئۆزگەرتىشنى تاشلىۋەت"
 
-#. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "ئالدىن كۆرىدىغان رەسىمنى ساقلىغىلى بولمىدى."
 
-#. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "رەسىمنى ئالدىن كۆرۈش پروگراممىسىنى قوزغاتقىلى بولمىدى"
 
-#. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1206
 msgid "Combine sides"
 msgstr "تەرەپلەرنى بىرىكتۈرۈش"
 
-#. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr "تەرەپلەرنى بىرىكتۈرۈش(ئەسكىچە)"
 
-#. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1226
 msgid "Reverse"
 msgstr "ئەكسىچە"
 
-#. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr "ئۆزگەرمىسۇن"
 
-#. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "ياردەم ھۆججىتىنى ئاچقىلى بولمىدى"
 
-#. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1472
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -639,17 +507,15 @@ msgstr ""
 "نىڭ كۆچۈرمىسىگە ئېرىشكەن بۆلىشىڭىز مۇمكىن، بولمىسا ئۇنى \n"
 "<http://www.gnu.org/licenses/> دا تاپالايسىز."
 
-#. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "«ئاددىي شويلىلاش» ھەققىدە"
 
-#. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "ئاددىي پۈتۈك شويلىلاش قورالى"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -662,190 +528,167 @@ msgstr ""
 "  azimat https://launchpad.net/~azimat-uigur\n"
 "  umar tumur https://launchpad.net/~umar-tumur"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "ئاخىرلاشتۇرۇشتىن ئاۋۋال ھازىرقى پۈتۈكنى ساقلىسۇنمۇ؟"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "ساقلىماي ئاخىرلاشتۇر"
 
-#. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
-#. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1581
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
 msgstr ""
 
-#. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
-#. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1587
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
 msgstr ""
 
-#. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr ""
 
-#. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
-#. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1598
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
 msgstr ""
 
-#. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1602
 msgid "Install drivers"
 msgstr ""
 
-#. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
-#. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr ""
 
-#. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr ""
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr ""
 
-#. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1676
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr ""
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (كۆڭۈلدىكى)"
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (دەسلەپكى نۇسخا)"
 
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (يۇقىرى ئېنىقلىق)"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/ui.vala:1793
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1835
 msgid "New Document"
 msgstr "يېڭى پۈتۈك"
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1840
 msgid "Document"
 msgstr "پۈتۈك"
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1844
 msgid "Email..."
 msgstr "ئېلخەت…"
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1845
 msgid "Print..."
 msgstr "باس…"
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1853
 msgid "Help"
 msgstr "ياردەم"
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1854
 msgid "About"
 msgstr "ھەققىدە"
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1855
 msgid "Quit"
 msgstr "ئاخىرلاشتۇر"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "شويلىلىغۇچنى ئالماشتۇرۇڭ(_S)"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr ""
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1897
 msgid "Automatic"
 msgstr "ئاپتوماتىك"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1947
 msgid "Darker"
 msgstr "قارىراق"
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1949
 msgid "Lighter"
 msgstr "يورۇقراق"
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:1957
 msgid "Less"
 msgstr "كىچىك"
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:1959
 msgid "More"
 msgstr "تېخىمۇ كۆپ"
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:1967
 msgid "Minimum"
 msgstr "ئەڭ كىچىك"
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:1969
 msgid "Maximum"
 msgstr "ئەڭ چوڭ"
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2008
 msgid "Saving document..."
 msgstr "پۈتۈكنى ساقلاۋاتىدۇ…"
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "ساقلاۋاتقىنى %d/%d - بەت"
@@ -917,6 +760,23 @@ msgstr "ساقلاۋاتقىنى %d/%d - بەت"
 #~ msgid "Files missing"
 #~ msgstr "ھۆججەت تېپىلمىدى"
 
+#~ msgid ""
+#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr ""
+#~ "قەغەزنىڭ ئوندىن بىر مىللىمېتىرلىق ئېگىزلىكى (ياكى قەغەزنى ئۆزلۈكىدىن بايقاش "
+#~ "ئۈچۈن 0 )"
+
+#~ msgid ""
+#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr ""
+#~ "قەغەزنىڭ ئوندىن بىر مىللىمېتىرلىق كەڭلىكى (ياكى قەغەزنى ئۆزلۈكىدىن بايقاش "
+#~ "ئۈچۈن 0 )"
+
+#~ msgid "Width of paper in tenths of a mm"
+#~ msgstr "قەغەزنىڭ ئوندىن بىر مىللىمېتىرلىق كەڭلىكى"
+
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "تەسۋىر ئالغۇچ تەسۋىرگە ئېلىنىپ بولغان بەتتىن ئۆتىدۇ."
 
@@ -958,6 +818,70 @@ msgstr "ساقلاۋاتقىنى %d/%d - بەت"
 #~ msgid "Resolution of last scanned image"
 #~ msgstr "ئاخىرقى قېتىم تەسۋىر يايغان رەسىمنىڭ ئېنىقلىقى"
 
+#~ msgid "Brightness of scan"
+#~ msgstr "شويلىلاش يورۇقلۇقى"
+
+#~ msgid "Device to scan from"
+#~ msgstr "شويلىلايدىغان ئۈسكۈنە"
+
+#~ msgid "SANE device to acquire images from."
+#~ msgstr "رەسىمگە ئېرىشىدىغان SANE ئۈسكۈنىسى."
+
+#~ msgid "Type of document being scanned"
+#~ msgstr "شويلىلانغان پۈتۈكنىڭ تىپى"
+
+#~ msgid ""
+#~ "Type of document being scanned. This setting decides on the scan resolution, "
+#~ "colors and post-processing."
+#~ msgstr ""
+#~ "ھۆججەت تىپى تەكشۈرۈلۈۋاتىدۇ، بۇ تەڭشەك بولسا ئېنىقلىق دەرىجىسى، رەڭگى ۋە "
+#~ "كېيىنكى بىرتەرەپ قىلىشنى بېكىتىدۇ."
+
+#~ msgid "Height of paper in tenths of a mm"
+#~ msgstr "قەغەز ئېگىزلىكى (mm 0.1 ئېنىقلىقىدا)"
+
+#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
+#~ msgstr "يورۇقلۇق تەڭشىكى -100 دىن 100 گىچە(0 تەڭشەلمىگەن)."
+
+#~ msgid "Contrast of scan"
+#~ msgstr "شويلىلاش ئاق-قارىلىقى"
+
+#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
+#~ msgstr "ئاق-قارىلىق تەڭشىكى -100 دىن 100 گىچە(0 تەڭشەلمىگەن)."
+
+#~ msgid "Resolution for text scans"
+#~ msgstr "تېكىست شويلىلاشنىڭ ئېنىقلىقى"
+
+#~ msgid "The resolution in dots-per-inch to use when scanning text."
+#~ msgstr "DPI (چېكىت ھەر دىيۇيم) تېكىستلەرگە ئىشلىتىدىغان قىممەت"
+
+#~ msgid "Resolution for photo scans"
+#~ msgstr "سۈرەت شويلىلاشنىڭ ئېنىقلىقى"
+
+#~ msgid "The resolution in dots-per-inch to use when scanning photos."
+#~ msgstr "DPI (چېكىت ھەر دىيۇيم) سۈرەتلەرگە ئىشلىتىدىغان قىممەت"
+
+#~ msgid "Page side to scan"
+#~ msgstr "شويلىلايدىغان بەت يۈزى"
+
+#~ msgid "The page side to scan."
+#~ msgstr "شويلىلايدىغان بەت يۈزى."
+
+#~ msgid "Directory to save files to"
+#~ msgstr "ھۆججەتنى ساقلايدىغان مۇندەرىجە"
+
+#~ msgid ""
+#~ "The directory to save files to. Defaults to the documents directory if unset."
+#~ msgstr ""
+#~ "ھۆججەتنى ساقلايدىغان مۇندەرىجە. بەلگىلەنمىگەن ۋاقىتتا ئىشلىتىدىغان "
+#~ "مۇندەرىجىدۇر."
+
+#~ msgid "Quality value to use for JPEG compression"
+#~ msgstr "JPEG پرېسىنىڭ سۈپىتىنى بەلگىلەيدىغان قىممەت"
+
+#~ msgid "Quality value to use for JPEG compression."
+#~ msgstr "JPEG پرېسىنىڭ سۈپىتىنى بەلگىلەيدىغان قىممىتى."
+
 #~ msgid "Scanned Document"
 #~ msgstr "شويلىلانغان ھۆججەت"
 
diff --git a/po/uk.gmo b/po/uk.gmo
new file mode 100644
index 0000000..189c0ba
--- /dev/null
+++ b/po/uk.gmo
diff --git a/po/uk.po b/po/uk.po
index 33dd1f1..790b33c 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,406 +7,310 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-06 14:16+1200\n"
+"POT-Creation-Date: 2016-07-29 12:47+1200\n"
 "PO-Revision-Date: 2012-07-23 11:28+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@gmail.com>\n"
 "Language-Team: Ukrainian <translation@linux.org.ua>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-04-14 05:40+0000\n"
-"X-Generator: Launchpad (build 17990)\n"
+"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 
 #. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:2
+#: data/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_Уповноваження"
 
 #. Label beside username entry
-#: ../data/simple-scan.ui.h:4
+#: data/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "_Користувач ресурсу:"
 
 #. Label beside password entry
-#: ../data/simple-scan.ui.h:6
+#: data/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Пароль:"
 
 #. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:8
+#: data/simple-scan.ui:188
 msgid "Front and Back"
 msgstr "Передній і зворотний боки"
 
 #. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:10
+#: data/simple-scan.ui:192
 msgid "Front"
 msgstr "Передній бік"
 
 #. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:12
+#: data/simple-scan.ui:196
 msgid "Back"
 msgstr "Зворот"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
-#: ../data/appdata/simple-scan.appdata.xml.in.h:1
+#: data/simple-scan.ui:225 data/simple-scan.ui:809
+#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr "Просте сканування"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:16
+#: data/simple-scan.ui:241
 msgid "_Document"
 msgstr "Д_окумент"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:18
+#: data/simple-scan.ui:260
 msgid "Sc_an"
 msgstr "С_канування"
 
+#. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:20
+#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
 msgid "Single _Page"
 msgstr "Одинарна _сторінка"
 
+#. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:22
+#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr "Всі сторінки з _лотка"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:24
+#: data/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "П_рипинити сканування"
 
-#: ../data/simple-scan.ui.h:25
+#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
 msgid "Text"
 msgstr "Текстовий"
 
-#: ../data/simple-scan.ui.h:26
+#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
 msgid "Photo"
 msgstr "Фотографія"
 
 #. Menu item to reorder pages
-#. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1183 ../src/ui.vala:1841
+#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr "Перевпорядкувати сторінки"
 
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: data/simple-scan.ui:367
 msgid "_Email"
 msgstr "_Надіслати ел. поштою"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: data/simple-scan.ui:430
 msgid "_Page"
 msgstr "С_торінка"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: data/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "Обернути _ліворуч"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: data/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "Обернути п_раворуч"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: data/simple-scan.ui:460
 msgid "_Crop"
 msgstr "_Обрізати"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: data/simple-scan.ui:470
 msgid "_None"
 msgstr "_Без обрізання"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: data/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: data/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: data/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: data/simple-scan.ui:514
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: data/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: data/simple-scan.ui:536
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: data/simple-scan.ui:547
 msgid "_Custom"
 msgstr "_Нетипові"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: data/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr "_Обернути область обрізання"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: data/simple-scan.ui:578
 msgid "Move Left"
 msgstr "Пересунути ліворуч"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: data/simple-scan.ui:587
 msgid "Move Right"
 msgstr "Пересунути праворуч"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: data/simple-scan.ui:624
 msgid "_Help"
 msgstr "_Довідка"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: data/simple-scan.ui:632
 msgid "_Contents"
 msgstr "_Вміст"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: data/simple-scan.ui:674 data/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "Почати новий документ"
 
-#: ../data/simple-scan.ui.h:67
+#: data/simple-scan.ui:675
 msgid "New"
 msgstr "Створити"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: data/simple-scan.ui:689 data/simple-scan.ui:836
 msgid "Scan a single page from the scanner"
 msgstr "Сканувати одну сторінку"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: data/simple-scan.ui:691 data/simple-scan.ui:837
 msgid "Scan"
 msgstr "Сканувати"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: data/simple-scan.ui:707 data/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "Зберегти документ до файла"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1842
+#: data/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "Зберегти"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: data/simple-scan.ui:724 data/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "Припинити поточне сканування"
 
-#: ../data/simple-scan.ui.h:77
+#: data/simple-scan.ui:725 data/simple-scan.ui:825
 msgid "Stop"
 msgstr "Зупинити"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: data/simple-scan.ui:749 data/simple-scan.ui:936
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Обертати сторінку ліворуч (проти годинникової стрілки)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: data/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "Обернути ліворуч"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: data/simple-scan.ui:764 data/simple-scan.ui:914
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Обертати сторінку праворуч (за годинниковою стрілкою)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: data/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "Обернути праворуч"
 
-#: ../data/simple-scan.ui.h:86
+#: data/simple-scan.ui:779 data/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "Обрізати позначену сторінку"
 
-#: ../data/simple-scan.ui.h:87
+#: data/simple-scan.ui:781
 msgid "Crop"
 msgstr "Обрізати"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1849
+#: data/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "Налаштування"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: data/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "_Джерело даних сканування:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: data/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "Роздільна здатність _тексту:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: data/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "Роздільна здатність _фотографій:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: data/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "Бік сканування:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: data/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "Розмір сторінки:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: data/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "Яскравість:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: data/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "Контрастність:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: data/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "Якість:"
 
-#: ../data/simple-scan.desktop.in.h:2
+#: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr "Засіб для сканування документів"
 
-#: ../data/simple-scan.desktop.in.h:3
+#: data/simple-scan.desktop.in:5
 msgid "Scan Documents"
 msgstr "Сканувати документи"
 
-#: ../data/simple-scan.desktop.in.h:4
+#: data/simple-scan.desktop.in:6
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 "scan;scanner;flatbed;adf;сканування;сканер;планшет;двобічне;автоматичне;"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Device to scan from"
-msgstr "Пристрій сканування"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "SANE device to acquire images from."
-msgstr "Пристрій SANE, з якого слід отримувати зображення."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "Type of document being scanned"
-msgstr "Тип документа, який ви скануєте"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
-msgid ""
-"Type of document being scanned. This setting decides on the scan resolution, "
-"colors and post-processing."
+#: data/simple-scan.desktop.in:8
+msgid "scanner"
 msgstr ""
-"Тип документа, який сканується. За значенням цього параметра визначається "
-"роздільна здатність сканування, кольори та способи остаточної обробки."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
-msgid "Width of paper in tenths of a mm"
-msgstr "Ширина паперу у десятих міліметра"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-"Ширина паперу у десятих міліметра (або 0 для автоматичного визначення паперу)"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
-msgid "Height of paper in tenths of a mm"
-msgstr "Висота паперу у десятих міліметра"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-"Висота паперу у десятих міліметра (або 0 для автоматичного визначення паперу)"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "Brightness of scan"
-msgstr "Яскравість сканування"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "The brightness adjustment from -100 to 100 (0 being none)."
-msgstr "Коригування яскравості від -100 до 100 (0 — не коригувати)"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid "Contrast of scan"
-msgstr "Контрастність сканування"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "The contrast adjustment from -100 to 100 (0 being none)."
-msgstr "Коригування контрастності від -100 до 100 (0 — не коригувати)"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid "Resolution for text scans"
-msgstr "Роздільна здатність для сканування тексту"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
-msgid "The resolution in dots-per-inch to use when scanning text."
-msgstr "Роздільна здатність у точках на дюйм для сканування тексту."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
-msgid "Resolution for photo scans"
-msgstr "Роздільна здатність для сканування фотографій"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr "Роздільна здатність у точках на дюйм для сканування фотографій."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
-msgid "Page side to scan"
-msgstr "Бік сторінки, який слід сканувати"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
-msgid "The page side to scan."
-msgstr "Бік сторінки, який буде скановано."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
-msgid "Directory to save files to"
-msgstr "Каталог збережених файлів"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
-msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
-msgstr ""
-"Каталог, до якого слід зберігати файли. Якщо не буде вказано, типовим "
-"вважатиметься каталог документів."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
-msgid "Quality value to use for JPEG compression"
-msgstr "Значення якості, яке буде використано під час стискання JPEG"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Quality value to use for JPEG compression."
-msgstr "Значення якості, яке буде використано під час стискання JPEG."
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+#: data/simple-scan.appdata.xml.in:8
 msgid ""
 "A really easy way to scan both documents and photos. You can crop out the "
 "bad parts of a photo and rotate it if it is the wrong way round. You can "
@@ -419,203 +323,169 @@ msgstr ""
 "експортування даних до PDF та зберігання даних у файлах зображень "
 "різноманітних форматів."
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+#: data/simple-scan.appdata.xml.in:13
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 "Для роботи із більшістю сканерів у Simple Scan використовуються бібліотеки "
 "SANE."
 
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr ""
 "Не вдалося виявити жодного сканера. Будь ласка, з’єднайте сканер з "
 "комп’ютером."
 
-#. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "Не вдалося з’єднатися зі сканером"
 
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "Не вдалося розпочати сканування"
 
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1236 src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr "Помилка під час спроби обміну даними зі сканером"
 
-#. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "Показати версію випуску"
 
-#. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr "Показувати діагностичні повідомлення"
 
-#: ../src/simple-scan.vala:26
+#: src/simple-scan.vala:26
 msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr ""
 "Виправити файли PDF, створені за допомогою застарілих версій Simple Scan"
 
-#. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:391
+#: src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Помилка сканування"
 
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[ПРИСТРІЙ...] — програма для сканування"
 
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Виконайте « %s --help», щоб побачити повний перелік доступних параметрів "
 "командного рядка."
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:318 src/ui.vala:1602 src/ui.vala:1887
 msgid "_Close"
 msgstr "За_крити"
 
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:327
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Для доступу до «%s» слід вказати ім’я користувача та пароль"
 
-#. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:375
 msgid "No scanners detected"
 msgstr "Сканерів не виявлено"
 
-#. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:377
 msgid "Please check your scanner is connected and powered on"
 msgstr "Будь ласка, перевірте, чи з’єднано ваш сканер і чи увімкнено його"
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:382
 msgid "Additional software needed"
 msgstr "Потрібне додаткове програмне забезпечення"
 
-#. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr "Вам слід встановити драйвер до вашого сканера."
 
-#. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:506 src/ui.vala:1843
 msgid "Save As..."
 msgstr "Зберегти як..."
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:509 src/ui.vala:675
 msgid "_Cancel"
 msgstr "_Скасувати"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:510 src/ui.vala:676
 msgid "_Save"
 msgstr "З_берегти"
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "Сканований документ.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:521
 msgid "Image Files"
 msgstr "Файли зображень"
 
-#. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:527
 msgid "All Files"
 msgstr "Всі файли"
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (багатосторінковий документ)"
 
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (стиснений)"
 
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (без втрат)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:557
 msgid "File format:"
 msgstr "Формат файлів:"
 
-#. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:650
 msgid "Failed to save file"
 msgstr "Не вдалося зберегти файл"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:673
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Якщо ви не збережете внесені зміни, їх буде втрачено остаточно."
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:708
+#: src/ui.vala:708
 msgid "Save current document?"
 msgstr "Зберегти поточний документ?"
 
-#. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:710
 msgid "Discard Changes"
 msgstr "Відкинути зміни"
 
-#. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "Не вдалося зберегти зображення для попереднього перегляду"
 
-#. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "Не вдалося запустити програму для перегляду зображення"
 
-#. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1206
 msgid "Combine sides"
 msgstr "З’єднувати збоку"
 
-#. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr "З’єднувати збоку (у зворотному порядку)"
 
-#. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1226
 msgid "Reverse"
 msgstr "У зворотному порядку"
 
-#. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr "Не змінювати"
 
-#. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "Не вдалося відкрити файл довідки"
 
-#. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1472
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -643,17 +513,15 @@ msgstr ""
 "Якщо ви її не отримали, зверніться за адресою "
 "<http://www.gnu.org/licenses/>, щоб дізнатися про подальші дії."
 
-#. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "Про «Просте сканування»"
 
-#. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "Інструмент для спрощення сканування документів"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -663,23 +531,19 @@ msgstr ""
 "  passtas https://launchpad.net/~passtas\n"
 "  Микола Ткач https://launchpad.net/~stuartlittle1970"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "Зберегти документ перед виходом?"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "Вийти без збереження"
 
-#. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr "Здається, у вас сканер Brother."
 
-#. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1581
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
@@ -687,13 +551,11 @@ msgstr ""
 "Драйвери можна отримати на <a href=\"http://support.brother.com\">сайті "
 "Brother</a>."
 
-#. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr "Здається, у вас сканер Samsung."
 
-#. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1587
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
@@ -701,18 +563,15 @@ msgstr ""
 "Драйвери до таких сканерів можна отримати з <a "
 "href=\"http://samsung.com/support\">сайта Samsung</a>."
 
-#. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr "Здається, у вас сканер HP."
 
-#. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr "Здається, у вас сканер Epson."
 
-#. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1598
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
@@ -720,139 +579,125 @@ msgstr ""
 "Драйвери для цього доступні на <a href=\"http://support.epson.com\">Веб-"
 "сайті Epson</a>."
 
-#. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1602
 msgid "Install drivers"
 msgstr "Встановлення драйверів"
 
-#. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "Після встановлення драйверів, вам слід перезапустити Simple Scan."
 
-#. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr "Встановлюємо драйвери…"
 
-#. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr "Драйвери успішно встановлено!"
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Не вдалося встановити драйвери (код помилки %d)."
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr "Не вдалося встановити драйвери."
 
-#. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1676
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr "Необхідно встановити пакунок(-и) %s."
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d т/д (типова)"
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d т/д (чернетка)"
 
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d т/д (висока роздільність)"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/ui.vala:1793
 #, c-format
 msgid "%d dpi"
 msgstr "%d т/д"
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1835
 msgid "New Document"
 msgstr "Новий документ"
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1840
 msgid "Document"
 msgstr "Документ"
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1844
 msgid "Email..."
 msgstr "Надіслати ел. поштою…"
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1845
 msgid "Print..."
 msgstr "Надрукувати…"
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1853
 msgid "Help"
 msgstr "Довідка"
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1854
 msgid "About"
 msgstr "Про програму"
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1855
 msgid "Quit"
 msgstr "Вийти"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "З_мінити сканер"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr "_Встановити драйвери"
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1897
 msgid "Automatic"
 msgstr "Автоматично"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1947
 msgid "Darker"
 msgstr "темніше"
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1949
 msgid "Lighter"
 msgstr "світліше"
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:1957
 msgid "Less"
 msgstr "менше"
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:1959
 msgid "More"
 msgstr "більше"
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:1967
 msgid "Minimum"
 msgstr "Мінімальна"
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:1969
 msgid "Maximum"
 msgstr "Максимальна"
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2008
 msgid "Saving document..."
 msgstr "Збереження документа…"
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Зберігаємо сторінку %d з %d"
@@ -896,9 +741,15 @@ msgstr "Зберігаємо сторінку %d з %d"
 #~ msgid "Please check your installation"
 #~ msgstr "Будь ласка, перевірте, чи належним чином встановлено програму"
 
+#~ msgid "Device to scan from"
+#~ msgstr "Пристрій сканування"
+
 #~ msgid "Direction of scan"
 #~ msgstr "Напрямок сканування"
 
+#~ msgid "SANE device to acquire images from."
+#~ msgstr "Пристрій SANE, з якого слід отримувати зображення."
+
 #~ msgid "TRUE if the application window is maximized"
 #~ msgstr "Якщо позначено, вікно програми буде максимізовано"
 
@@ -910,6 +761,9 @@ msgstr "Зберігаємо сторінку %d з %d"
 #~ "(згори вниз), «bottom-to-top» (знизу вгору), «left-to-right» (зліва "
 #~ "праворуч), «right-to-left» (справа ліворуч)"
 
+#~ msgid "Type of document being scanned"
+#~ msgstr "Тип документа, який ви скануєте"
+
 #~ msgid ""
 #~ "Type of document being scanned. 'text' for text documents, 'photo' for "
 #~ "photos. This setting decides on the scan resolution, colors and post-"
@@ -961,6 +815,15 @@ msgstr "Зберігаємо сторінку %d з %d"
 #~ msgid "Width of scanned image in pixels"
 #~ msgstr "Ширина сканованого зображення у пікселях"
 
+#~ msgid "Resolution for photo scans"
+#~ msgstr "Роздільна здатність для сканування фотографій"
+
+#~ msgid "Resolution for text scans"
+#~ msgstr "Роздільна здатність для сканування тексту"
+
+#~ msgid "Directory to save files to"
+#~ msgstr "Каталог збережених файлів"
+
 #~ msgid "The resolution in dots-per-inch of the previously scanned image."
 #~ msgstr ""
 #~ "Роздільна здатність у точках на дюйм попереднього сканованого зображення."
@@ -968,6 +831,18 @@ msgstr "Зберігаємо сторінку %d з %d"
 #~ msgid "Resolution of last scanned image"
 #~ msgstr "Роздільна здатність попереднього сканованого зображення"
 
+#~ msgid "The resolution in dots-per-inch to use when scanning text."
+#~ msgstr "Роздільна здатність у точках на дюйм для сканування тексту."
+
+#~ msgid "The resolution in dots-per-inch to use when scanning photos."
+#~ msgstr "Роздільна здатність у точках на дюйм для сканування фотографій."
+
+#~ msgid ""
+#~ "The directory to save files to. Defaults to the documents directory if unset."
+#~ msgstr ""
+#~ "Каталог, до якого слід зберігати файли. Якщо не буде вказано, типовим "
+#~ "вважатиметься каталог документів."
+
 #~ msgid "Scanned Document"
 #~ msgstr "Сканований документ"
 
@@ -980,5 +855,54 @@ msgstr "Зберігаємо сторінку %d з %d"
 #~ "Бік паперу,  який слід сканувати. Може мати такі значення: 'both' 'front' "
 #~ "'back'"
 
+#~ msgid "Page side to scan"
+#~ msgstr "Бік сторінки, який слід сканувати"
+
+#~ msgid ""
+#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr ""
+#~ "Висота паперу у десятих міліметра (або 0 для автоматичного визначення паперу)"
+
+#~ msgid "Height of paper in tenths of a mm"
+#~ msgstr "Висота паперу у десятих міліметра"
+
+#~ msgid ""
+#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr ""
+#~ "Ширина паперу у десятих міліметра (або 0 для автоматичного визначення паперу)"
+
+#~ msgid "Width of paper in tenths of a mm"
+#~ msgstr "Ширина паперу у десятих міліметра"
+
+#~ msgid "The page side to scan."
+#~ msgstr "Бік сторінки, який буде скановано."
+
+#~ msgid ""
+#~ "Type of document being scanned. This setting decides on the scan resolution, "
+#~ "colors and post-processing."
+#~ msgstr ""
+#~ "Тип документа, який сканується. За значенням цього параметра визначається "
+#~ "роздільна здатність сканування, кольори та способи остаточної обробки."
+
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "Напрямок сканування на сканованій сторінці."
+
+#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
+#~ msgstr "Коригування контрастності від -100 до 100 (0 — не коригувати)"
+
+#~ msgid "Contrast of scan"
+#~ msgstr "Контрастність сканування"
+
+#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
+#~ msgstr "Коригування яскравості від -100 до 100 (0 — не коригувати)"
+
+#~ msgid "Brightness of scan"
+#~ msgstr "Яскравість сканування"
+
+#~ msgid "Quality value to use for JPEG compression."
+#~ msgstr "Значення якості, яке буде використано під час стискання JPEG."
+
+#~ msgid "Quality value to use for JPEG compression"
+#~ msgstr "Значення якості, яке буде використано під час стискання JPEG"
diff --git a/po/ur.gmo b/po/ur.gmo
new file mode 100644
index 0000000..d48fca7
--- /dev/null
+++ b/po/ur.gmo
diff --git a/po/ur.po b/po/ur.po
index 8fb819b..cbdc1f3 100644
--- a/po/ur.po
+++ b/po/ur.po
@@ -7,399 +7,309 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-06 14:16+1200\n"
+"POT-Creation-Date: 2016-07-29 12:47+1200\n"
 "PO-Revision-Date: 2012-04-17 06:12+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Urdu <ur@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-04-14 05:40+0000\n"
-"X-Generator: Launchpad (build 17990)\n"
+"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 
 #. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:2
+#: data/simple-scan.ui:24
 msgid "_Authorize"
 msgstr ""
 
 #. Label beside username entry
-#: ../data/simple-scan.ui.h:4
+#: data/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr ""
 
 #. Label beside password entry
-#: ../data/simple-scan.ui.h:6
+#: data/simple-scan.ui:117
 msgid "_Password:"
 msgstr ""
 
 #. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:8
+#: data/simple-scan.ui:188
 msgid "Front and Back"
 msgstr ""
 
 #. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:10
+#: data/simple-scan.ui:192
 msgid "Front"
 msgstr ""
 
 #. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:12
+#: data/simple-scan.ui:196
 msgid "Back"
 msgstr "پیچھے"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
-#: ../data/appdata/simple-scan.appdata.xml.in.h:1
+#: data/simple-scan.ui:225 data/simple-scan.ui:809
+#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr ""
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:16
+#: data/simple-scan.ui:241
 msgid "_Document"
 msgstr ""
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:18
+#: data/simple-scan.ui:260
 msgid "Sc_an"
 msgstr ""
 
+#. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:20
+#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
 msgid "Single _Page"
 msgstr ""
 
+#. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:22
+#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr ""
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:24
+#: data/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:25
+#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
 msgid "Text"
 msgstr "عبارت"
 
-#: ../data/simple-scan.ui.h:26
+#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
 msgid "Photo"
 msgstr "تصویر"
 
 #. Menu item to reorder pages
-#. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1183 ../src/ui.vala:1841
+#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr ""
 
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: data/simple-scan.ui:367
 msgid "_Email"
 msgstr ""
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: data/simple-scan.ui:430
 msgid "_Page"
 msgstr ""
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: data/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr ""
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: data/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr ""
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: data/simple-scan.ui:460
 msgid "_Crop"
 msgstr ""
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: data/simple-scan.ui:470
 msgid "_None"
 msgstr ""
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: data/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: data/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: data/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: data/simple-scan.ui:514
 msgid "_Letter"
 msgstr ""
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: data/simple-scan.ui:525
 msgid "Le_gal"
 msgstr ""
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: data/simple-scan.ui:536
 msgid "4×6"
 msgstr ""
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: data/simple-scan.ui:547
 msgid "_Custom"
 msgstr ""
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: data/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr ""
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: data/simple-scan.ui:578
 msgid "Move Left"
 msgstr ""
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: data/simple-scan.ui:587
 msgid "Move Right"
 msgstr ""
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: data/simple-scan.ui:624
 msgid "_Help"
 msgstr ""
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: data/simple-scan.ui:632
 msgid "_Contents"
 msgstr ""
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: data/simple-scan.ui:674 data/simple-scan.ui:885
 msgid "Start a new document"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:67
+#: data/simple-scan.ui:675
 msgid "New"
 msgstr "نیا"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: data/simple-scan.ui:689 data/simple-scan.ui:836
 msgid "Scan a single page from the scanner"
 msgstr ""
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: data/simple-scan.ui:691 data/simple-scan.ui:837
 msgid "Scan"
 msgstr ""
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: data/simple-scan.ui:707 data/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1842
+#: data/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "محفوظ کریں"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: data/simple-scan.ui:724 data/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:77
+#: data/simple-scan.ui:725 data/simple-scan.ui:825
 msgid "Stop"
 msgstr "رکیۓ"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: data/simple-scan.ui:749 data/simple-scan.ui:936
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr ""
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: data/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr ""
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: data/simple-scan.ui:764 data/simple-scan.ui:914
 msgid "Rotate the page to the right (clockwise)"
 msgstr ""
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: data/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:86
+#: data/simple-scan.ui:779 data/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:87
+#: data/simple-scan.ui:781
 msgid "Crop"
 msgstr ""
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1849
+#: data/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "ترجیحات"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: data/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: data/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: data/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr ""
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: data/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr ""
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: data/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr ""
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: data/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: data/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: data/simple-scan.ui:1260
 msgid "Quality:"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:2
+#: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:3
+#: data/simple-scan.desktop.in:5
 msgid "Scan Documents"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:4
+#: data/simple-scan.desktop.in:6
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Device to scan from"
+#: data/simple-scan.desktop.in:8
+msgid "scanner"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "SANE device to acquire images from."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "Type of document being scanned"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
-msgid ""
-"Type of document being scanned. This setting decides on the scan resolution, "
-"colors and post-processing."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
-msgid "Width of paper in tenths of a mm"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
-msgid "Height of paper in tenths of a mm"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "Brightness of scan"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "The brightness adjustment from -100 to 100 (0 being none)."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid "Contrast of scan"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "The contrast adjustment from -100 to 100 (0 being none)."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid "Resolution for text scans"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
-msgid "The resolution in dots-per-inch to use when scanning text."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
-msgid "Resolution for photo scans"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
-msgid "Page side to scan"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
-msgid "The page side to scan."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
-msgid "Directory to save files to"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
-msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
-msgid "Quality value to use for JPEG compression"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Quality value to use for JPEG compression."
-msgstr ""
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+#: data/simple-scan.appdata.xml.in:8
 msgid ""
 "A really easy way to scan both documents and photos. You can crop out the "
 "bad parts of a photo and rotate it if it is the wrong way round. You can "
@@ -407,196 +317,162 @@ msgid ""
 "formats."
 msgstr ""
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+#: data/simple-scan.appdata.xml.in:13
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr ""
 
-#. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr ""
 
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr ""
 
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1236 src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr ""
 
-#. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr ""
 
-#. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr ""
 
-#: ../src/simple-scan.vala:26
+#: src/simple-scan.vala:26
 msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr ""
 
-#. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:391
+#: src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr ""
 
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:318 src/ui.vala:1602 src/ui.vala:1887
 msgid "_Close"
 msgstr ""
 
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:327
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr ""
 
-#. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:375
 msgid "No scanners detected"
 msgstr ""
 
-#. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:377
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:382
 msgid "Additional software needed"
 msgstr ""
 
-#. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr ""
 
-#. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:506 src/ui.vala:1843
 msgid "Save As..."
 msgstr ""
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:509 src/ui.vala:675
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:510 src/ui.vala:676
 msgid "_Save"
 msgstr ""
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr ""
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:521
 msgid "Image Files"
 msgstr ""
 
-#. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:527
 msgid "All Files"
 msgstr ""
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr ""
 
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr ""
 
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr ""
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:557
 msgid "File format:"
 msgstr ""
 
-#. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:650
 msgid "Failed to save file"
 msgstr ""
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:673
 msgid "If you don't save, changes will be permanently lost."
 msgstr ""
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:708
+#: src/ui.vala:708
 msgid "Save current document?"
 msgstr ""
 
-#. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:710
 msgid "Discard Changes"
 msgstr ""
 
-#. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr ""
 
-#. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr ""
 
-#. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1206
 msgid "Combine sides"
 msgstr ""
 
-#. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr ""
 
-#. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1226
 msgid "Reverse"
 msgstr ""
 
-#. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr ""
 
-#. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr ""
 
-#. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1472
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -612,17 +488,15 @@ msgid ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
 
-#. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr ""
 
-#. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -630,190 +504,167 @@ msgstr ""
 "  Shehzad Ashiq Ali https://launchpad.net/~shehzadashiq\n"
 "  Shoaib Mirza https://launchpad.net/~monymirza"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr ""
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr ""
 
-#. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
-#. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1581
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
 msgstr ""
 
-#. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
-#. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1587
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
 msgstr ""
 
-#. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr ""
 
-#. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
-#. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1598
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
 msgstr ""
 
-#. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1602
 msgid "Install drivers"
 msgstr ""
 
-#. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
-#. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr ""
 
-#. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr ""
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr ""
 
-#. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1676
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr ""
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/ui.vala:1793
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1835
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1840
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1844
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1845
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1853
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1854
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1855
 msgid "Quit"
 msgstr ""
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr ""
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr ""
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1897
 msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1947
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1949
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:1957
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:1959
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:1967
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:1969
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2008
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/uz.gmo b/po/uz.gmo
new file mode 100644
index 0000000..5dbb988
--- /dev/null
+++ b/po/uz.gmo
diff --git a/po/uz.po b/po/uz.po
index 3158746..c6dd5fe 100644
--- a/po/uz.po
+++ b/po/uz.po
@@ -7,399 +7,309 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-06 14:16+1200\n"
+"POT-Creation-Date: 2016-07-29 12:47+1200\n"
 "PO-Revision-Date: 2012-04-17 06:12+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Uzbek <uz@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-04-14 05:40+0000\n"
-"X-Generator: Launchpad (build 17990)\n"
+"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 
 #. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:2
+#: data/simple-scan.ui:24
 msgid "_Authorize"
 msgstr ""
 
 #. Label beside username entry
-#: ../data/simple-scan.ui.h:4
+#: data/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr ""
 
 #. Label beside password entry
-#: ../data/simple-scan.ui.h:6
+#: data/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Maxfiy soʻz:"
 
 #. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:8
+#: data/simple-scan.ui:188
 msgid "Front and Back"
 msgstr "Olidi va Orqasi"
 
 #. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:10
+#: data/simple-scan.ui:192
 msgid "Front"
 msgstr "Oldingi"
 
 #. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:12
+#: data/simple-scan.ui:196
 msgid "Back"
 msgstr "Orqaga"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
-#: ../data/appdata/simple-scan.appdata.xml.in.h:1
+#: data/simple-scan.ui:225 data/simple-scan.ui:809
+#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr "Simple Scan"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:16
+#: data/simple-scan.ui:241
 msgid "_Document"
 msgstr "_Dokument"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:18
+#: data/simple-scan.ui:260
 msgid "Sc_an"
 msgstr "_Skan qilish"
 
+#. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:20
+#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
 msgid "Single _Page"
 msgstr ""
 
+#. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:22
+#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr ""
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:24
+#: data/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:25
+#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
 msgid "Text"
 msgstr "Matn"
 
-#: ../data/simple-scan.ui.h:26
+#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
 msgid "Photo"
 msgstr "Rasm"
 
 #. Menu item to reorder pages
-#. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1183 ../src/ui.vala:1841
+#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr ""
 
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: data/simple-scan.ui:367
 msgid "_Email"
 msgstr "_Email"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: data/simple-scan.ui:430
 msgid "_Page"
 msgstr ""
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: data/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "Chapga burish"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: data/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "_O'nga burish"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: data/simple-scan.ui:460
 msgid "_Crop"
 msgstr "_Kesish"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: data/simple-scan.ui:470
 msgid "_None"
 msgstr "_Yoʻq"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: data/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: data/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: data/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: data/simple-scan.ui:514
 msgid "_Letter"
 msgstr "_Xat"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: data/simple-scan.ui:525
 msgid "Le_gal"
 msgstr ""
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: data/simple-scan.ui:536
 msgid "4×6"
 msgstr ""
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: data/simple-scan.ui:547
 msgid "_Custom"
 msgstr ""
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: data/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr ""
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: data/simple-scan.ui:578
 msgid "Move Left"
 msgstr ""
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: data/simple-scan.ui:587
 msgid "Move Right"
 msgstr ""
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: data/simple-scan.ui:624
 msgid "_Help"
 msgstr "_Yordam"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: data/simple-scan.ui:632
 msgid "_Contents"
 msgstr "_Tarkibi"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: data/simple-scan.ui:674 data/simple-scan.ui:885
 msgid "Start a new document"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:67
+#: data/simple-scan.ui:675
 msgid "New"
 msgstr "Yangi"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: data/simple-scan.ui:689 data/simple-scan.ui:836
 msgid "Scan a single page from the scanner"
 msgstr ""
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: data/simple-scan.ui:691 data/simple-scan.ui:837
 msgid "Scan"
 msgstr "Skan qilish"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: data/simple-scan.ui:707 data/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1842
+#: data/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "Saqlash"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: data/simple-scan.ui:724 data/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:77
+#: data/simple-scan.ui:725 data/simple-scan.ui:825
 msgid "Stop"
 msgstr "Toʻxtatish"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: data/simple-scan.ui:749 data/simple-scan.ui:936
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr ""
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: data/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "Chapga burish"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: data/simple-scan.ui:764 data/simple-scan.ui:914
 msgid "Rotate the page to the right (clockwise)"
 msgstr ""
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: data/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "O'nga burish"
 
-#: ../data/simple-scan.ui.h:86
+#: data/simple-scan.ui:779 data/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:87
+#: data/simple-scan.ui:781
 msgid "Crop"
 msgstr "Kesish"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1849
+#: data/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "Мослашлар"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: data/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: data/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: data/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr ""
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: data/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr ""
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: data/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr ""
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: data/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: data/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: data/simple-scan.ui:1260
 msgid "Quality:"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:2
+#: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:3
+#: data/simple-scan.desktop.in:5
 msgid "Scan Documents"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:4
+#: data/simple-scan.desktop.in:6
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Device to scan from"
+#: data/simple-scan.desktop.in:8
+msgid "scanner"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "SANE device to acquire images from."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "Type of document being scanned"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
-msgid ""
-"Type of document being scanned. This setting decides on the scan resolution, "
-"colors and post-processing."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
-msgid "Width of paper in tenths of a mm"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
-msgid "Height of paper in tenths of a mm"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "Brightness of scan"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "The brightness adjustment from -100 to 100 (0 being none)."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid "Contrast of scan"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "The contrast adjustment from -100 to 100 (0 being none)."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid "Resolution for text scans"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
-msgid "The resolution in dots-per-inch to use when scanning text."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
-msgid "Resolution for photo scans"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
-msgid "Page side to scan"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
-msgid "The page side to scan."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
-msgid "Directory to save files to"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
-msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
-msgid "Quality value to use for JPEG compression"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Quality value to use for JPEG compression."
-msgstr ""
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+#: data/simple-scan.appdata.xml.in:8
 msgid ""
 "A really easy way to scan both documents and photos. You can crop out the "
 "bad parts of a photo and rotate it if it is the wrong way round. You can "
@@ -407,198 +317,164 @@ msgid ""
 "formats."
 msgstr ""
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+#: data/simple-scan.appdata.xml.in:13
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr ""
 
-#. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr ""
 
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr ""
 
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1236 src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr ""
 
-#. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "Релиз версиясини кўрсатиш"
 
-#. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr "Дебаг хабарларини  чоп қилиш"
 
-#: ../src/simple-scan.vala:26
+#: src/simple-scan.vala:26
 msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr ""
 
-#. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:391
+#: src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr ""
 
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Мавжуд буйруқлар ва мосламаларнинг тўлиқ рўйхатини кўриш учун '%s --help''ни "
 "ишга туширинг."
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:318 src/ui.vala:1602 src/ui.vala:1887
 msgid "_Close"
 msgstr ""
 
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:327
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr ""
 
-#. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:375
 msgid "No scanners detected"
 msgstr ""
 
-#. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:377
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:382
 msgid "Additional software needed"
 msgstr ""
 
-#. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr ""
 
-#. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:506 src/ui.vala:1843
 msgid "Save As..."
 msgstr ""
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:509 src/ui.vala:675
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:510 src/ui.vala:676
 msgid "_Save"
 msgstr ""
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr ""
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:521
 msgid "Image Files"
 msgstr ""
 
-#. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:527
 msgid "All Files"
 msgstr "Hamma fayllar"
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr ""
 
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr ""
 
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr ""
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:557
 msgid "File format:"
 msgstr ""
 
-#. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:650
 msgid "Failed to save file"
 msgstr ""
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:673
 msgid "If you don't save, changes will be permanently lost."
 msgstr ""
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:708
+#: src/ui.vala:708
 msgid "Save current document?"
 msgstr ""
 
-#. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:710
 msgid "Discard Changes"
 msgstr ""
 
-#. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr ""
 
-#. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr ""
 
-#. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1206
 msgid "Combine sides"
 msgstr ""
 
-#. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr ""
 
-#. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1226
 msgid "Reverse"
 msgstr ""
 
-#. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr ""
 
-#. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr ""
 
-#. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1472
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -614,206 +490,181 @@ msgid ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
 
-#. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "Simple Scan haqida"
 
-#. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Sardorbek Pulatov https://launchpad.net/~prockrammer"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr ""
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "Saqlamasdan chiqib ketish"
 
-#. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
-#. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1581
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
 msgstr ""
 
-#. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
-#. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1587
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
 msgstr ""
 
-#. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr ""
 
-#. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
-#. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1598
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
 msgstr ""
 
-#. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1602
 msgid "Install drivers"
 msgstr ""
 
-#. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
-#. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr ""
 
-#. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr ""
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr ""
 
-#. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1676
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr ""
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (default)"
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/ui.vala:1793
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1835
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1840
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1844
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1845
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1853
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1854
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1855
 msgid "Quit"
 msgstr ""
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "_Skaner almashrirish"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr ""
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1897
 msgid "Automatic"
 msgstr "Avtomatik"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1947
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1949
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:1957
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:1959
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:1967
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:1969
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2008
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/vi.gmo b/po/vi.gmo
new file mode 100644
index 0000000..932fc98
--- /dev/null
+++ b/po/vi.gmo
diff --git a/po/vi.po b/po/vi.po
index 92dd4ea..9a14613 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,401 +7,309 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-06 14:16+1200\n"
+"POT-Creation-Date: 2016-07-29 12:47+1200\n"
 "PO-Revision-Date: 2012-07-23 09:09+0000\n"
 "Last-Translator: Robert Ancell <robert.ancell@canonical.com>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-04-14 05:40+0000\n"
-"X-Generator: Launchpad (build 17990)\n"
+"X-Launchpad-Export-Date: 2016-07-30 05:46+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 
 #. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:2
+#: data/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_Xác thực"
 
 #. Label beside username entry
-#: ../data/simple-scan.ui.h:4
+#: data/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr ""
 
 #. Label beside password entry
-#: ../data/simple-scan.ui.h:6
+#: data/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Mật khẩu:"
 
 #. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:8
+#: data/simple-scan.ui:188
 msgid "Front and Back"
 msgstr ""
 
 #. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:10
+#: data/simple-scan.ui:192
 msgid "Front"
 msgstr ""
 
 #. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:12
+#: data/simple-scan.ui:196
 msgid "Back"
 msgstr ""
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
-#: ../data/appdata/simple-scan.appdata.xml.in.h:1
+#: data/simple-scan.ui:225 data/simple-scan.ui:809
+#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr "Quét đơn giản"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:16
+#: data/simple-scan.ui:241
 msgid "_Document"
 msgstr "_Tài liệu"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:18
+#: data/simple-scan.ui:260
 msgid "Sc_an"
 msgstr ""
 
+#. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:20
+#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
 msgid "Single _Page"
 msgstr "Trang Đơn"
 
+#. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:22
+#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr "Tất cả trang từ _Khay (Feeder)"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:24
+#: data/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:25
+#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
 msgid "Text"
 msgstr "Văn bản"
 
-#: ../data/simple-scan.ui.h:26
+#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
 msgid "Photo"
 msgstr "Ảnh chụp"
 
 #. Menu item to reorder pages
-#. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1183 ../src/ui.vala:1841
+#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr ""
 
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: data/simple-scan.ui:367
 msgid "_Email"
 msgstr ""
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: data/simple-scan.ui:430
 msgid "_Page"
 msgstr "_Trang"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: data/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "Xoay _trái"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: data/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "Xoay _Phải"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: data/simple-scan.ui:460
 msgid "_Crop"
 msgstr "_Xén"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: data/simple-scan.ui:470
 msgid "_None"
 msgstr "_Không có"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: data/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: data/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: data/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: data/simple-scan.ui:514
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: data/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: data/simple-scan.ui:536
 msgid "4×6"
 msgstr ""
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: data/simple-scan.ui:547
 msgid "_Custom"
 msgstr "Tự _chọn"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: data/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr "_Xoay phần Xén trên màn hình (_Rotate Crop)"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: data/simple-scan.ui:578
 msgid "Move Left"
 msgstr ""
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: data/simple-scan.ui:587
 msgid "Move Right"
 msgstr ""
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: data/simple-scan.ui:624
 msgid "_Help"
 msgstr "_Trợ giúp"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: data/simple-scan.ui:632
 msgid "_Contents"
 msgstr ""
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: data/simple-scan.ui:674 data/simple-scan.ui:885
 msgid "Start a new document"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:67
+#: data/simple-scan.ui:675
 msgid "New"
 msgstr ""
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: data/simple-scan.ui:689 data/simple-scan.ui:836
 msgid "Scan a single page from the scanner"
 msgstr ""
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: data/simple-scan.ui:691 data/simple-scan.ui:837
 msgid "Scan"
 msgstr ""
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: data/simple-scan.ui:707 data/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1842
+#: data/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr ""
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: data/simple-scan.ui:724 data/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:77
+#: data/simple-scan.ui:725 data/simple-scan.ui:825
 msgid "Stop"
 msgstr ""
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: data/simple-scan.ui:749 data/simple-scan.ui:936
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr ""
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: data/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr ""
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: data/simple-scan.ui:764 data/simple-scan.ui:914
 msgid "Rotate the page to the right (clockwise)"
 msgstr ""
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: data/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:86
+#: data/simple-scan.ui:779 data/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:87
+#: data/simple-scan.ui:781
 msgid "Crop"
 msgstr ""
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1849
+#: data/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "Tùy thích"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: data/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "Quét _Nguồn:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: data/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: data/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr ""
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: data/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr ""
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: data/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr ""
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: data/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "Độ sáng:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: data/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "Độ tương phản:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: data/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "Chất lượng:"
 
-#: ../data/simple-scan.desktop.in.h:2
+#: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:3
+#: data/simple-scan.desktop.in:5
 msgid "Scan Documents"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:4
+#: data/simple-scan.desktop.in:6
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Device to scan from"
+#: data/simple-scan.desktop.in:8
+msgid "scanner"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "SANE device to acquire images from."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "Type of document being scanned"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
-msgid ""
-"Type of document being scanned. This setting decides on the scan resolution, "
-"colors and post-processing."
-msgstr ""
-"Loại tài liệu đang quét hình. Tùy chọn này sẽ quyết định độ phân giải quét "
-"hình, màu và quy trình xử lý sau quét hình."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
-msgid "Width of paper in tenths of a mm"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
-msgid "Height of paper in tenths of a mm"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "Brightness of scan"
-msgstr "Độ sáng quét hình"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "The brightness adjustment from -100 to 100 (0 being none)."
-msgstr "Chỉnh độ sáng từ -100 đến 100 (0 là không có)"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid "Contrast of scan"
-msgstr "Độ tương phản quét hình"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "The contrast adjustment from -100 to 100 (0 being none)."
-msgstr "Chỉnh độ tương phản từ -100 đến 100 (0 là không có)"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid "Resolution for text scans"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
-msgid "The resolution in dots-per-inch to use when scanning text."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
-msgid "Resolution for photo scans"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
-msgid "Page side to scan"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
-msgid "The page side to scan."
-msgstr "Bên trang cần quét hình."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
-msgid "Directory to save files to"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
-msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
-msgid "Quality value to use for JPEG compression"
-msgstr "Xác định chất lượng khi nén ảnh dạng JPEG"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Quality value to use for JPEG compression."
-msgstr "Xác định chất lượng khi nén ảnh dạng JPEG."
-
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+#: data/simple-scan.appdata.xml.in:8
 msgid ""
 "A really easy way to scan both documents and photos. You can crop out the "
 "bad parts of a photo and rotate it if it is the wrong way round. You can "
@@ -409,198 +317,164 @@ msgid ""
 "formats."
 msgstr ""
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+#: data/simple-scan.appdata.xml.in:13
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr ""
 
-#. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "Không nối được với máy quét hình"
 
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "Không quét hình được"
 
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1236 src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr "Lỗi khi giao dịch với máy quét hình"
 
-#. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "Hiện phiên bản phát hành"
 
-#. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr "In ra thông tin gỡ lỗi"
 
-#: ../src/simple-scan.vala:26
+#: src/simple-scan.vala:26
 msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr ""
 "Chỉnh các tệp PDF đã được tạo ra bởi các phiên bản cũ hơn của Simple Scan"
 
-#. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:391
+#: src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Quét hình thất bại"
 
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DEVICE...] - Công cụ quét hình"
 
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Chạy lệnh '%s --help' để xem danh sách tất cả các tùy chọn dòng lệnh."
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:318 src/ui.vala:1602 src/ui.vala:1887
 msgid "_Close"
 msgstr ""
 
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:327
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Tên đăng nhập và mật mã cần thiết để truy cập '%s'"
 
-#. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:375
 msgid "No scanners detected"
 msgstr "Không phát hiện máy quét hình nào hết"
 
-#. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:377
 msgid "Please check your scanner is connected and powered on"
 msgstr "Vui lòng kiểm tra đã cắm và bật máy quét hình chưa"
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:382
 msgid "Additional software needed"
 msgstr ""
 
-#. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr ""
 
-#. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:506 src/ui.vala:1843
 msgid "Save As..."
 msgstr "Lưu thành..."
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:509 src/ui.vala:675
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:510 src/ui.vala:676
 msgid "_Save"
 msgstr ""
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "Tài liệu quét.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:521
 msgid "Image Files"
 msgstr ""
 
-#. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:527
 msgid "All Files"
 msgstr ""
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr ""
 
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr ""
 
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr ""
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:557
 msgid "File format:"
 msgstr ""
 
-#. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:650
 msgid "Failed to save file"
 msgstr "Không lưu được tệp"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:673
 msgid "If you don't save, changes will be permanently lost."
 msgstr ""
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:708
+#: src/ui.vala:708
 msgid "Save current document?"
 msgstr ""
 
-#. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:710
 msgid "Discard Changes"
 msgstr ""
 
-#. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "Không lưu được ảnh cho xem trước"
 
-#. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr ""
 
-#. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1206
 msgid "Combine sides"
 msgstr ""
 
-#. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr ""
 
-#. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1226
 msgid "Reverse"
 msgstr ""
 
-#. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr ""
 
-#. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr ""
 
-#. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1472
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -628,17 +502,15 @@ msgstr ""
 "You should have received a copy of the GNU General Public License\n"
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 
-#. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "Về Simple Scan"
 
-#. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "Công cụ đơn giản để quét tài liệu"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -646,190 +518,167 @@ msgstr ""
 "  Robert Ancell https://launchpad.net/~robert-ancell\n"
 "  Vu Do Quynh https://launchpad.net/~vu-do-quynh"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr ""
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr ""
 
-#. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
-#. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1581
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
 msgstr ""
 
-#. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
-#. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1587
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
 msgstr ""
 
-#. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr ""
 
-#. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
-#. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1598
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
 msgstr ""
 
-#. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1602
 msgid "Install drivers"
 msgstr ""
 
-#. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
-#. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr ""
 
-#. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr ""
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr ""
 
-#. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1676
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr ""
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/ui.vala:1793
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1835
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1840
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1844
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1845
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1853
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1854
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1855
 msgid "Quit"
 msgstr ""
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr ""
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr ""
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1897
 msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1947
 msgid "Darker"
 msgstr "Tối hơn"
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1949
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:1957
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:1959
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:1967
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:1969
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2008
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
@@ -873,5 +722,33 @@ msgstr ""
 #~ msgid "Files missing"
 #~ msgstr "Thiếu các tệp"
 
+#~ msgid "The page side to scan."
+#~ msgstr "Bên trang cần quét hình."
+
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "Hướng quét trang của máy quét hình"
+
+#~ msgid ""
+#~ "Type of document being scanned. This setting decides on the scan resolution, "
+#~ "colors and post-processing."
+#~ msgstr ""
+#~ "Loại tài liệu đang quét hình. Tùy chọn này sẽ quyết định độ phân giải quét "
+#~ "hình, màu và quy trình xử lý sau quét hình."
+
+#~ msgid "Quality value to use for JPEG compression."
+#~ msgstr "Xác định chất lượng khi nén ảnh dạng JPEG."
+
+#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
+#~ msgstr "Chỉnh độ tương phản từ -100 đến 100 (0 là không có)"
+
+#~ msgid "Contrast of scan"
+#~ msgstr "Độ tương phản quét hình"
+
+#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
+#~ msgstr "Chỉnh độ sáng từ -100 đến 100 (0 là không có)"
+
+#~ msgid "Brightness of scan"
+#~ msgstr "Độ sáng quét hình"
+
+#~ msgid "Quality value to use for JPEG compression"
+#~ msgstr "Xác định chất lượng khi nén ảnh dạng JPEG"
diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo
new file mode 100644
index 0000000..3e9e8eb
--- /dev/null
+++ b/po/zh_CN.gmo
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 3c96501..5d70a59 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,400 +7,310 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-06 14:16+1200\n"
+"POT-Creation-Date: 2016-07-29 12:47+1200\n"
 "PO-Revision-Date: 2012-09-20 08:05+0000\n"
 "Last-Translator: Dennis Kuang <Unknown>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-04-14 05:40+0000\n"
-"X-Generator: Launchpad (build 17990)\n"
+"X-Launchpad-Export-Date: 2016-07-30 05:46+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 "Language: zh_CN\n"
 
 #. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:2
+#: data/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "认证(_A)"
 
 #. Label beside username entry
-#: ../data/simple-scan.ui.h:4
+#: data/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "资源用户名(_U)："
 
 #. Label beside password entry
-#: ../data/simple-scan.ui.h:6
+#: data/simple-scan.ui:117
 msgid "_Password:"
 msgstr "密码(_P)："
 
 #. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:8
+#: data/simple-scan.ui:188
 msgid "Front and Back"
 msgstr "正面和背面"
 
 #. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:10
+#: data/simple-scan.ui:192
 msgid "Front"
 msgstr "正面"
 
 #. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:12
+#: data/simple-scan.ui:196
 msgid "Back"
 msgstr "背面"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
-#: ../data/appdata/simple-scan.appdata.xml.in.h:1
+#: data/simple-scan.ui:225 data/simple-scan.ui:809
+#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr "扫描易"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:16
+#: data/simple-scan.ui:241
 msgid "_Document"
 msgstr "文档(_D)"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:18
+#: data/simple-scan.ui:260
 msgid "Sc_an"
 msgstr "扫描(_A)"
 
+#. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:20
+#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
 msgid "Single _Page"
 msgstr "单页(_P)"
 
+#. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:22
+#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr "传送来的所有页面(_F)"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:24
+#: data/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "停止扫描(_S)"
 
-#: ../data/simple-scan.ui.h:25
+#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
 msgid "Text"
 msgstr "文本"
 
-#: ../data/simple-scan.ui.h:26
+#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
 msgid "Photo"
 msgstr "照片"
 
 #. Menu item to reorder pages
-#. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1183 ../src/ui.vala:1841
+#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr "重新排序页面"
 
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: data/simple-scan.ui:367
 msgid "_Email"
 msgstr "电子邮件(_E)"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: data/simple-scan.ui:430
 msgid "_Page"
 msgstr "页面(_P)"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: data/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "向左旋转(_L)"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: data/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "向右旋转(_R)"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: data/simple-scan.ui:460
 msgid "_Crop"
 msgstr "剪裁(_C)"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: data/simple-scan.ui:470
 msgid "_None"
 msgstr "无(_N)"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: data/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: data/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: data/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: data/simple-scan.ui:514
 msgid "_Letter"
 msgstr "信件(_L)"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: data/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "法定(_G)"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: data/simple-scan.ui:536
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: data/simple-scan.ui:547
 msgid "_Custom"
 msgstr "自定义(_C)"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: data/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr "旋转剪裁(_R)"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: data/simple-scan.ui:578
 msgid "Move Left"
 msgstr "左移"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: data/simple-scan.ui:587
 msgid "Move Right"
 msgstr "右移"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: data/simple-scan.ui:624
 msgid "_Help"
 msgstr "帮助(_H)"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: data/simple-scan.ui:632
 msgid "_Contents"
 msgstr "内容(_C)"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: data/simple-scan.ui:674 data/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "开始一个新的文档"
 
-#: ../data/simple-scan.ui.h:67
+#: data/simple-scan.ui:675
 msgid "New"
 msgstr "新建"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: data/simple-scan.ui:689 data/simple-scan.ui:836
 msgid "Scan a single page from the scanner"
 msgstr "从扫描仪扫描一个单页"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: data/simple-scan.ui:691 data/simple-scan.ui:837
 msgid "Scan"
 msgstr "扫描"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: data/simple-scan.ui:707 data/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "将文档保存为文件"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1842
+#: data/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "保存"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: data/simple-scan.ui:724 data/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "停止当前扫描"
 
-#: ../data/simple-scan.ui.h:77
+#: data/simple-scan.ui:725 data/simple-scan.ui:825
 msgid "Stop"
 msgstr "停止"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: data/simple-scan.ui:749 data/simple-scan.ui:936
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "左旋页面 (逆时针)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: data/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "逆时针旋转"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: data/simple-scan.ui:764 data/simple-scan.ui:914
 msgid "Rotate the page to the right (clockwise)"
 msgstr "右旋页面 (顺时针)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: data/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "顺时针旋转"
 
-#: ../data/simple-scan.ui.h:86
+#: data/simple-scan.ui:779 data/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "裁剪选中的页面"
 
-#: ../data/simple-scan.ui.h:87
+#: data/simple-scan.ui:781
 msgid "Crop"
 msgstr "剪裁"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1849
+#: data/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "首选项"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: data/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "扫描来源(_O)："
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: data/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "文字分辨率(_T)："
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: data/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "图像分辨率(_P)："
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: data/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "扫描页面："
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: data/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "页面大小："
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: data/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "亮度："
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: data/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "对比度："
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: data/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "质量："
 
-#: ../data/simple-scan.desktop.in.h:2
+#: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr "文档扫描仪"
 
-#: ../data/simple-scan.desktop.in.h:3
+#: data/simple-scan.desktop.in:5
 msgid "Scan Documents"
 msgstr "扫描文档"
 
-#: ../data/simple-scan.desktop.in.h:4
+#: data/simple-scan.desktop.in:6
 msgid "scan;scanner;flatbed;adf;"
 msgstr "scan;scanner;flatbed;adf;扫描;扫描仪;"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Device to scan from"
-msgstr "扫描设备"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "SANE device to acquire images from."
-msgstr "从 SANE 设备获取图像。"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "Type of document being scanned"
-msgstr "扫描文档的类型"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
-msgid ""
-"Type of document being scanned. This setting decides on the scan resolution, "
-"colors and post-processing."
-msgstr "要扫描的文件类型。此设置将决定扫描的分辨率、色彩和预处理。"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
-msgid "Width of paper in tenths of a mm"
-msgstr "纸张的宽度 (以 0.1mm 计)"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr "纸张的宽度 (以 0.1mm 计，0 代表自动检查纸张)"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
-msgid "Height of paper in tenths of a mm"
-msgstr "纸张的高度 (以 0.1mm 计)"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr "纸张的高度 (以 0.1mm 计，0 代表自动检查纸张)"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "Brightness of scan"
-msgstr "扫描亮度"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "The brightness adjustment from -100 to 100 (0 being none)."
-msgstr "从 -100 到 100 的亮度调节（0 为不作调节）"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid "Contrast of scan"
-msgstr "扫描对比度"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "The contrast adjustment from -100 to 100 (0 being none)."
-msgstr "从 -100 到 100 的对比度调节（0 为不作调节）"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid "Resolution for text scans"
-msgstr "文本扫描分辨率"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
-msgid "The resolution in dots-per-inch to use when scanning text."
-msgstr "上次扫描文档的分辨率 (点/英寸)。"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
-msgid "Resolution for photo scans"
-msgstr "照片扫描分辨率"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr "扫描照片时使用的分辨率 (点/英寸)。"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
-msgid "Page side to scan"
-msgstr "扫描纸张的哪面"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
-msgid "The page side to scan."
-msgstr "要扫描的页面。"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
-msgid "Directory to save files to"
-msgstr "保存文件的文件夹："
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
-msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
-msgstr "用于保存文件的文件夹。如果不设置，默认使用 文档 文件夹。"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
-msgid "Quality value to use for JPEG compression"
-msgstr "JPEG 压缩质量"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Quality value to use for JPEG compression."
-msgstr "JPEG 压缩质量"
+#: data/simple-scan.desktop.in:8
+msgid "scanner"
+msgstr ""
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+#: data/simple-scan.appdata.xml.in:8
 msgid ""
 "A really easy way to scan both documents and photos. You can crop out the "
 "bad parts of a photo and rotate it if it is the wrong way round. You can "
@@ -410,196 +320,162 @@ msgstr ""
 "一个非常简单的方法来同时扫描文档和照片。如果图片显示有误，您可以根据需要通过裁剪、旋转等方式调整照片。您也可以打印扫描件、导出 PDF "
 "格式、或者保存为图片。"
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+#: data/simple-scan.appdata.xml.in:13
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr "扫描易使用 SANE 框架支持大多数现有的扫描仪。"
 
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr "没有可用的扫描仪。请连接一个扫描仪。"
 
-#. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "无法连接到扫描仪"
 
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "无法开始扫描"
 
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1236 src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr "与扫描仪通信错误"
 
-#. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "显示版本信息"
 
-#. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr "显示调试信息"
 
-#: ../src/simple-scan.vala:26
+#: src/simple-scan.vala:26
 msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr "修复旧版扫描易生成的 PDF 文件"
 
-#. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:391
+#: src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "扫描失败"
 
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[设备...] - 扫描工具"
 
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr "运行“%s --help”来查看可用命令行选项的完整列表。"
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:318 src/ui.vala:1602 src/ui.vala:1887
 msgid "_Close"
 msgstr "关闭(_C)"
 
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:327
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "使用“%s”需要用户名和密码"
 
-#. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:375
 msgid "No scanners detected"
 msgstr "没有发现扫描仪"
 
-#. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:377
 msgid "Please check your scanner is connected and powered on"
 msgstr "请检查您的扫描仪已经连接并且打开"
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:382
 msgid "Additional software needed"
 msgstr "需要安装其他软件"
 
-#. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr "您需要为扫描仪安装驱动程序。"
 
-#. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:506 src/ui.vala:1843
 msgid "Save As..."
 msgstr "保存为..."
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:509 src/ui.vala:675
 msgid "_Cancel"
 msgstr "取消(_C)"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:510 src/ui.vala:676
 msgid "_Save"
 msgstr "保存(_S)"
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "扫描的文件.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:521
 msgid "Image Files"
 msgstr "图像文件"
 
-#. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:527
 msgid "All Files"
 msgstr "所有文件"
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (多页文档)"
 
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (压缩)"
 
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (无损)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:557
 msgid "File format:"
 msgstr "文件格式："
 
-#. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:650
 msgid "Failed to save file"
 msgstr "保存文件错误"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:673
 msgid "If you don't save, changes will be permanently lost."
 msgstr "如果您不保存，变更将永久丢失。"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:708
+#: src/ui.vala:708
 msgid "Save current document?"
 msgstr "保存当前文档？"
 
-#. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:710
 msgid "Discard Changes"
 msgstr "放弃更改"
 
-#. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "无法保存用以预览的图像"
 
-#. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "无法打开图像预览软件"
 
-#. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1206
 msgid "Combine sides"
 msgstr "合并页"
 
-#. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr "合并页(反向)"
 
-#. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1226
 msgid "Reverse"
 msgstr "反向"
 
-#. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr "保持不变"
 
-#. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "无法打开帮助文件"
 
-#. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1472
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -624,24 +500,21 @@ msgstr ""
 "您应已收到附随于本程序的 GNU 通用公共授权的副本；如果没有，请参照\n"
 "<http://www.gnu.org/licenses/>."
 
-#. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "关于扫描易"
 
-#. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "简易的文件扫描工具"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Alexey Kotlyarov https://launchpad.net/~koterpillar\n"
 "  Aron Xu https://launchpad.net/~happyaron\n"
 "  Carlos Gong https://launchpad.net/~bfsugxy\n"
-"  David Gao https://launchpad.net/~davidgao1001\n"
 "  Dennis Kuang https://launchpad.net/~denniskrq\n"
 "  Dingyuan Wang https://launchpad.net/~gumblex\n"
 "  Heling Yao https://launchpad.net/~hyao\n"
@@ -650,197 +523,173 @@ msgstr ""
 "  Wang Dianjin https://launchpad.net/~tuhaihe\n"
 "  Wylmer Wang https://launchpad.net/~wantinghard\n"
 "  Xhacker Liu https://launchpad.net/~xhacker\n"
-"  YunJian https://launchpad.net/~tld5yj\n"
 "  YunQiang Su https://launchpad.net/~wzssyqa\n"
 "  ZhangCheng https://launchpad.net/~xxzc\n"
 "  otm123 https://launchpad.net/~otm123\n"
 "  shijing https://launchpad.net/~shijing\n"
 "  zixue.liu https://launchpad.net/~zixue"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "退出前保存文档？"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "退出且不保存"
 
-#. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr "您似乎有一个 Brother 扫描仪。"
 
-#. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1581
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
 msgstr "该驱动程序可在 <a href=\"http://support.brother.com\">兄弟网站</a>获得。"
 
-#. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr "您似乎有一个 Samsung 扫描仪。"
 
-#. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1587
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
 msgstr "该驱动程序可在<a href=\"http://samsung.com/support\">三星网站</a>获得。"
 
-#. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr "您似乎有一个 HP 扫描仪。"
 
-#. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr "您似乎有一个 Epson 扫描仪。"
 
-#. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1598
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
 msgstr "该驱动程序可在<a href=\"http://support.epson.com\">爱普生网站</a>获得。"
 
-#. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1602
 msgid "Install drivers"
 msgstr "安装驱动"
 
-#. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "安装完成后，需要重新启动扫描易。"
 
-#. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr "安装驱动程序…"
 
-#. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr "成功安装驱动程序！"
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "无法安装驱动程序(错误码 %d)。"
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr "安装驱动失败。"
 
-#. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1676
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr "您需要安装 %s 包。"
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (默认)"
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (草稿)"
 
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (高分辨率)"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/ui.vala:1793
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1835
 msgid "New Document"
 msgstr "新文档"
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1840
 msgid "Document"
 msgstr "文档"
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1844
 msgid "Email..."
 msgstr "电子邮件..."
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1845
 msgid "Print..."
 msgstr "打印..."
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1853
 msgid "Help"
 msgstr "帮助"
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1854
 msgid "About"
 msgstr "关于"
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1855
 msgid "Quit"
 msgstr "退出"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "更换扫描仪(_S)"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr "安装驱动(_I)"
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1897
 msgid "Automatic"
 msgstr "自动"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1947
 msgid "Darker"
 msgstr "较深"
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1949
 msgid "Lighter"
 msgstr "稍浅"
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:1957
 msgid "Less"
 msgstr "较少"
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:1959
 msgid "More"
 msgstr "更多"
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:1967
 msgid "Minimum"
 msgstr "最小值"
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:1969
 msgid "Maximum"
 msgstr "最大值"
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2008
 msgid "Saving document..."
 msgstr "正在保存文档..."
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "正在保存 %d/%d 页"
@@ -882,6 +731,9 @@ msgstr "正在保存 %d/%d 页"
 #~ "  --gtk-module=MODULES  加载额外的 GTK+ 模块\n"
 #~ "  --g-fatal-warnings  将所有警告置为致命"
 
+#~ msgid "Device to scan from"
+#~ msgstr "扫描设备"
+
 #~ msgid "Direction of scan"
 #~ msgstr "扫描方向"
 
@@ -890,6 +742,9 @@ msgstr "正在保存 %d/%d 页"
 #~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
 #~ msgstr "扫描仪扫描页面的方式。可以是如下几种：顶部到底部、底部到顶部、左边到右边，右边到左边"
 
+#~ msgid "Type of document being scanned"
+#~ msgstr "扫描文档的类型"
+
 #~ msgid ""
 #~ "Type of document being scanned. 'text' for text documents, 'photo' for "
 #~ "photos. This setting decides on the scan resolution, colors and post-"
@@ -918,12 +773,21 @@ msgstr "正在保存 %d/%d 页"
 #~ msgid "Select File _Type"
 #~ msgstr "选择文件类型(_T)"
 
+#~ msgid "Resolution for text scans"
+#~ msgstr "文本扫描分辨率"
+
+#~ msgid "Resolution for photo scans"
+#~ msgstr "照片扫描分辨率"
+
 #~ msgid "The resolution in dots-per-inch of the previously scanned image."
 #~ msgstr "上次扫描图片的分辨率 (点/英寸)。"
 
 #~ msgid "Resolution of last scanned image"
 #~ msgstr "上次扫描的图片分辨率"
 
+#~ msgid "The resolution in dots-per-inch to use when scanning text."
+#~ msgstr "上次扫描文档的分辨率 (点/英寸)。"
+
 #~ msgid "Height of scanned image in pixels"
 #~ msgstr "所扫描图像的的高度 (以像素计)"
 
@@ -937,12 +801,25 @@ msgstr "正在保存 %d/%d 页"
 #~ "last scanned page was."
 #~ msgstr "所扫描图像的高度 (以像素计)。这是上次扫描的页面的值。"
 
+#~ msgid "SANE device to acquire images from."
+#~ msgstr "从 SANE 设备获取图像。"
+
+#~ msgid ""
+#~ "The directory to save files to. Defaults to the documents directory if unset."
+#~ msgstr "用于保存文件的文件夹。如果不设置，默认使用 文档 文件夹。"
+
+#~ msgid "Directory to save files to"
+#~ msgstr "保存文件的文件夹："
+
 #~ msgid "Window height in pixels"
 #~ msgstr "窗口高度 (像素)"
 
 #~ msgid "Window width in pixels"
 #~ msgstr "窗口宽度 (像素)"
 
+#~ msgid "The resolution in dots-per-inch to use when scanning photos."
+#~ msgstr "扫描照片时使用的分辨率 (点/英寸)。"
+
 #~ msgid "Width of scanned image in pixels"
 #~ msgstr "所扫描图像的宽度 (以像素计)。"
 
@@ -953,5 +830,50 @@ msgstr "正在保存 %d/%d 页"
 #~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
 #~ msgstr "扫描纸张的哪面。可以是以下值：“正面” “背面” “均扫描”"
 
+#~ msgid ""
+#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr "纸张的宽度 (以 0.1mm 计，0 代表自动检查纸张)"
+
+#~ msgid "Page side to scan"
+#~ msgstr "扫描纸张的哪面"
+
+#~ msgid ""
+#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr "纸张的高度 (以 0.1mm 计，0 代表自动检查纸张)"
+
+#~ msgid "Height of paper in tenths of a mm"
+#~ msgstr "纸张的高度 (以 0.1mm 计)"
+
+#~ msgid "Width of paper in tenths of a mm"
+#~ msgstr "纸张的宽度 (以 0.1mm 计)"
+
+#~ msgid "The page side to scan."
+#~ msgstr "要扫描的页面。"
+
+#~ msgid ""
+#~ "Type of document being scanned. This setting decides on the scan resolution, "
+#~ "colors and post-processing."
+#~ msgstr "要扫描的文件类型。此设置将决定扫描的分辨率、色彩和预处理。"
+
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "扫描仪相对于被扫描页面的方向。"
+
+#~ msgid "Quality value to use for JPEG compression."
+#~ msgstr "JPEG 压缩质量"
+
+#~ msgid "Contrast of scan"
+#~ msgstr "扫描对比度"
+
+#~ msgid "Brightness of scan"
+#~ msgstr "扫描亮度"
+
+#~ msgid "Quality value to use for JPEG compression"
+#~ msgstr "JPEG 压缩质量"
+
+#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
+#~ msgstr "从 -100 到 100 的对比度调节（0 为不作调节）"
+
+#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
+#~ msgstr "从 -100 到 100 的亮度调节（0 为不作调节）"
diff --git a/po/zh_HK.gmo b/po/zh_HK.gmo
new file mode 100644
index 0000000..bf8d9d8
--- /dev/null
+++ b/po/zh_HK.gmo
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 1a27efc..65dedd2 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -7,399 +7,309 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-06 14:16+1200\n"
+"POT-Creation-Date: 2016-07-29 12:47+1200\n"
 "PO-Revision-Date: 2015-11-08 20:18+0000\n"
 "Last-Translator: Roy Chan <roy.chan@linux.org.hk>\n"
 "Language-Team: Chinese (Hong Kong) <zh_HK@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-04-14 05:40+0000\n"
-"X-Generator: Launchpad (build 17990)\n"
+"X-Launchpad-Export-Date: 2016-07-30 05:46+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 
 #. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:2
+#: data/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "授權(_A)"
 
 #. Label beside username entry
-#: ../data/simple-scan.ui.h:4
+#: data/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "資源的使用者名稱(_U)："
 
 #. Label beside password entry
-#: ../data/simple-scan.ui.h:6
+#: data/simple-scan.ui:117
 msgid "_Password:"
 msgstr "密碼(_P)："
 
 #. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:8
+#: data/simple-scan.ui:188
 msgid "Front and Back"
 msgstr "正面與背面"
 
 #. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:10
+#: data/simple-scan.ui:192
 msgid "Front"
 msgstr "正面"
 
 #. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:12
+#: data/simple-scan.ui:196
 msgid "Back"
 msgstr "背面"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
-#: ../data/appdata/simple-scan.appdata.xml.in.h:1
+#: data/simple-scan.ui:225 data/simple-scan.ui:809
+#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr "簡易掃描"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:16
+#: data/simple-scan.ui:241
 msgid "_Document"
 msgstr "文件(_D)"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:18
+#: data/simple-scan.ui:260
 msgid "Sc_an"
 msgstr "掃描(_A)"
 
+#. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:20
+#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
 msgid "Single _Page"
 msgstr "單一頁面(_P)"
 
+#. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:22
+#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr "來自進紙匣的所有頁面(_F)"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:24
+#: data/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "停止掃描(_S)"
 
-#: ../data/simple-scan.ui.h:25
+#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
 msgid "Text"
 msgstr "文字"
 
-#: ../data/simple-scan.ui.h:26
+#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
 msgid "Photo"
 msgstr "相片"
 
 #. Menu item to reorder pages
-#. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1183 ../src/ui.vala:1841
+#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr "重新排列頁面"
 
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: data/simple-scan.ui:367
 msgid "_Email"
 msgstr "電子郵件(_E)"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: data/simple-scan.ui:430
 msgid "_Page"
 msgstr "頁面(_P)"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: data/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "向左旋轉(_L)"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: data/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "向右旋轉(_R)"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: data/simple-scan.ui:460
 msgid "_Crop"
 msgstr "裁切(_C)"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: data/simple-scan.ui:470
 msgid "_None"
 msgstr "無(_N)"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: data/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: data/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: data/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: data/simple-scan.ui:514
 msgid "_Letter"
 msgstr "美規信紙(_Letter)"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: data/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "美規長信紙(Le_gal)"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: data/simple-scan.ui:536
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: data/simple-scan.ui:547
 msgid "_Custom"
 msgstr "自訂(_C)"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: data/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr "旋轉裁切區域(_R)"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: data/simple-scan.ui:578
 msgid "Move Left"
 msgstr "左移"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: data/simple-scan.ui:587
 msgid "Move Right"
 msgstr "右移"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: data/simple-scan.ui:624
 msgid "_Help"
 msgstr "求助(_H)"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: data/simple-scan.ui:632
 msgid "_Contents"
 msgstr "內容(_C)"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: data/simple-scan.ui:674 data/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "起始一份新文件"
 
-#: ../data/simple-scan.ui.h:67
+#: data/simple-scan.ui:675
 msgid "New"
 msgstr "新增"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: data/simple-scan.ui:689 data/simple-scan.ui:836
 msgid "Scan a single page from the scanner"
 msgstr "從掃描器掃描單一頁面"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: data/simple-scan.ui:691 data/simple-scan.ui:837
 msgid "Scan"
 msgstr "掃描"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: data/simple-scan.ui:707 data/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "將文件儲存到檔案"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1842
+#: data/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "儲存"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: data/simple-scan.ui:724 data/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "停止目前的掃描"
 
-#: ../data/simple-scan.ui.h:77
+#: data/simple-scan.ui:725 data/simple-scan.ui:825
 msgid "Stop"
 msgstr "停止"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: data/simple-scan.ui:749 data/simple-scan.ui:936
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "將頁面向左旋轉 (逆時針方向)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: data/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "向左旋轉"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: data/simple-scan.ui:764 data/simple-scan.ui:914
 msgid "Rotate the page to the right (clockwise)"
 msgstr "將頁面向右旋轉 (順時針方向)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: data/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "向右旋轉"
 
-#: ../data/simple-scan.ui.h:86
+#: data/simple-scan.ui:779 data/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "裁切所選的頁面"
 
-#: ../data/simple-scan.ui.h:87
+#: data/simple-scan.ui:781
 msgid "Crop"
 msgstr "裁切"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1849
+#: data/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "偏好設定"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: data/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "掃描來源(_O)："
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: data/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "文字解像度(_T)："
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: data/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "相片解像度(_P)："
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: data/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "掃描面："
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: data/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "頁面大小："
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: data/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "亮度："
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: data/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "對比度："
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: data/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "品質："
 
-#: ../data/simple-scan.desktop.in.h:2
+#: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr "文件掃描器"
 
-#: ../data/simple-scan.desktop.in.h:3
+#: data/simple-scan.desktop.in:5
 msgid "Scan Documents"
 msgstr "掃描文件"
 
-#: ../data/simple-scan.desktop.in.h:4
+#: data/simple-scan.desktop.in:6
 msgid "scan;scanner;flatbed;adf;"
 msgstr "scan;scanner;flatbed;adf;"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Device to scan from"
-msgstr "要從哪個裝置掃描"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "SANE device to acquire images from."
-msgstr "取得影像用的 SANE 裝置。"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "Type of document being scanned"
-msgstr "掃描中文件的類型"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
-msgid ""
-"Type of document being scanned. This setting decides on the scan resolution, "
-"colors and post-processing."
-msgstr "掃描中文件的類型。這個設定值決定掃描的解像度、色彩和後製處理。"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
-msgid "Width of paper in tenths of a mm"
-msgstr "以 10 mm 為單位的紙張寬度"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr "以 10 mm 為單位的紙張寬度 (或 0 以作為自動紙張偵測)。"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
-msgid "Height of paper in tenths of a mm"
-msgstr "以 10 mm 為單位的紙張高度"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr "以 10 mm 為單位的紙張高度 (或 0 以作為自動紙張偵測)。"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "Brightness of scan"
-msgstr "掃描亮度"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "The brightness adjustment from -100 to 100 (0 being none)."
-msgstr "調整亮度，由 -100 至 100 (0 代表無)。"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid "Contrast of scan"
-msgstr "掃描對比度"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "The contrast adjustment from -100 to 100 (0 being none)."
-msgstr "調整對比度，由 -100 至 100 (0 代表無)。"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid "Resolution for text scans"
-msgstr "文字掃描的解像度"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
-msgid "The resolution in dots-per-inch to use when scanning text."
-msgstr "當掃描文字時使用的解像度，單位為 dpi。"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
-msgid "Resolution for photo scans"
-msgstr "相片掃描的解像度"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr "當掃描相片時使用的解像度，單位為 dpi。"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
-msgid "Page side to scan"
-msgstr "要掃描的頁面"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
-msgid "The page side to scan."
-msgstr "要掃描的頁面。"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
-msgid "Directory to save files to"
-msgstr "儲存檔案的目錄"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
-msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
-msgstr "儲存檔案到何目錄。如果沒有預設值的話，設值會是「文件」目錄。"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
-msgid "Quality value to use for JPEG compression"
-msgstr "JPEG 壓縮品質值"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Quality value to use for JPEG compression."
-msgstr "JPEG 壓縮品質值。"
+#: data/simple-scan.desktop.in:8
+msgid "scanner"
+msgstr ""
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+#: data/simple-scan.appdata.xml.in:8
 msgid ""
 "A really easy way to scan both documents and photos. You can crop out the "
 "bad parts of a photo and rotate it if it is the wrong way round. You can "
@@ -408,196 +318,162 @@ msgid ""
 msgstr ""
 "你能輕易地掃描文件和相片。你可以裁剪相片的不良部分並將之旋轉至正確角度。你可以列印你的掃描檔，將掃描檔匯出成 pdf，或儲存為多種圖像檔案格式。"
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+#: data/simple-scan.appdata.xml.in:13
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr "簡易掃描使用 SANE 框架以支援大部分現存掃描器。"
 
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr "沒有可用的掃描器。請連接一部掃描器。"
 
-#. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "無法連接到掃描器"
 
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "無法起始掃描"
 
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1236 src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr "與掃描器溝通時發生錯誤"
 
-#. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "顯示發行版本"
 
-#. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr "打印除錯訊息"
 
-#: ../src/simple-scan.vala:26
+#: src/simple-scan.vala:26
 msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr "修正由舊版本簡易掃描產生的 PDF 檔案"
 
-#. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:391
+#: src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "掃描失敗"
 
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[裝置...] - 掃描公用程式"
 
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr "執行「%s --help」來查看所有命令列可用選項的完整清單。"
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:318 src/ui.vala:1602 src/ui.vala:1887
 msgid "_Close"
 msgstr "關閉(_C)"
 
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:327
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "需要提供使用者名稱和密碼以存取 '%s'"
 
-#. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:375
 msgid "No scanners detected"
 msgstr "未偵測到掃描器"
 
-#. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:377
 msgid "Please check your scanner is connected and powered on"
 msgstr "請檢查並確認你的掃描器已連接，並已開啟電源"
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:382
 msgid "Additional software needed"
 msgstr "需要額外軟件"
 
-#. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr "你需要為你的掃描器安裝驅動程式。"
 
-#. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:506 src/ui.vala:1843
 msgid "Save As..."
 msgstr "另存為..."
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:509 src/ui.vala:675
 msgid "_Cancel"
 msgstr "取消(_C)"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:510 src/ui.vala:676
 msgid "_Save"
 msgstr "儲存(_S)"
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "已掃描的文件.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:521
 msgid "Image Files"
 msgstr "影像檔案"
 
-#. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:527
 msgid "All Files"
 msgstr "所有檔案"
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (多頁文件)"
 
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (壓縮)"
 
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (無損)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:557
 msgid "File format:"
 msgstr "檔案格式："
 
-#. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:650
 msgid "Failed to save file"
 msgstr "儲存檔案失敗"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:673
 msgid "If you don't save, changes will be permanently lost."
 msgstr "如果不儲存，變更將會永久消失。"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:708
+#: src/ui.vala:708
 msgid "Save current document?"
 msgstr "是否儲存至目前文件？"
 
-#. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:710
 msgid "Discard Changes"
 msgstr "放棄變更"
 
-#. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "無法儲存影像以供預覽"
 
-#. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "無法開啟影像預覽應用程式"
 
-#. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1206
 msgid "Combine sides"
 msgstr "合併邊緣"
 
-#. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr "合併邊緣 (反轉)"
 
-#. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1226
 msgid "Reverse"
 msgstr "反轉"
 
-#. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr "維持不變"
 
-#. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "無法開啟求助檔案。"
 
-#. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1472
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -619,17 +495,15 @@ msgstr ""
 "\n"
 "你應已收到附隨於本程式的GNU通用公共授權的副本；如果沒有，請參照 <http://www.gnu.org/licenses/>。"
 
-#. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "關於簡易掃描"
 
-#. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "簡易文件掃描工具"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -638,201 +512,251 @@ msgstr ""
 "  Walter Cheuk https://launchpad.net/~wwycheuk\n"
 "  tomoe_musashi https://launchpad.net/~musashi"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "在結束前要儲存文件嗎？"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "直接退出而不儲存"
 
-#. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr "你似乎有一部 Brother 掃描器。"
 
-#. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1581
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
 msgstr ""
 "這部掃描器的驅動程式可以在這裏找到：<a href=\"http://support.brother.com\">Brother 網站</a>。"
 
-#. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr "你似乎有一部 Samsung 掃描器。"
 
-#. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1587
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
 msgstr ""
 "這部掃描器的驅動程式可以在這裏找到：<a href=\"http://samsung.com/support\">Samsung 網站</a>。"
 
-#. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr "你似乎有一部 HP 掃描器。"
 
-#. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr "你似乎有一部 Epson 掃描器。"
 
-#. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1598
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
 msgstr "這部掃描器的驅動程式可以在這裏找到：<a href=\"http://support.epson.com\">Epson 網站</a>。"
 
-#. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1602
 msgid "Install drivers"
 msgstr "安裝驅動程式"
 
-#. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "一旦安裝，你將需要重新啟動簡易掃描。"
 
-#. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr "正在安裝驅動程式..."
 
-#. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr "成功安裝驅動程式！"
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "驅動程式安裝失敗 (錯誤碼 %d)。"
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr "驅動程式安裝失敗。"
 
-#. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1676
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr "你需要安裝 %s 套件。"
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (預設)"
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (草稿)"
 
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (高解像度)"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/ui.vala:1793
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1835
 msgid "New Document"
 msgstr "新文件"
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1840
 msgid "Document"
 msgstr "文件"
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1844
 msgid "Email..."
 msgstr "電子郵件..."
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1845
 msgid "Print..."
 msgstr "列印..."
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1853
 msgid "Help"
 msgstr "協助"
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1854
 msgid "About"
 msgstr "關於"
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1855
 msgid "Quit"
 msgstr "退出"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "變更掃描器(_S)"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr "安裝驅動程式(_I)"
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1897
 msgid "Automatic"
 msgstr "自動"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1947
 msgid "Darker"
 msgstr "較暗"
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1949
 msgid "Lighter"
 msgstr "較光"
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:1957
 msgid "Less"
 msgstr "少"
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:1959
 msgid "More"
 msgstr "多"
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:1967
 msgid "Minimum"
 msgstr "最小"
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:1969
 msgid "Maximum"
 msgstr "最大"
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2008
 msgid "Saving document..."
 msgstr "儲存文件中..."
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "正在儲存 %d / %d"
 
+#~ msgid "Device to scan from"
+#~ msgstr "要從哪個裝置掃描"
+
+#~ msgid "SANE device to acquire images from."
+#~ msgstr "取得影像用的 SANE 裝置。"
+
+#~ msgid "Type of document being scanned"
+#~ msgstr "掃描中文件的類型"
+
+#~ msgid "Directory to save files to"
+#~ msgstr "儲存檔案的目錄"
+
+#~ msgid "Page side to scan"
+#~ msgstr "要掃描的頁面"
+
+#~ msgid "Height of paper in tenths of a mm"
+#~ msgstr "以 10 mm 為單位的紙張高度"
+
+#~ msgid ""
+#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr "以 10 mm 為單位的紙張高度 (或 0 以作為自動紙張偵測)。"
+
+#~ msgid "Width of paper in tenths of a mm"
+#~ msgstr "以 10 mm 為單位的紙張寬度"
+
+#~ msgid ""
+#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr "以 10 mm 為單位的紙張寬度 (或 0 以作為自動紙張偵測)。"
+
+#~ msgid "The page side to scan."
+#~ msgstr "要掃描的頁面。"
+
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "掃描器跨越掃描頁面的方向。"
 
+#~ msgid ""
+#~ "The directory to save files to. Defaults to the documents directory if unset."
+#~ msgstr "儲存檔案到何目錄。如果沒有預設值的話，設值會是「文件」目錄。"
+
 #~ msgid "Resolution of last scanned image"
 #~ msgstr "上次掃描影像的解像度"
 
+#~ msgid "Resolution for photo scans"
+#~ msgstr "相片掃描的解像度"
+
+#~ msgid "Resolution for text scans"
+#~ msgstr "文字掃描的解像度"
+
 #~ msgid "The resolution in dots-per-inch of the previously scanned image."
 #~ msgstr "之前掃描影像的解像度，單位為 dpi。"
+
+#~ msgid "The resolution in dots-per-inch to use when scanning text."
+#~ msgstr "當掃描文字時使用的解像度，單位為 dpi。"
+
+#~ msgid "The resolution in dots-per-inch to use when scanning photos."
+#~ msgstr "當掃描相片時使用的解像度，單位為 dpi。"
+
+#~ msgid ""
+#~ "Type of document being scanned. This setting decides on the scan resolution, "
+#~ "colors and post-processing."
+#~ msgstr "掃描中文件的類型。這個設定值決定掃描的解像度、色彩和後製處理。"
+
+#~ msgid "Contrast of scan"
+#~ msgstr "掃描對比度"
+
+#~ msgid "Brightness of scan"
+#~ msgstr "掃描亮度"
+
+#~ msgid "Quality value to use for JPEG compression."
+#~ msgstr "JPEG 壓縮品質值。"
+
+#~ msgid "Quality value to use for JPEG compression"
+#~ msgstr "JPEG 壓縮品質值"
+
+#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
+#~ msgstr "調整對比度，由 -100 至 100 (0 代表無)。"
+
+#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
+#~ msgstr "調整亮度，由 -100 至 100 (0 代表無)。"
diff --git a/po/zh_TW.gmo b/po/zh_TW.gmo
new file mode 100644
index 0000000..7c57b96
--- /dev/null
+++ b/po/zh_TW.gmo
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 7018424..61190e4 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,399 +7,309 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-06 14:16+1200\n"
+"POT-Creation-Date: 2016-07-29 12:47+1200\n"
 "PO-Revision-Date: 2016-02-14 11:17+0000\n"
 "Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
 "Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-04-14 05:40+0000\n"
-"X-Generator: Launchpad (build 17990)\n"
+"X-Launchpad-Export-Date: 2016-07-30 05:46+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 
 #. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:2
+#: data/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "授權(_A)"
 
 #. Label beside username entry
-#: ../data/simple-scan.ui.h:4
+#: data/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "資源的使用者名稱(_U)："
 
 #. Label beside password entry
-#: ../data/simple-scan.ui.h:6
+#: data/simple-scan.ui:117
 msgid "_Password:"
 msgstr "密碼(_P)："
 
 #. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:8
+#: data/simple-scan.ui:188
 msgid "Front and Back"
 msgstr "正面與背面"
 
 #. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:10
+#: data/simple-scan.ui:192
 msgid "Front"
 msgstr "正面"
 
 #. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:12
+#: data/simple-scan.ui:196
 msgid "Back"
 msgstr "背面"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
-#: ../data/appdata/simple-scan.appdata.xml.in.h:1
+#: data/simple-scan.ui:225 data/simple-scan.ui:809
+#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr "掃描易"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:16
+#: data/simple-scan.ui:241
 msgid "_Document"
 msgstr "文件(_D)"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:18
+#: data/simple-scan.ui:260
 msgid "Sc_an"
 msgstr "掃描(_A)"
 
+#. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:20
+#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
 msgid "Single _Page"
 msgstr "單一頁面(_P)"
 
+#. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:22
+#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr "來自進紙匣的所有頁面(_F)"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:24
+#: data/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "停止掃描(_S)"
 
-#: ../data/simple-scan.ui.h:25
+#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
 msgid "Text"
 msgstr "文字"
 
-#: ../data/simple-scan.ui.h:26
+#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
 msgid "Photo"
 msgstr "相片"
 
 #. Menu item to reorder pages
-#. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1183 ../src/ui.vala:1841
+#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr "重新排列頁面"
 
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: data/simple-scan.ui:367
 msgid "_Email"
 msgstr "電子郵件(_E)"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: data/simple-scan.ui:430
 msgid "_Page"
 msgstr "頁面(_P)"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: data/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "向左旋轉(_L)"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: data/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "向右旋轉(_R)"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: data/simple-scan.ui:460
 msgid "_Crop"
 msgstr "裁切(_C)"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: data/simple-scan.ui:470
 msgid "_None"
 msgstr "無(_N)"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: data/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: data/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: data/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: data/simple-scan.ui:514
 msgid "_Letter"
 msgstr "美規信紙(_Letter)"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: data/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "美規長信紙(Le_gal)"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: data/simple-scan.ui:536
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: data/simple-scan.ui:547
 msgid "_Custom"
 msgstr "自訂(_C)"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: data/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr "旋轉裁切區域(_R)"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: data/simple-scan.ui:578
 msgid "Move Left"
 msgstr "左移"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: data/simple-scan.ui:587
 msgid "Move Right"
 msgstr "右移"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: data/simple-scan.ui:624
 msgid "_Help"
 msgstr "幫助(_H)"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: data/simple-scan.ui:632
 msgid "_Contents"
 msgstr "內容(_C)"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: data/simple-scan.ui:674 data/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "起始一份新文件"
 
-#: ../data/simple-scan.ui.h:67
+#: data/simple-scan.ui:675
 msgid "New"
 msgstr "新增"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: data/simple-scan.ui:689 data/simple-scan.ui:836
 msgid "Scan a single page from the scanner"
 msgstr "從掃描器掃描單一頁面"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: data/simple-scan.ui:691 data/simple-scan.ui:837
 msgid "Scan"
 msgstr "掃描"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: data/simple-scan.ui:707 data/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "將文件儲存至檔案"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1842
+#: data/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "儲存"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: data/simple-scan.ui:724 data/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "停止目前的掃描"
 
-#: ../data/simple-scan.ui.h:77
+#: data/simple-scan.ui:725 data/simple-scan.ui:825
 msgid "Stop"
 msgstr "停止"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: data/simple-scan.ui:749 data/simple-scan.ui:936
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "將頁面向左旋轉 (逆時針方向)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: data/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "向左旋轉"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: data/simple-scan.ui:764 data/simple-scan.ui:914
 msgid "Rotate the page to the right (clockwise)"
 msgstr "將頁面向右旋轉 (順時針方向)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: data/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "向右旋轉"
 
-#: ../data/simple-scan.ui.h:86
+#: data/simple-scan.ui:779 data/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "裁切所選的頁面"
 
-#: ../data/simple-scan.ui.h:87
+#: data/simple-scan.ui:781
 msgid "Crop"
 msgstr "裁切"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1849
+#: data/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "偏好設定"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: data/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "掃描來源(_O)："
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: data/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "文字解析度(_T)："
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: data/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "相片解析度(_P)："
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: data/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "掃描面："
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: data/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "頁面大小："
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: data/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "亮度："
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: data/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "反差："
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: data/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "品質："
 
-#: ../data/simple-scan.desktop.in.h:2
+#: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr "文件掃描"
 
-#: ../data/simple-scan.desktop.in.h:3
+#: data/simple-scan.desktop.in:5
 msgid "Scan Documents"
 msgstr "掃描文件"
 
-#: ../data/simple-scan.desktop.in.h:4
+#: data/simple-scan.desktop.in:6
 msgid "scan;scanner;flatbed;adf;"
 msgstr "scan;scanner;flatbed;adf;"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Device to scan from"
-msgstr "要從哪個裝置掃描"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "SANE device to acquire images from."
-msgstr "取得影像用的 SANE 裝置。"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "Type of document being scanned"
-msgstr "掃描中文件的類型"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
-msgid ""
-"Type of document being scanned. This setting decides on the scan resolution, "
-"colors and post-processing."
-msgstr "掃描中文件的類型。這個設定值決定掃描的解析度、色彩、後製處理。"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
-msgid "Width of paper in tenths of a mm"
-msgstr "以 0.1 mm 為單位的紙張寬度"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr "以 0.1 mm 為單位的紙張寬度 (或 0 以作為自動紙張偵測)。"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
-msgid "Height of paper in tenths of a mm"
-msgstr "以 0.1 mm 為單位的紙張高度"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr "以 0.1 mm 為單位的紙張高度 (或 0 以作為自動紙張偵測)。"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "Brightness of scan"
-msgstr "掃描亮度"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "The brightness adjustment from -100 to 100 (0 being none)."
-msgstr "調整亮度，由 -100 至 100 (0 代表無)。"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid "Contrast of scan"
-msgstr "掃描反差"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "The contrast adjustment from -100 to 100 (0 being none)."
-msgstr "調整反差，由 -100 至 100 (0 代表無)。"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid "Resolution for text scans"
-msgstr "文字掃描的解析度"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
-msgid "The resolution in dots-per-inch to use when scanning text."
-msgstr "當掃描文字時使用的解析度，單位為 dpi。"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
-msgid "Resolution for photo scans"
-msgstr "相片掃描的解析度"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr "當掃描相片時使用的解析度，單位為 dpi。"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
-msgid "Page side to scan"
-msgstr "要掃描的頁面"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
-msgid "The page side to scan."
-msgstr "要掃描的頁面。"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
-msgid "Directory to save files to"
-msgstr "儲存檔案的目錄"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
-msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
-msgstr "儲存檔案到何目錄。如果沒有預設值的話，設值會是「文件」目錄。"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
-msgid "Quality value to use for JPEG compression"
-msgstr "JPEG 壓縮品質"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Quality value to use for JPEG compression."
-msgstr "JPEG 壓縮品質。"
+#: data/simple-scan.desktop.in:8
+msgid "scanner"
+msgstr ""
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+#: data/simple-scan.appdata.xml.in:8
 msgid ""
 "A really easy way to scan both documents and photos. You can crop out the "
 "bad parts of a photo and rotate it if it is the wrong way round. You can "
@@ -408,196 +318,162 @@ msgid ""
 msgstr ""
 "您能輕易地掃描文件和相片。您可以裁剪相片的不良部分並將之旋轉至正確角度。您可以列印您的掃描檔，將掃描檔匯出成 pdf，或儲存為多種圖像檔案格式。"
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+#: data/simple-scan.appdata.xml.in:13
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr "簡易掃描使用 SANE 框架以支援大部分現存掃描器。"
 
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr "沒有可用的掃描器。請連接一部掃描器。"
 
-#. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "無法連接到掃描器"
 
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "無法起始掃描"
 
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1236 src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr "與掃描器溝通時發生錯誤"
 
-#. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "顯示發行版本"
 
-#. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr "列印除錯訊息"
 
-#: ../src/simple-scan.vala:26
+#: src/simple-scan.vala:26
 msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr "修正由舊版本「簡易掃描」產生的 PDF 檔案"
 
-#. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:391
+#: src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "掃描失敗"
 
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[裝置...] - 掃描公用程式"
 
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr "執行「%s --help」來查看所有命令列可用選項的完整清單。"
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: src/ui.vala:318 src/ui.vala:1602 src/ui.vala:1887
 msgid "_Close"
 msgstr "關閉(_C)"
 
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#: src/ui.vala:327
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "要存取「%s」需要提供使用者名稱與密碼"
 
-#. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:375
 msgid "No scanners detected"
 msgstr "沒有偵測到掃描器"
 
-#. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:377
 msgid "Please check your scanner is connected and powered on"
 msgstr "請檢查您的掃描器是否連接，並且是否開啟電源"
 
-#. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:382
+#: src/ui.vala:382
 msgid "Additional software needed"
 msgstr "需要額外軟體"
 
-#. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr "您需要為您的掃描器安裝驅動程式。"
 
-#. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:506 src/ui.vala:1843
 msgid "Save As..."
 msgstr "另存為..."
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:509 src/ui.vala:675
 msgid "_Cancel"
 msgstr "取消(_C)"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:510 src/ui.vala:676
 msgid "_Save"
 msgstr "儲存(_S)"
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "掃描的文件.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:521
 msgid "Image Files"
 msgstr "影像檔"
 
-#. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:527
 msgid "All Files"
 msgstr "所有檔案"
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (多頁文件)"
 
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (壓縮)"
 
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (無損)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#: src/ui.vala:557
 msgid "File format:"
 msgstr "檔案格式："
 
-#. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:650
 msgid "Failed to save file"
 msgstr "儲存檔案失敗"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
+#: src/ui.vala:673
 msgid "If you don't save, changes will be permanently lost."
 msgstr "如果您不儲存，變更將會永久消失。"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:708
+#: src/ui.vala:708
 msgid "Save current document?"
 msgstr "是否儲存目前文件？"
 
-#. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:710
 msgid "Discard Changes"
 msgstr "放棄變更"
 
-#. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "無法儲存影像以供預覽"
 
-#. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "無法開啟影像預覽應用程式"
 
-#. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1206
 msgid "Combine sides"
 msgstr "合併邊緣"
 
-#. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr "合併邊緣 (相反次序)"
 
-#. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1226
 msgid "Reverse"
 msgstr "反轉"
 
-#. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr "維持不變"
 
-#. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "無法開啟幫助文件檔案"
 
-#. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/ui.vala:1472
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -619,17 +495,15 @@ msgstr ""
 "\n"
 "您應已收到附隨於本程式的 GNU 通用公眾授權的副本；如果沒有，請參照 <http://www.gnu.org/licenses/>。"
 
-#. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "關於「簡易掃描」"
 
-#. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "簡易文件掃描工具"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -642,192 +516,169 @@ msgstr ""
 "  nckuhuahua https://launchpad.net/~nckuhuahua\n"
 "  tomoe_musashi https://launchpad.net/~musashi"
 
-#. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "在結束前要儲存文件嗎？"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "直接退出而不儲存"
 
-#. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr "您似乎有一台 Brother 掃描器。"
 
-#. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1581
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
 msgstr ""
 "您可以在這裡找到這台掃描器的驅動程式：<a href=\"http://support.brother.com\">Brother 網站</a>。"
 
-#. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr "您似乎有一台 Samsung 掃描器。"
 
-#. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1587
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
 msgstr ""
 "您可以在這裡找到這台掃描器的驅動程式：<a href=\"http://samsung.com/support\">Samsung 網站</a>。"
 
-#. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr "您似乎有一台 HP 掃描器。"
 
-#. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr "您似乎有一台 Epson 掃描器。"
 
-#. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1598
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
 msgstr "此裝置的驅動程式可以在 <a href=\"http://support.epson.com\">Epson 網站</a> 上找到。"
 
-#. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1602
 msgid "Install drivers"
 msgstr "安裝驅動程式"
 
-#. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "一旦安裝，您將需要重新啟動簡易掃描。"
 
-#. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr "正在安裝驅動程式..."
 
-#. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr "成功安裝驅動程式！"
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "驅動程式安裝失敗 (錯誤碼 %d)。"
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr "驅動程式安裝失敗。"
 
-#. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1676
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr "要先安裝 %s 套件。"
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (預設)"
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (草稿)"
 
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (高解析度)"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/ui.vala:1793
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1835
 msgid "New Document"
 msgstr "新文件"
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1840
 msgid "Document"
 msgstr "文件"
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1844
 msgid "Email..."
 msgstr "電子郵件..."
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1845
 msgid "Print..."
 msgstr "列印..."
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1853
 msgid "Help"
 msgstr "求助"
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1854
 msgid "About"
 msgstr "關於"
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1855
 msgid "Quit"
 msgstr "結束"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "變更掃描器(_S)"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr "安裝驅動程式(_I)"
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1897
 msgid "Automatic"
 msgstr "自動"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1947
 msgid "Darker"
 msgstr "較深"
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1949
 msgid "Lighter"
 msgstr "較淺"
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:1957
 msgid "Less"
 msgstr "少"
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:1959
 msgid "More"
 msgstr "多"
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:1967
 msgid "Minimum"
 msgstr "最小"
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:1969
 msgid "Maximum"
 msgstr "最大"
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2008
 msgid "Saving document..."
 msgstr "正在儲存文件..."
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "正在儲存 %2$d 頁中的第 %1$d 頁"
@@ -835,12 +686,27 @@ msgstr "正在儲存 %2$d 頁中的第 %1$d 頁"
 #~ msgid "4&#xD7;6"
 #~ msgstr "4&#xD7;6"
 
+#~ msgid "Device to scan from"
+#~ msgstr "要從哪個裝置掃描"
+
 #~ msgid "Direction of scan"
 #~ msgstr "掃描的方向"
 
+#~ msgid "Resolution for text scans"
+#~ msgstr "文字掃描的解析度"
+
+#~ msgid "Resolution for photo scans"
+#~ msgstr "相片掃描的解析度"
+
 #~ msgid "Resolution of last scanned image"
 #~ msgstr "上次掃描影像的解析度"
 
+#~ msgid "Directory to save files to"
+#~ msgstr "儲存檔案的目錄"
+
+#~ msgid "Type of document being scanned"
+#~ msgstr "掃描中文件的類型"
+
 #~ msgid "Window height in pixels"
 #~ msgstr "視窗高度，單位為像素"
 
@@ -859,12 +725,21 @@ msgstr "正在儲存 %2$d 頁中的第 %1$d 頁"
 #~ msgid "The resolution in dots-per-inch of the previously scanned image."
 #~ msgstr "之前掃描的影像其解析度，單位為 dpi。"
 
+#~ msgid "The resolution in dots-per-inch to use when scanning text."
+#~ msgstr "當掃描文字時使用的解析度，單位為 dpi。"
+
+#~ msgid "The resolution in dots-per-inch to use when scanning photos."
+#~ msgstr "當掃描相片時使用的解析度，單位為 dpi。"
+
 #~ msgid ""
 #~ "Type of document being scanned. 'text' for text documents, 'photo' for "
 #~ "photos. This setting decides on the scan resolution, colors and post-"
 #~ "processing."
 #~ msgstr "掃描中文件的類型。「文字」表示文字型文件，「相片」表示相片型文件。此設定值會決定掃描解析度、色彩，以及後製處理。"
 
+#~ msgid "SANE device to acquire images from."
+#~ msgstr "取得影像用的 SANE 裝置。"
+
 #~ msgid "TRUE if the application window is maximized"
 #~ msgstr "如果應用程式視窗最大化時為 TRUE"
 
@@ -932,6 +807,9 @@ msgstr "正在儲存 %2$d 頁中的第 %1$d 頁"
 #~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
 #~ msgstr "要掃描的頁面。它可以是下列之一：「both」(兩者)、「front」(正面)、「back」(背面)"
 
+#~ msgid "Page side to scan"
+#~ msgstr "要掃描的頁面"
+
 #~ msgid ""
 #~ "The direction of the scanner across the scanned page. It can be one of the "
 #~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
@@ -939,8 +817,54 @@ msgstr "正在儲存 %2$d 頁中的第 %1$d 頁"
 #~ "掃描器橫越掃描頁面的方向。它可以是下列之一：「top-to-bottom」(頂端到底部)、「bottom-to-top」(底部到頂端)、「left-to-"
 #~ "right」(左到右)、「right-to-left」(右到左)"
 
+#~ msgid "The page side to scan."
+#~ msgstr "要掃描的頁面。"
+
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "掃描器跨越掃描頁面的方向。"
 
+#~ msgid ""
+#~ "Type of document being scanned. This setting decides on the scan resolution, "
+#~ "colors and post-processing."
+#~ msgstr "掃描中文件的類型。這個設定值決定掃描的解析度、色彩、後製處理。"
+
+#~ msgid "Height of paper in tenths of a mm"
+#~ msgstr "以 0.1 mm 為單位的紙張高度"
+
+#~ msgid ""
+#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr "以 0.1 mm 為單位的紙張寬度 (或 0 以作為自動紙張偵測)。"
+
+#~ msgid ""
+#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr "以 0.1 mm 為單位的紙張高度 (或 0 以作為自動紙張偵測)。"
+
+#~ msgid "Width of paper in tenths of a mm"
+#~ msgstr "以 0.1 mm 為單位的紙張寬度"
+
 #~ msgid "Files missing"
 #~ msgstr "缺少檔案"
+
+#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
+#~ msgstr "調整反差，由 -100 至 100 (0 代表無)。"
+
+#~ msgid "Contrast of scan"
+#~ msgstr "掃描反差"
+
+#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
+#~ msgstr "調整亮度，由 -100 至 100 (0 代表無)。"
+
+#~ msgid "Brightness of scan"
+#~ msgstr "掃描亮度"
+
+#~ msgid ""
+#~ "The directory to save files to. Defaults to the documents directory if unset."
+#~ msgstr "儲存檔案到何目錄。如果沒有預設值的話，設值會是「文件」目錄。"
+
+#~ msgid "Quality value to use for JPEG compression."
+#~ msgstr "JPEG 壓縮品質。"
+
+#~ msgid "Quality value to use for JPEG compression"
+#~ msgstr "JPEG 壓縮品質"
diff --git a/src/Makefile.in b/src/Makefile.in
index 451e4ff..caf53de 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -86,14 +86,20 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 bin_PROGRAMS = simple-scan$(EXEEXT)
 @HAVE_COLORD_TRUE@am__append_1 = -D HAVE_COLORD
 @HAVE_PACKAGEKIT_TRUE@am__append_2 = -D HAVE_PACKAGEKIT
 subdir = src
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/gsettings.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/yelp.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/appstream-xml.m4 \
+	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gsettings.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/nls.m4 \
+	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/yelp.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
@@ -185,9 +191,9 @@ am__DIST_COMMON = $(srcdir)/Makefile.in \
 	scanner.c simple-scan.c ui.c
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
-ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+APPSTREAM_UTIL = @APPSTREAM_UTIL@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -207,10 +213,12 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
 GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
 GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 HELP_DIR = @HELP_DIR@
@@ -219,24 +227,23 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
-INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
-INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
-INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 ITSTOOL = @ITSTOOL@
 LDFLAGS = @LDFLAGS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LN_S = @LN_S@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
@@ -252,6 +259,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+POSUB = @POSUB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SIMPLE_SCAN_CFLAGS = @SIMPLE_SCAN_CFLAGS@
@@ -261,6 +270,8 @@ USE_NLS = @USE_NLS@
 VALAC = @VALAC@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 XMLLINT = @XMLLINT@
 YELP_LC_DIST = @YELP_LC_DIST@
 YELP_LC_MEDIA_LINKS = @YELP_LC_MEDIA_LINKS@
@@ -274,8 +285,13 @@ am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
+appstreamxmldir = @appstreamxmldir@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -283,13 +299,15 @@ docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gsettingsschemadir = @gsettingsschemadir@
+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@
-intltool__v_merge_options_ = @intltool__v_merge_options_@
-intltool__v_merge_options_0 = @intltool__v_merge_options_0@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
diff --git a/src/autosave-manager.c b/src/autosave-manager.c
index 044761e..0e78c5d 100644
--- a/src/autosave-manager.c
+++ b/src/autosave-manager.c
@@ -1,4 +1,4 @@
-/* autosave-manager.c generated by valac 0.30.1, the Vala compiler
+/* autosave-manager.c generated by valac 0.32.1, the Vala compiler
  * generated from autosave-manager.vala, do not modify */
 
 /*
@@ -301,8 +301,8 @@ void autosave_manager_load (AutosaveManager* self) {
 #line 77 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 			_tmp8_ = _tmp7_->message;
 #line 77 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			g_warning ("autosave-manager.vala:77: Could not load autosave infomation; not rest" \
-"oring any autosaves: %s", _tmp8_);
+			g_warning ("autosave-manager.vala:77: Could not load autosave information; not res" \
+"toring any autosaves: %s", _tmp8_);
 #line 306 "autosave-manager.c"
 		}
 #line 78 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
diff --git a/src/autosave-manager.vala b/src/autosave-manager.vala
index 9ea79f1..84a1e00 100644
--- a/src/autosave-manager.vala
+++ b/src/autosave-manager.vala
@@ -74,7 +74,7 @@ public class AutosaveManager
         catch (Error e)
         {
             if (!(e is FileError.NOENT))
-                warning ("Could not load autosave infomation; not restoring any autosaves: %s", e.message);
+                warning ("Could not load autosave information; not restoring any autosaves: %s", e.message);
             return;
         }
         var pages = get_value (file, "simple-scan", "pages");
diff --git a/src/book-view.c b/src/book-view.c
index 16176a5..9246682 100644
--- a/src/book-view.c
+++ b/src/book-view.c
@@ -1,4 +1,4 @@
-/* book-view.c generated by valac 0.30.1, the Vala compiler
+/* book-view.c generated by valac 0.32.1, the Vala compiler
  * generated from book-view.vala, do not modify */
 
 /*
diff --git a/src/book.c b/src/book.c
index 5811cd0..0a7e2e9 100644
--- a/src/book.c
+++ b/src/book.c
@@ -1,4 +1,4 @@
-/* book.c generated by valac 0.30.1, the Vala compiler
+/* book.c generated by valac 0.32.1, the Vala compiler
  * generated from book.vala, do not modify */
 
 /*
@@ -832,33 +832,33 @@ static gint string_last_index_of_char (const gchar* self, gunichar c, gint start
 	gunichar _tmp1_ = 0U;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 930 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1017 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, 0);
-#line 931 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1018 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = start_index;
-#line 931 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1018 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = c;
-#line 931 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1018 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp2_ = g_utf8_strrchr (((gchar*) self) + _tmp0_, (gssize) -1, _tmp1_);
-#line 931 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1018 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_result_ = _tmp2_;
-#line 933 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1020 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp3_ = _result_;
-#line 933 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1020 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp3_ != NULL) {
 #line 850 "book.c"
 		gchar* _tmp4_ = NULL;
-#line 934 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1021 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp4_ = _result_;
-#line 934 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1021 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		result = (gint) (_tmp4_ - ((gchar*) self));
-#line 934 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1021 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		return result;
 #line 858 "book.c"
 	} else {
-#line 936 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1023 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		result = -1;
-#line 936 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1023 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		return result;
 #line 864 "book.c"
 	}
@@ -882,103 +882,103 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 	glong _tmp19_ = 0L;
 	glong _tmp20_ = 0L;
 	gchar* _tmp21_ = NULL;
-#line 1230 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1328 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1231 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = strlen (self);
-#line 1231 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = _tmp0_;
-#line 1231 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	string_length = (glong) _tmp1_;
-#line 1232 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1330 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp2_ = start;
-#line 1232 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1330 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp2_ < ((glong) 0)) {
 #line 898 "book.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
-#line 1233 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp3_ = string_length;
-#line 1233 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp4_ = start;
-#line 1233 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		start = _tmp3_ + _tmp4_;
 #line 907 "book.c"
 	}
-#line 1235 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1333 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp5_ = end;
-#line 1235 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1333 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp5_ < ((glong) 0)) {
 #line 913 "book.c"
 		glong _tmp6_ = 0L;
 		glong _tmp7_ = 0L;
-#line 1236 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp6_ = string_length;
-#line 1236 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp7_ = end;
-#line 1236 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		end = _tmp6_ + _tmp7_;
 #line 922 "book.c"
 	}
-#line 1238 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp9_ = start;
-#line 1238 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp9_ >= ((glong) 0)) {
 #line 928 "book.c"
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
-#line 1238 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp10_ = start;
-#line 1238 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp11_ = string_length;
-#line 1238 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp8_ = _tmp10_ <= _tmp11_;
 #line 937 "book.c"
 	} else {
-#line 1238 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp8_ = FALSE;
 #line 941 "book.c"
 	}
-#line 1238 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp8_, NULL);
-#line 1239 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp13_ = end;
-#line 1239 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp13_ >= ((glong) 0)) {
 #line 949 "book.c"
 		glong _tmp14_ = 0L;
 		glong _tmp15_ = 0L;
-#line 1239 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp14_ = end;
-#line 1239 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1239 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp12_ = _tmp14_ <= _tmp15_;
 #line 958 "book.c"
 	} else {
-#line 1239 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp12_ = FALSE;
 #line 962 "book.c"
 	}
-#line 1239 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp12_, NULL);
-#line 1240 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp16_ = start;
-#line 1240 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp17_ = end;
-#line 1240 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp16_ <= _tmp17_, NULL);
-#line 1241 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp18_ = start;
-#line 1241 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp19_ = end;
-#line 1241 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp20_ = start;
-#line 1241 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp21_ = g_strndup (((gchar*) self) + _tmp18_, (gsize) (_tmp19_ - _tmp20_));
-#line 1241 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _tmp21_;
-#line 1241 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
 #line 984 "book.c"
 }
@@ -4902,47 +4902,47 @@ static gchar* string_to_utf8 (const gchar* self, int* result_length1) {
 	gint _tmp6_ = 0;
 	gchar* _tmp7_ = NULL;
 	gint _tmp7__length1 = 0;
-#line 1307 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1405 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1308 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1406 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = strlen (self);
-#line 1308 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1406 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = _tmp0_;
-#line 1308 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1406 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp2_ = g_new0 (gchar, _tmp1_ + 1);
-#line 1308 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1406 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_result_ = _tmp2_;
-#line 1308 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1406 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_result__length1 = _tmp1_ + 1;
-#line 1308 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1406 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	__result__size_ = _result__length1;
-#line 1309 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1407 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp3_ = _result__length1;
-#line 1309 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1407 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_result__length1 = _tmp3_ - 1;
-#line 1310 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1408 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp4_ = _result_;
-#line 1310 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1408 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp4__length1 = _result__length1;
-#line 1310 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1408 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp5_ = strlen (self);
-#line 1310 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1408 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp6_ = _tmp5_;
-#line 1310 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1408 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	memcpy (_tmp4_, self, (gsize) _tmp6_);
-#line 1311 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1409 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp7_ = _result_;
-#line 1311 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1409 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp7__length1 = _result__length1;
-#line 1311 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1409 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (result_length1) {
-#line 1311 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1409 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		*result_length1 = _tmp7__length1;
 #line 4942 "book.c"
 	}
-#line 1311 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1409 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _tmp7_;
-#line 1311 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1409 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
 #line 4948 "book.c"
 }
diff --git a/src/page-view.c b/src/page-view.c
index 7489ed0..8657814 100644
--- a/src/page-view.c
+++ b/src/page-view.c
@@ -1,4 +1,4 @@
-/* page-view.c generated by valac 0.30.1, the Vala compiler
+/* page-view.c generated by valac 0.32.1, the Vala compiler
  * generated from page-view.vala, do not modify */
 
 /*
diff --git a/src/page.c b/src/page.c
index bb536b1..2f72fa0 100644
--- a/src/page.c
+++ b/src/page.c
@@ -1,4 +1,4 @@
-/* page.c generated by valac 0.30.1, the Vala compiler
+/* page.c generated by valac 0.32.1, the Vala compiler
  * generated from page.vala, do not modify */
 
 /*
@@ -2711,47 +2711,47 @@ static gchar* string_to_utf8 (const gchar* self, int* result_length1) {
 	gint _tmp6_ = 0;
 	gchar* _tmp7_ = NULL;
 	gint _tmp7__length1 = 0;
-#line 1307 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1405 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1308 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1406 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = strlen (self);
-#line 1308 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1406 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = _tmp0_;
-#line 1308 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1406 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp2_ = g_new0 (gchar, _tmp1_ + 1);
-#line 1308 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1406 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_result_ = _tmp2_;
-#line 1308 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1406 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_result__length1 = _tmp1_ + 1;
-#line 1308 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1406 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	__result__size_ = _result__length1;
-#line 1309 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1407 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp3_ = _result__length1;
-#line 1309 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1407 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_result__length1 = _tmp3_ - 1;
-#line 1310 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1408 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp4_ = _result_;
-#line 1310 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1408 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp4__length1 = _result__length1;
-#line 1310 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1408 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp5_ = strlen (self);
-#line 1310 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1408 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp6_ = _tmp5_;
-#line 1310 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1408 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	memcpy (_tmp4_, self, (gsize) _tmp6_);
-#line 1311 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1409 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp7_ = _result_;
-#line 1311 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1409 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp7__length1 = _result__length1;
-#line 1311 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1409 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (result_length1) {
-#line 1311 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1409 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		*result_length1 = _tmp7__length1;
 #line 2751 "page.c"
 	}
-#line 1311 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1409 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _tmp7_;
-#line 1311 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1409 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
 #line 2757 "page.c"
 }
diff --git a/src/scanner.c b/src/scanner.c
index 1db0c10..cdbbd35 100644
--- a/src/scanner.c
+++ b/src/scanner.c
@@ -1,4 +1,4 @@
-/* scanner.c generated by valac 0.30.1, the Vala compiler
+/* scanner.c generated by valac 0.32.1, the Vala compiler
  * generated from scanner.vala, do not modify */
 
 /*
@@ -4421,17 +4421,17 @@ static gboolean string_contains (const gchar* self, const gchar* needle) {
 	gboolean result = FALSE;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 1278 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1278 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (needle != NULL, FALSE);
-#line 1279 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = needle;
-#line 1279 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_);
-#line 1279 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _tmp1_ != NULL;
-#line 1279 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
 #line 4437 "scanner.c"
 }
@@ -4738,11 +4738,11 @@ static gchar* sane_status_to_string (SANE_Status status) {
 static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) {
 	gchar* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 1282 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1282 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (old != NULL, NULL);
-#line 1282 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (replacement != NULL, NULL);
 #line 4748 "scanner.c"
 	{
@@ -4757,73 +4757,73 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		const gchar* _tmp7_ = NULL;
 		gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
-#line 1284 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp0_ = old;
-#line 1284 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp1_ = g_regex_escape_string (_tmp0_, -1);
-#line 1284 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp2_ = _tmp1_;
-#line 1284 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_);
-#line 1284 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp4_ = _tmp3_;
-#line 1284 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_g_free0 (_tmp2_);
-#line 1284 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		regex = _tmp4_;
-#line 1284 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1284 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
 #line 4779 "scanner.c"
 				goto __catch15_g_regex_error;
 			}
-#line 1284 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1284 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1284 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			return NULL;
 #line 4788 "scanner.c"
 		}
-#line 1285 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp6_ = regex;
-#line 1285 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp7_ = replacement;
-#line 1285 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) -1, 0, _tmp7_, 0, &_inner_error_);
-#line 1285 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp5_ = _tmp8_;
-#line 1285 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1285 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1285 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
 #line 4804 "scanner.c"
 				goto __catch15_g_regex_error;
 			}
-#line 1285 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1285 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1285 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1285 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			return NULL;
 #line 4815 "scanner.c"
 		}
-#line 1285 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp9_ = _tmp5_;
-#line 1285 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp5_ = NULL;
-#line 1285 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		result = _tmp9_;
-#line 1285 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_g_free0 (_tmp5_);
-#line 1285 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_g_regex_unref0 (regex);
-#line 1285 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		return result;
 #line 4829 "scanner.c"
 	}
@@ -4831,24 +4831,24 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 	__catch15_g_regex_error:
 	{
 		GError* e = NULL;
-#line 1283 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		e = _inner_error_;
-#line 1283 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_inner_error_ = NULL;
-#line 1287 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1385 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		g_assert_not_reached ();
-#line 1283 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_g_error_free0 (e);
 #line 4843 "scanner.c"
 	}
 	__finally15:
-#line 1283 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1283 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1283 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		g_clear_error (&_inner_error_);
-#line 1283 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		return NULL;
 #line 4854 "scanner.c"
 	}
@@ -6274,15 +6274,15 @@ static gchar string_get (const gchar* self, glong index) {
 	gchar result = '\0';
 	glong _tmp0_ = 0L;
 	gchar _tmp1_ = '\0';
-#line 996 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1086 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, '\0');
-#line 997 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = index;
-#line 997 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = ((gchar*) self)[_tmp0_];
-#line 997 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _tmp1_;
-#line 997 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
 #line 6282 "scanner.c"
 }
diff --git a/src/simple-scan.c b/src/simple-scan.c
index 1e0d4a4..93b9e2c 100644
--- a/src/simple-scan.c
+++ b/src/simple-scan.c
@@ -1,4 +1,4 @@
-/* simple-scan.c generated by valac 0.30.1, the Vala compiler
+/* simple-scan.c generated by valac 0.32.1, the Vala compiler
  * generated from simple-scan.vala, do not modify */
 
 /*
@@ -973,13 +973,13 @@ static void _g_free0_ (gpointer var) {
 static gint g_ptr_array_get_length (GPtrArray* self) {
 	gint result;
 	guint _tmp0_ = 0U;
-#line 4452 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 4807 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, 0);
-#line 4452 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 4807 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = self->len;
-#line 4452 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 4807 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = (gint) _tmp0_;
-#line 4452 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 4807 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
 #line 985 "simple-scan.c"
 }
@@ -987,11 +987,11 @@ static gint g_ptr_array_get_length (GPtrArray* self) {
 
 static void g_ptr_array_set_length (GPtrArray* self, gint value) {
 	gint _tmp0_ = 0;
-#line 4453 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 4808 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_if_fail (self != NULL);
-#line 4453 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 4808 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = value;
-#line 4453 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 4808 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_ptr_array_set_size (self, _tmp0_);
 #line 997 "simple-scan.c"
 }
@@ -3022,37 +3022,37 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 	glong _tmp1_ = 0L;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 1197 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = str;
-#line 1197 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = maxlen;
-#line 1197 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1197 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	end = _tmp2_;
-#line 1198 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp3_ = end;
-#line 1198 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
 #line 3037 "simple-scan.c"
 		glong _tmp4_ = 0L;
-#line 1199 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
-#line 1199 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		result = _tmp4_;
-#line 1199 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		return result;
 #line 3045 "simple-scan.c"
 	} else {
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
-#line 1201 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp5_ = end;
-#line 1201 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp6_ = str;
-#line 1201 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		result = (glong) (_tmp5_ - _tmp6_);
-#line 1201 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		return result;
 #line 3057 "simple-scan.c"
 	}
@@ -3072,112 +3072,112 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	glong _tmp20_ = 0L;
 	glong _tmp21_ = 0L;
 	gchar* _tmp22_ = NULL;
-#line 1208 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1306 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1210 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = offset;
-#line 1210 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
 #line 3081 "simple-scan.c"
 		glong _tmp2_ = 0L;
-#line 1210 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
-#line 1210 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
 #line 3087 "simple-scan.c"
 	} else {
-#line 1210 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
 #line 3091 "simple-scan.c"
 	}
-#line 1210 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
 #line 3095 "simple-scan.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
 		glong _tmp5_ = 0L;
-#line 1212 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp3_ = offset;
-#line 1212 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp4_ = len;
-#line 1212 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1212 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
 #line 3107 "simple-scan.c"
 	} else {
 		gint _tmp6_ = 0;
 		gint _tmp7_ = 0;
-#line 1214 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp6_ = strlen (self);
-#line 1214 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp7_ = _tmp6_;
-#line 1214 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
 #line 3117 "simple-scan.c"
 	}
-#line 1217 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
-#line 1217 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
 #line 3123 "simple-scan.c"
 		glong _tmp9_ = 0L;
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
-#line 1218 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp9_ = string_length;
-#line 1218 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp10_ = offset;
-#line 1218 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		offset = _tmp9_ + _tmp10_;
-#line 1219 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp11_ = offset;
-#line 1219 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
 #line 3137 "simple-scan.c"
 	} else {
 		glong _tmp12_ = 0L;
 		glong _tmp13_ = 0L;
-#line 1221 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp12_ = offset;
-#line 1221 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp13_ = string_length;
-#line 1221 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
 #line 3147 "simple-scan.c"
 	}
-#line 1223 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
-#line 1223 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
 #line 3153 "simple-scan.c"
 		glong _tmp15_ = 0L;
 		glong _tmp16_ = 0L;
-#line 1224 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1224 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp16_ = offset;
-#line 1224 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
 #line 3162 "simple-scan.c"
 	}
-#line 1226 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
-#line 1226 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp18_ = len;
-#line 1226 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp19_ = string_length;
-#line 1226 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1227 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp20_ = offset;
-#line 1227 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp21_ = len;
-#line 1227 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1227 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _tmp22_;
-#line 1227 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
 #line 3182 "simple-scan.c"
 }
diff --git a/src/ui.c b/src/ui.c
index 0a3fdaa..9535ce2 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -1,4 +1,4 @@
-/* ui.c generated by valac 0.30.1, the Vala compiler
+/* ui.c generated by valac 0.32.1, the Vala compiler
  * generated from ui.vala, do not modify */
 
 /*
@@ -2002,33 +2002,33 @@ static gint string_last_index_of_char (const gchar* self, gunichar c, gint start
 	gunichar _tmp1_ = 0U;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 930 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1017 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, 0);
-#line 931 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1018 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = start_index;
-#line 931 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1018 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = c;
-#line 931 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1018 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp2_ = g_utf8_strrchr (((gchar*) self) + _tmp0_, (gssize) -1, _tmp1_);
-#line 931 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1018 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_result_ = _tmp2_;
-#line 933 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1020 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp3_ = _result_;
-#line 933 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1020 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp3_ != NULL) {
 #line 2020 "ui.c"
 		gchar* _tmp4_ = NULL;
-#line 934 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1021 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp4_ = _result_;
-#line 934 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1021 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		result = (gint) (_tmp4_ - ((gchar*) self));
-#line 934 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1021 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		return result;
 #line 2028 "ui.c"
 	} else {
-#line 936 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1023 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		result = -1;
-#line 936 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1023 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		return result;
 #line 2034 "ui.c"
 	}
@@ -2052,103 +2052,103 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 	glong _tmp19_ = 0L;
 	glong _tmp20_ = 0L;
 	gchar* _tmp21_ = NULL;
-#line 1230 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1328 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1231 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = strlen (self);
-#line 1231 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = _tmp0_;
-#line 1231 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	string_length = (glong) _tmp1_;
-#line 1232 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1330 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp2_ = start;
-#line 1232 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1330 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp2_ < ((glong) 0)) {
 #line 2068 "ui.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
-#line 1233 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp3_ = string_length;
-#line 1233 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp4_ = start;
-#line 1233 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		start = _tmp3_ + _tmp4_;
 #line 2077 "ui.c"
 	}
-#line 1235 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1333 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp5_ = end;
-#line 1235 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1333 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp5_ < ((glong) 0)) {
 #line 2083 "ui.c"
 		glong _tmp6_ = 0L;
 		glong _tmp7_ = 0L;
-#line 1236 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp6_ = string_length;
-#line 1236 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp7_ = end;
-#line 1236 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		end = _tmp6_ + _tmp7_;
 #line 2092 "ui.c"
 	}
-#line 1238 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp9_ = start;
-#line 1238 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp9_ >= ((glong) 0)) {
 #line 2098 "ui.c"
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
-#line 1238 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp10_ = start;
-#line 1238 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp11_ = string_length;
-#line 1238 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp8_ = _tmp10_ <= _tmp11_;
 #line 2107 "ui.c"
 	} else {
-#line 1238 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp8_ = FALSE;
 #line 2111 "ui.c"
 	}
-#line 1238 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp8_, NULL);
-#line 1239 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp13_ = end;
-#line 1239 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (_tmp13_ >= ((glong) 0)) {
 #line 2119 "ui.c"
 		glong _tmp14_ = 0L;
 		glong _tmp15_ = 0L;
-#line 1239 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp14_ = end;
-#line 1239 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1239 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp12_ = _tmp14_ <= _tmp15_;
 #line 2128 "ui.c"
 	} else {
-#line 1239 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp12_ = FALSE;
 #line 2132 "ui.c"
 	}
-#line 1239 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp12_, NULL);
-#line 1240 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp16_ = start;
-#line 1240 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp17_ = end;
-#line 1240 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp16_ <= _tmp17_, NULL);
-#line 1241 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp18_ = start;
-#line 1241 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp19_ = end;
-#line 1241 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp20_ = start;
-#line 1241 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp21_ = g_strndup (((gchar*) self) + _tmp18_, (gsize) (_tmp19_ - _tmp20_));
-#line 1241 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _tmp21_;
-#line 1241 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
 #line 2154 "ui.c"
 }
@@ -5927,15 +5927,15 @@ static gchar string_get (const gchar* self, glong index) {
 	gchar result = '\0';
 	glong _tmp0_ = 0L;
 	gchar _tmp1_ = '\0';
-#line 996 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1086 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, '\0');
-#line 997 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = index;
-#line 997 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = ((gchar*) self)[_tmp0_];
-#line 997 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _tmp1_;
-#line 997 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
 #line 5941 "ui.c"
 }
@@ -7846,13 +7846,13 @@ static void user_interface_install_packages_ready (GObject* source_object, GAsyn
 static gint g_ptr_array_get_length (GPtrArray* self) {
 	gint result;
 	guint _tmp0_ = 0U;
-#line 4452 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 4807 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, 0);
-#line 4452 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 4807 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = self->len;
-#line 4452 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 4807 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = (gint) _tmp0_;
-#line 4452 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 4807 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
 #line 7844 "ui.c"
 }
@@ -7860,11 +7860,11 @@ static gint g_ptr_array_get_length (GPtrArray* self) {
 
 static void g_ptr_array_set_length (GPtrArray* self, gint value) {
 	gint _tmp0_ = 0;
-#line 4453 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 4808 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_if_fail (self != NULL);
-#line 4453 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 4808 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = value;
-#line 4453 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 4808 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_ptr_array_set_size (self, _tmp0_);
 #line 7856 "ui.c"
 }