Updated version 3.25.1 from 'upstream/3.25.1'

with Debian dir 8914d0848d9107f42ab3763c541ef1480cee0f27

154 files changed, 10666 insertions, 11123 deletions

diff --git a/po/Makefile.in.in b/po/Makefile.in.in
deleted file mode 100644
index 8f34f00..0000000
--- a/po/Makefile.in.in
+++ /dev/null
@@ -1,483 +0,0 @@
-# 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>
-#
-# 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.
-#
-# Origin: gettext-0.19.7
-GETTEXT_MACRO_VERSION = 0.19
-
-PACKAGE = @PACKAGE@
-VERSION = @VERSION@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-
-SED = @SED@
-SHELL = /bin/sh
-@SET_MAKE@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-datarootdir = @datarootdir@
-datadir = @datadir@
-localedir = @localedir@
-gettextsrcdir = $(datadir)/gettext/po
-
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-
-# We use $(mkdir_p).
-# In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as
-# "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions,
-# @install_sh@ does not start with $(SHELL), so we add it.
-# In automake >= 1.10, @mkdir_p@ is derived from ${MKDIR_P}, which is defined
-# either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake
-# versions, $(mkinstalldirs) and $(install_sh) are unused.
-mkinstalldirs = $(SHELL) @install_sh@ -d
-install_sh = $(SHELL) @install_sh@
-MKDIR_P = @MKDIR_P@
-mkdir_p = @mkdir_p@
-
-# 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)
-
-POTFILES = \
-
-CATALOGS = @CATALOGS@
-
-POFILESDEPS_ = $(srcdir)/$(DOMAIN).pot
-POFILESDEPS_yes = $(POFILESDEPS_)
-POFILESDEPS_no =
-POFILESDEPS = $(POFILESDEPS_$(PO_DEPENDS_ON_POT))
-
-DISTFILESDEPS_ = update-po
-DISTFILESDEPS_yes = $(DISTFILESDEPS_)
-DISTFILESDEPS_no =
-DISTFILESDEPS = $(DISTFILESDEPS_$(DIST_DEPENDS_ON_UPDATE_PO))
-
-# Makevars gets inserted here. (Don't remove this line!)
-
-.SUFFIXES:
-.SUFFIXES: .po .gmo .mo .sed .sin .nop .po-create .po-update
-
-.po.mo:
-	@echo "$(MSGFMT) -c -o $@ $<"; \
-	$(MSGFMT) -c -o t-$@ $< && mv t-$@ $@
-
-.po.gmo:
-	@lang=`echo $* | sed -e 's,.*/,,'`; \
-	test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
-	echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.po"; \
-	cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo
-
-.sin.sed:
-	sed -e '/^#/d' $< > t-$@
-	mv t-$@ $@
-
-
-all: all-@USE_NLS@
-
-all-yes: stamp-po
-all-no:
-
-# Ensure that the gettext macros and this Makefile.in.in are in sync.
-CHECK_MACRO_VERSION = \
-	test "$(GETTEXT_MACRO_VERSION)" = "@GETTEXT_MACRO_VERSION@" \
-	  || { echo "*** error: gettext infrastructure mismatch: using a Makefile.in.in from gettext version $(GETTEXT_MACRO_VERSION) but the autoconf macros are from gettext version @GETTEXT_MACRO_VERSION@" 1>&2; \
-	       exit 1; \
-	     }
-
-# $(srcdir)/$(DOMAIN).pot is only created when needed. When xgettext finds no
-# internationalized messages, no $(srcdir)/$(DOMAIN).pot is created (because
-# we don't want to bother translators with empty POT files). We assume that
-# LINGUAS is empty in this case, i.e. $(POFILES) and $(GMOFILES) are empty.
-# In this case, stamp-po is a nop (i.e. a phony target).
-
-# stamp-po is a timestamp denoting the last time at which the CATALOGS have
-# been loosely updated. Its purpose is that when a developer or translator
-# checks out the package via CVS, and the $(DOMAIN).pot file is not in CVS,
-# "make" will update the $(DOMAIN).pot and the $(CATALOGS), but subsequent
-# invocations of "make" will do nothing. This timestamp would not be necessary
-# if updating the $(CATALOGS) would always touch them; however, the rule for
-# $(POFILES) has been designed to not touch files that don't need to be
-# changed.
-stamp-po: $(srcdir)/$(DOMAIN).pot
-	@$(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-exec install-data
-install-exec:
-install-data: install-data-@USE_NLS@
-	if test "$(PACKAGE)" = "gettext-tools"; then \
-	  $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
-	  for file in $(DISTFILES.common) Makevars.template; do \
-	    $(INSTALL_DATA) $(srcdir)/$$file \
-			    $(DESTDIR)$(gettextsrcdir)/$$file; \
-	  done; \
-	  for file in Makevars; do \
-	    rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
-	  done; \
-	else \
-	  : ; \
-	fi
-install-data-no: all
-install-data-yes: all
-	@catalogs='$(CATALOGS)'; \
-	for cat in $$catalogs; do \
-	  cat=`basename $$cat`; \
-	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
-	  dir=$(localedir)/$$lang/LC_MESSAGES; \
-	  $(mkdir_p) $(DESTDIR)$$dir; \
-	  if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \
-	  $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \
-	  echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \
-	  for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
-	    if test -n "$$lc"; then \
-	      if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
-	        link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \
-	        mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
-	        mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
-	        (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \
-	         for file in *; do \
-	           if test -f $$file; then \
-	             ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \
-	           fi; \
-	         done); \
-	        rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
-	      else \
-	        if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \
-	          :; \
-	        else \
-	          rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \
-	          mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
-	        fi; \
-	      fi; \
-	      rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
-	      ln -s ../LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \
-	      ln $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \
-	      cp -p $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
-	      echo "installing $$realcat link as $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo"; \
-	    fi; \
-	  done; \
-	done
-
-install-strip: install
-
-installdirs: installdirs-exec installdirs-data
-installdirs-exec:
-installdirs-data: installdirs-data-@USE_NLS@
-	if test "$(PACKAGE)" = "gettext-tools"; then \
-	  $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
-	else \
-	  : ; \
-	fi
-installdirs-data-no:
-installdirs-data-yes:
-	@catalogs='$(CATALOGS)'; \
-	for cat in $$catalogs; do \
-	  cat=`basename $$cat`; \
-	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
-	  dir=$(localedir)/$$lang/LC_MESSAGES; \
-	  $(mkdir_p) $(DESTDIR)$$dir; \
-	  for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
-	    if test -n "$$lc"; then \
-	      if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
-	        link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \
-	        mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
-	        mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
-	        (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \
-	         for file in *; do \
-	           if test -f $$file; then \
-	             ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \
-	           fi; \
-	         done); \
-	        rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
-	      else \
-	        if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \
-	          :; \
-	        else \
-	          rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \
-	          mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
-	        fi; \
-	      fi; \
-	    fi; \
-	  done; \
-	done
-
-# Define this as empty until I found a useful application.
-installcheck:
-
-uninstall: uninstall-exec uninstall-data
-uninstall-exec:
-uninstall-data: uninstall-data-@USE_NLS@
-	if test "$(PACKAGE)" = "gettext-tools"; then \
-	  for file in $(DISTFILES.common) Makevars.template; do \
-	    rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
-	  done; \
-	else \
-	  : ; \
-	fi
-uninstall-data-no:
-uninstall-data-yes:
-	catalogs='$(CATALOGS)'; \
-	for cat in $$catalogs; do \
-	  cat=`basename $$cat`; \
-	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
-	  for lc in LC_MESSAGES $(EXTRA_LOCALE_CATEGORIES); do \
-	    rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
-	  done; \
-	done
-
-check: all
-
-info dvi ps pdf html tags TAGS ctags CTAGS ID:
-
-mostlyclean:
-	rm -f remove-potcdate.sed
-	rm -f stamp-poT
-	rm -f core core.* $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po
-	rm -fr *.o
-
-clean: mostlyclean
-
-distclean: clean
-	rm -f Makefile Makefile.in POTFILES *.mo
-
-maintainer-clean: distclean
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-	rm -f stamp-po $(GMOFILES)
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-dist distdir:
-	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)"; \
-	if test "$(PACKAGE)" = "gettext-tools"; then \
-	  dists="$$dists Makevars.template"; \
-	fi; \
-	if test -f $(srcdir)/$(DOMAIN).pot; then \
-	  dists="$$dists $(DOMAIN).pot stamp-po"; \
-	fi; \
-	if test -f $(srcdir)/ChangeLog; then \
-	  dists="$$dists ChangeLog"; \
-	fi; \
-	for i in 0 1 2 3 4 5 6 7 8 9; do \
-	  if test -f $(srcdir)/ChangeLog.$$i; then \
-	    dists="$$dists ChangeLog.$$i"; \
-	  fi; \
-	done; \
-	if test -f $(srcdir)/LINGUAS; then dists="$$dists LINGUAS"; fi; \
-	for file in $$dists; do \
-	  if test -f $$file; then \
-	    cp -p $$file $(distdir) || exit 1; \
-	  else \
-	    cp -p $(srcdir)/$$file $(distdir) || exit 1; \
-	  fi; \
-	done
-
-update-po: Makefile
-	$(MAKE) $(DOMAIN).pot-update
-	test -z "$(UPDATEPOFILES)" || $(MAKE) $(UPDATEPOFILES)
-	$(MAKE) update-gmo
-
-# General rule for creating PO files.
-
-.nop.po-create:
-	@lang=`echo $@ | sed -e 's/\.po-create$$//'`; \
-	echo "File $$lang.po does not exist. If you are a translator, you can create it through 'msginit'." 1>&2; \
-	exit 1
-
-# General rule for updating PO files.
-
-.nop.po-update:
-	@lang=`echo $@ | sed -e 's/\.po-update$$//'`; \
-	if test "$(PACKAGE)" = "gettext-tools" && test "$(CROSS_COMPILING)" != "yes"; then PATH=`pwd`/../src:$$PATH; fi; \
-	tmpdir=`pwd`; \
-	echo "$$lang:"; \
-	test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
-	echo "$${cdcmd}$(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \
-	cd $(srcdir); \
-	if { case `$(MSGMERGE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
-	       '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \
-	         $(MSGMERGE) $(MSGMERGE_OPTIONS) -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \
-	       *) \
-	         $(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \
-	     esac; \
-	   }; then \
-	  if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
-	    rm -f $$tmpdir/$$lang.new.po; \
-	  else \
-	    if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
-	      :; \
-	    else \
-	      echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
-	      exit 1; \
-	    fi; \
-	  fi; \
-	else \
-	  echo "msgmerge for $$lang.po failed!" 1>&2; \
-	  rm -f $$tmpdir/$$lang.new.po; \
-	fi
-
-$(DUMMYPOFILES):
-
-update-gmo: Makefile $(GMOFILES)
-	@:
-
-# Recreate Makefile by invoking config.status. Explicitly invoke the shell,
-# because execution permission bits may not work on the current file system.
-# Use @SHELL@, which is the shell determined by autoconf for the use by its
-# scripts, not $(SHELL) which is hardwired to /bin/sh and may be deficient.
-Makefile: Makefile.in.in Makevars $(top_builddir)/config.status @POMAKEFILEDEPS@
-	cd $(top_builddir) \
-	  && @SHELL@ ./config.status $(subdir)/$@.in po-directories
-
-force:
-
-# Tell versions [3.59,3.63) of GNU make not to export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/po/Makevars b/po/Makevars
deleted file mode 100644
index 21db722..0000000
--- a/po/Makevars
+++ /dev/null
@@ -1,78 +0,0 @@
-# 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 5963914..a7e9e4d 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,6 +1,6 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
-data/simple-scan.ui
+src/simple-scan.ui
 data/simple-scan.desktop.in
 data/simple-scan.appdata.xml.in
 src/book.vala
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
new file mode 100644
index 0000000..6c210b4
--- /dev/null
+++ b/po/POTFILES.skip
@@ -0,0 +1,7 @@
+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
deleted file mode 100644
index baf6528..0000000
--- a/po/Rules-quot
+++ /dev/null
@@ -1,58 +0,0 @@
-# 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
deleted file mode 100644
index f201cd6..0000000
--- a/po/af.gmo
+++ /dev/null
diff --git a/po/af.po b/po/af.po
index 9144db0..911ef1a 100644
--- a/po/af.po
+++ b/po/af.po
@@ -7,288 +7,290 @@ 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"
+"POT-Creation-Date: 2017-03-27 22:33+1300\n"
 "PO-Revision-Date: 2012-09-03 08:13+0000\n"
 "Last-Translator: Dawid de Jager <Unknown>\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-12-19 05:07+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:10+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_Verleen toegang"
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "_Gebruikersnaam vir hulpbron:"
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Wagwoord:"
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/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:192
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr "Voor"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/simple-scan.ui:196
 msgid "Back"
 msgstr "Terug"
 
 #. 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
+#: src/simple-scan.ui:225 src/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:241
+#: src/simple-scan.ui:241
 msgid "_Document"
 msgstr "_Dokument"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/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:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/simple-scan.ui:273 src/simple-scan.ui:1306 src/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:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/simple-scan.ui:283 src/simple-scan.ui:1315 src/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr "Alle Bladsye Vanaf _Voerder"
 
 #. Menu entry to stop current scan
-#: data/simple-scan.ui:294
+#: src/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "_Staak skandering"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:310 src/simple-scan.ui:1330 src/simple-scan.ui:1380
 msgid "Text"
 msgstr "Teks"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:320 src/simple-scan.ui:1340 src/simple-scan.ui:1390
 msgid "Photo"
 msgstr "Foto"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/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
+#: src/simple-scan.ui:367
 msgid "_Email"
 msgstr "_E-pos"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:430
 msgid "_Page"
 msgstr "_Bladsy"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "Roteer _linksom"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "Roteer _regsom"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:460
 msgid "_Crop"
 msgstr "_Insny"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:470
 msgid "_None"
 msgstr "_Geen"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:514
 msgid "_Letter"
 msgstr "_Letter (VSA)"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "Le_gal (VSA)"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:536
 msgid "4×6"
 msgstr ""
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:547
 msgid "_Custom"
 msgstr "_Pasmaak"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr "_Roteer Insnit"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/simple-scan.ui:578
 msgid "Move Left"
 msgstr ""
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/simple-scan.ui:587
 msgid "Move Right"
 msgstr "Beweeg na regs"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:624
 msgid "_Help"
 msgstr "_Hulp"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:632
 msgid "_Contents"
 msgstr "_Inhoud"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:674 src/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "Begin 'n nuwe dokument"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:675
 msgid "New"
 msgstr "Nuwe"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:689 src/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:691 data/simple-scan.ui:837
+#: src/simple-scan.ui:691 src/simple-scan.ui:837
 msgid "Scan"
 msgstr "Skandeer"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:707 src/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "Stoor dokument na 'n lêer"
 
-#: ../src/ui.vala:1842
+#: src/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "Stoor"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/simple-scan.ui:724 src/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "Staak huidige skandering"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:725 src/simple-scan.ui:825
 msgid "Stop"
 msgstr "Stop"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:749 src/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:750
+#: src/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "Roteer linksom"
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:764 src/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:765
+#: src/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "Roteer regsom"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:779 src/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "Snoei die gekose bladsy"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:781
 msgid "Crop"
 msgstr "Insny"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "Voorkeure"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "Skandeer B_ron"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "_Teks resolusie"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "_Foto resolusie:"
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "Skandeer Kant:"
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "Bladsy grootte:"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1260
 msgid "Quality:"
 msgstr ""
 
@@ -296,7 +298,7 @@ msgstr ""
 msgid "Document Scanner"
 msgstr ""
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr "Skandeer dokumente"
 
@@ -308,7 +310,7 @@ msgstr ""
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 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 "
@@ -316,196 +318,196 @@ msgid ""
 "formats."
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 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:389
 msgid "Failed to scan"
 msgstr "Skandering het misluk"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:630
 #, 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"
@@ -522,16 +524,16 @@ msgid ""
 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"
@@ -544,189 +546,189 @@ msgstr ""
 "  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:2182
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/am.gmo b/po/am.gmo
deleted file mode 100644
index 3ac8613..0000000
--- a/po/am.gmo
+++ /dev/null
diff --git a/po/am.po b/po/am.po
index 61117be..5e0a3a0 100644
--- a/po/am.po
+++ b/po/am.po
@@ -7,288 +7,290 @@ 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"
+"POT-Creation-Date: 2017-03-27 22:33+1300\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-12-19 05:07+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:10+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_መፍቀጃ"
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "_የተጠቃሚ ስም ለምንጮቹ:"
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_የመግቢያ ቃል:"
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/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
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr "ፊት ለፊት"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/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
+#: src/simple-scan.ui:225 src/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
+#: src/simple-scan.ui:241
 msgid "_Document"
 msgstr "_ሰነድ"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/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
+#: src/simple-scan.ui:273 src/simple-scan.ui:1306 src/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
+#: src/simple-scan.ui:283 src/simple-scan.ui:1315 src/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr "ሁሉንም ገጾች ከ _መጋቢው"
 
 #. Menu entry to stop current scan
-#: data/simple-scan.ui:294
+#: src/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "ማሰሻ _ማስቆሚያ"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:310 src/simple-scan.ui:1330 src/simple-scan.ui:1380
 msgid "Text"
 msgstr "ጽሁፍ"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:320 src/simple-scan.ui:1340 src/simple-scan.ui:1390
 msgid "Photo"
 msgstr "ፎቶ"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/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
+#: src/simple-scan.ui:367
 msgid "_Email"
 msgstr "_ኢሜይል"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:430
 msgid "_Page"
 msgstr "_ገጽ"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "ወደ _ግራ ማዞሪያ"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "ወደ _ቀኝ ማዞሪያ"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:460
 msgid "_Crop"
 msgstr "መከርከሚያ"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:470
 msgid "_None"
 msgstr "_ምንም"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:514
 msgid "_Letter"
 msgstr "_ደብዳቤ"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "ሕጋ_ዊ"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:536
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:547
 msgid "_Custom"
 msgstr "_ማስተካከያ"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr "መከርከሚያ _ማዞሪያ"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/simple-scan.ui:578
 msgid "Move Left"
 msgstr "ወደ ግራ ማንቀሳቀሻ"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/simple-scan.ui:587
 msgid "Move Right"
 msgstr "ወደ ቀኝ ማንቀሳቀሻ"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:624
 msgid "_Help"
 msgstr "_እርዳታ"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:632
 msgid "_Contents"
 msgstr "_ይዞታዎች"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:674 src/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "አዲስ ሰነድ ማስጀመሪያ"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:675
 msgid "New"
 msgstr "አዲስ"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:689 src/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
+#: src/simple-scan.ui:691 src/simple-scan.ui:837
 msgid "Scan"
 msgstr "ማሰሻ"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:707 src/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "ሰነድ ወደ ፋይል ማስቀመጫ"
 
-#: ../src/ui.vala:1842
+#: src/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
+#: src/simple-scan.ui:724 src/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "የ አሁኑን ማሰሻ ማስቆሚያ"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:725 src/simple-scan.ui:825
 msgid "Stop"
 msgstr "ማስቆሚያ"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:749 src/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
+#: src/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "ወደ ግራ ማዞሪያ"
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:764 src/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
+#: src/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "ወደ ቀኝ ማዞሪያ"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:779 src/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "የተመረጠውን ገጽ መከርከሚያ"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:781
 msgid "Crop"
 msgstr "መከርከሚያ"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "ምርጫዎች"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "የ ማሰሻ ም_ንጮች:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "የ _ጽሁፍ ሪዞልሽን:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "የ _ፎቶ ሪዞልሽን:"
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "የ ጎን ማሰሻ:"
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "የ ገጽ መጠን"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "ብሩህነት:"
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "ማነፃፃሪያ:"
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "ጥራት:"
 
@@ -296,7 +298,7 @@ msgstr "ጥራት:"
 msgid "Document Scanner"
 msgstr "ሰነድ ማሰሻ"
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr "ሰነድ ማሰሻ"
 
@@ -308,7 +310,7 @@ msgstr "ማሰሻ;ማሰሻ;ጠፍጣፋ;adf;"
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 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 "
@@ -316,196 +318,196 @@ msgid ""
 "formats."
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 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 ""
+msgstr "ዝግጁ ማሰሻ አልተገኘም: እባክዎን ማሰሻ ያገናኙ"
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:871
 msgid "Unable to connect to scanner"
-msgstr ""
+msgstr "ከ ማሰሻ ጋር መገናኘት አልተቻለም"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1223
 msgid "Unable to start scan"
-msgstr ""
+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 ""
+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 ""
+msgstr "የ ማስተካከያ መልእክቶች ማተሚያ"
 
-#: ../src/simple-scan.vala:26
+#: src/simple-scan.vala:26
 msgid "Fix PDF files generated with older versions of Simple Scan"
-msgstr ""
+msgstr "በ አሮጌ እትም የ ተፈጠሩ የ PDF ፋይሎች መጠገኛ"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:391
+#: src/simple-scan.vala:389
 msgid "Failed to scan"
 msgstr "ማሰስ አልተቻለም"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 msgid "[DEVICE...] - Scanning utility"
-msgstr ""
+msgstr "[DEVICE...] - አካላቶች በ ማሰስ ላይ"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:630
 #, 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 ""
+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 ""
+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 ""
+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 ""
+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 ""
+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 ""
+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 ""
+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 ""
+msgstr "ምስል ለ መክፈት አልተቻለም ለ ቅድመ እይታ ማስቀመጥ መተግባሪያ"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1206
 msgid "Combine sides"
-msgstr ""
+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 ""
+msgstr "ጎኖች መቀላቀያ (በ ግልባጭ)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1226
 msgid "Reverse"
-msgstr ""
+msgstr "በ ግልባጭ"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1236
 msgid "Keep unchanged"
-msgstr ""
+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 ""
+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"
@@ -520,210 +522,228 @@ 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 ""
+"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/>."
 
 #. 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 ""
+msgstr "ሰነዱን ላስቀምጥ ከ መጥፋቱ በፊት?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1511
 msgid "Quit without Saving"
-msgstr ""
+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 ""
+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 ""
+"ዝግጁ Drivers እዚህ ይገኛሉ በ <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 ""
+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 ""
+"ዝግጁ Drivers እዚህ ይገኛሉ በ <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 ""
+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 ""
+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 ""
+"ዝግጁ Drivers እዚህ ይገኛሉ በ <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 ""
+msgstr "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 ""
+msgstr "እርስዎ ከ ገጠሙ በኋላ ቀላል ማሰሻን እንደገና ማስነሳት ያስፈልጋል"
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1645
 msgid "Installing drivers..."
-msgstr ""
+msgstr "በ መግጠም ላይ drivers..."
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1653
 msgid "Drivers installed successfully!"
-msgstr ""
+msgstr "Drivers ተሳክቶ ተገጥሟል!"
 
 #. 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 "መግጠም አልተቻለም drivers (የ ስህተት ኮድ %d)."
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1669
 msgid "Failed to install drivers."
-msgstr ""
+msgstr "መግጠም አልተቻለም 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 ""
+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 ""
+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 ""
+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 ""
+msgstr "Drivers መግጠሚያ"
 
 #. 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 ""
+msgstr "ማጥቆሪያ"
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1949
 msgid "Lighter"
-msgstr ""
+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 ""
+msgstr "ከፍተኛ"
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2008
 msgid "Saving document..."
-msgstr ""
+msgstr "ሰነድ በማስቀመጥ ላይ..."
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2182
 #, c-format
 msgid "Saving page %d out of %d"
-msgstr ""
+msgstr "ገጽ በማስቀመጥ ላይ %d ከ %d"
 
 #~ msgid "Contrast of scan"
 #~ msgstr "የ ማሰሻ ማነፃፀሪያ"
diff --git a/po/ar.gmo b/po/ar.gmo
deleted file mode 100644
index ed3134d..0000000
--- a/po/ar.gmo
+++ /dev/null
diff --git a/po/ar.po b/po/ar.po
index e678056..843e6ce 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -7,296 +7,298 @@ 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: 2012-07-23 08:56+0000\n"
-"Last-Translator: Khaled Hosny <khaledhosny@eglug.org>\n"
+"POT-Creation-Date: 2017-03-27 22:33+1300\n"
+"PO-Revision-Date: 2017-03-29 06:36+0000\n"
+"Last-Translator: Khalid Abu Shawarib <k-killer-7@hotmail.com>\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-12-19 05:07+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:10+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_خوّل"
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "اسم _مستخدم المورد:"
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_كلمة السر:"
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/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
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr "الأمام"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/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
+#: src/simple-scan.ui:225 src/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
+#: src/simple-scan.ui:241
 msgid "_Document"
 msgstr "م_ستند"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/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
+#: src/simple-scan.ui:273 src/simple-scan.ui:1306 src/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
+#: src/simple-scan.ui:283 src/simple-scan.ui:1315 src/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr "كل الصفحات من  _المغذّي"
 
 #. Menu entry to stop current scan
-#: data/simple-scan.ui:294
+#: src/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "أو_قف المسح"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:310 src/simple-scan.ui:1330 src/simple-scan.ui:1380
 msgid "Text"
 msgstr "نص"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:320 src/simple-scan.ui:1340 src/simple-scan.ui:1390
 msgid "Photo"
 msgstr "صورة"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/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
+#: src/simple-scan.ui:367
 msgid "_Email"
 msgstr "_بريد إلكتروني"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:430
 msgid "_Page"
 msgstr "_صفحة"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "أدر  ي_سارًا"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "أدر ي_مينًا"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:460
 msgid "_Crop"
 msgstr "ا_قتصاص"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:470
 msgid "_None"
 msgstr "لا _شيء"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:514
 msgid "_Letter"
 msgstr "_خطاب"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "_قانوني"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:536
 msgid "4×6"
-msgstr ""
+msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:547
 msgid "_Custom"
 msgstr "_مخصص"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr "أ_در الاقتصاص"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/simple-scan.ui:578
 msgid "Move Left"
 msgstr "تحرك لليسار"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/simple-scan.ui:587
 msgid "Move Right"
 msgstr "تحرك لليمين"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:624
 msgid "_Help"
 msgstr "_مساعدة"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:632
 msgid "_Contents"
 msgstr "ال_محتويات"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:674 src/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "ابدأ مستندا جديدا"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:675
 msgid "New"
 msgstr "جديد"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:689 src/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
+#: src/simple-scan.ui:691 src/simple-scan.ui:837
 msgid "Scan"
 msgstr "امسح"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:707 src/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "احفظ المستند في ملف"
 
-#: ../src/ui.vala:1842
+#: src/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
+#: src/simple-scan.ui:724 src/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "أوقف المسح الحالي"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:725 src/simple-scan.ui:825
 msgid "Stop"
 msgstr "أوقف"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:749 src/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
+#: src/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "أدر يسارا"
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:764 src/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
+#: src/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "أدر يمينا"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:779 src/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "اقتص الصفحة المحددة"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:781
 msgid "Crop"
 msgstr "اقتصاص"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "التفضيلات"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "م_صدر المسح:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "ميز ال_نص"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "ميز ال_صورة:"
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "جهة المسح:"
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "حجم الصفحة:"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1199
 msgid "Brightness:"
-msgstr ""
+msgstr "السطوع:"
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1229
 msgid "Contrast:"
-msgstr ""
+msgstr "التباين:"
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1260
 msgid "Quality:"
-msgstr ""
+msgstr "الجودة:"
 
 #: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr ""
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr "امسح المستندات"
 
@@ -308,7 +310,7 @@ msgstr ""
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 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 "
@@ -316,196 +318,196 @@ msgid ""
 "formats."
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 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:389
 msgid "Failed to scan"
 msgstr "فشل المسح"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[جهاز...] - أداة مسح ضوئي"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:630
 #, 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 ""
+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 ""
+msgstr "مزج الجهتين (عكسي)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1226
 msgid "Reverse"
-msgstr ""
+msgstr "عكس"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1236
 msgid "Keep unchanged"
-msgstr ""
+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"
@@ -532,16 +534,16 @@ 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"
@@ -558,189 +560,189 @@ msgstr ""
 "  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 ""
+msgstr "مستند جديد"
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1840
 msgid "Document"
-msgstr ""
+msgstr "مستند"
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1844
 msgid "Email..."
-msgstr ""
+msgstr "إيميل..."
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1845
 msgid "Print..."
-msgstr ""
+msgstr "طباعة..."
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1853
 msgid "Help"
-msgstr ""
+msgstr "مساعدة"
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1854
 msgid "About"
-msgstr ""
+msgstr "حول"
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1855
 msgid "Quit"
-msgstr ""
+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 ""
+msgstr "أغمق"
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1949
 msgid "Lighter"
-msgstr ""
+msgstr "اقتح"
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:1957
 msgid "Less"
-msgstr ""
+msgstr "أقل"
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:1959
 msgid "More"
-msgstr ""
+msgstr "أكثر"
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:1967
 msgid "Minimum"
-msgstr ""
+msgstr "الأدنى"
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:1969
 msgid "Maximum"
-msgstr ""
+msgstr "اﻷقصى"
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2008
 msgid "Saving document..."
 msgstr "يحفظ المستند..."
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2182
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "يحفظ الصفحة %d من أصل %d"
diff --git a/po/ast.gmo b/po/ast.gmo
deleted file mode 100644
index cab596b..0000000
--- a/po/ast.gmo
+++ /dev/null
diff --git a/po/ast.po b/po/ast.po
index 667c342..7a7d7c8 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -7,288 +7,290 @@ 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: 2012-07-23 08:57+0000\n"
-"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
+"POT-Creation-Date: 2017-03-27 22:33+1300\n"
+"PO-Revision-Date: 2017-03-29 06:26+0000\n"
+"Last-Translator: ivarela <ivarela@ubuntu.com>\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-12-19 05:07+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:10+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_Autorizar"
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "_Nome d'usuariu pal recursu:"
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Contraseña"
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/simple-scan.ui:188
 msgid "Front and Back"
-msgstr ""
+msgstr "Anversu y reversu"
 
 #. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
+#: src/simple-scan.ui:192
 msgid "Front"
-msgstr ""
+msgstr "Anversu"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/simple-scan.ui:196
 msgid "Back"
-msgstr ""
+msgstr "Reversu"
 
 #. 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
+#: src/simple-scan.ui:225 src/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:241
+#: src/simple-scan.ui:241
 msgid "_Document"
 msgstr "_Documentu"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/simple-scan.ui:260
 msgid "Sc_an"
-msgstr ""
+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:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/simple-scan.ui:273 src/simple-scan.ui:1306 src/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:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/simple-scan.ui:283 src/simple-scan.ui:1315 src/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:294
+#: src/simple-scan.ui:294
 msgid "_Stop Scan"
-msgstr ""
+msgstr "_Parar d'escanear"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:310 src/simple-scan.ui:1330 src/simple-scan.ui:1380
 msgid "Text"
 msgstr "Testu"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:320 src/simple-scan.ui:1340 src/simple-scan.ui:1390
 msgid "Photo"
 msgstr "Semeya"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/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:367
+#: src/simple-scan.ui:367
 msgid "_Email"
-msgstr ""
+msgstr "_Corréu"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:430
 msgid "_Page"
 msgstr "_Páxina"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/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:450
+#: src/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "Voltiar a la _Drecha"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:460
 msgid "_Crop"
 msgstr "_Recortar"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:470
 msgid "_None"
 msgstr "_Dengún"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:514
 msgid "_Letter"
 msgstr "_Carta"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "Lle_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:536
 msgid "4×6"
 msgstr "4 × 6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:547
 msgid "_Custom"
 msgstr "_Personalizáu"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr "_Voltiar recorte"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/simple-scan.ui:578
 msgid "Move Left"
-msgstr ""
+msgstr "Mover a la izquierda"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/simple-scan.ui:587
 msgid "Move Right"
-msgstr ""
+msgstr "Mover a la drecha"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:624
 msgid "_Help"
 msgstr "_Ayuda"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:632
 msgid "_Contents"
-msgstr ""
+msgstr "_Conteníos"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:674 src/simple-scan.ui:885
 msgid "Start a new document"
-msgstr ""
+msgstr "Crear un documentu nuevu"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:675
 msgid "New"
-msgstr ""
+msgstr "Nuevu"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:689 src/simple-scan.ui:836
 msgid "Scan a single page from the scanner"
-msgstr ""
+msgstr "Escanear una sola páxina dende l'escáner"
 
 #. Label on scan toolbar item
-#: data/simple-scan.ui:691 data/simple-scan.ui:837
+#: src/simple-scan.ui:691 src/simple-scan.ui:837
 msgid "Scan"
-msgstr ""
+msgstr "Escanear"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:707 src/simple-scan.ui:864
 msgid "Save document to a file"
-msgstr ""
+msgstr "Guardar documentu nun ficheru"
 
-#: ../src/ui.vala:1842
+#: src/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
-msgstr ""
+msgstr "Guardar"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/simple-scan.ui:724 src/simple-scan.ui:824
 msgid "Stop the current scan"
-msgstr ""
+msgstr "Para l'escaneáu actual"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:725 src/simple-scan.ui:825
 msgid "Stop"
-msgstr ""
+msgstr "Parar"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:749 src/simple-scan.ui:936
 msgid "Rotate the page to the left (counter-clockwise)"
-msgstr ""
+msgstr "Voltiar la páxina a la esquierda (contrariu a les aguyes del reló)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: data/simple-scan.ui:750
+#: src/simple-scan.ui:750
 msgid "Rotate Left"
-msgstr ""
+msgstr "Voltiar a la esquierda"
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:764 src/simple-scan.ui:914
 msgid "Rotate the page to the right (clockwise)"
-msgstr ""
+msgstr "Voltiar la páxina a la drecha (contrariu a les aguyes del reló)"
 
 #. Label on rotate page right (clockwise) item
-#: data/simple-scan.ui:765
+#: src/simple-scan.ui:765
 msgid "Rotate Right"
-msgstr ""
+msgstr "Voltiar a la drecha"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:779 src/simple-scan.ui:963
 msgid "Crop the selected page"
-msgstr ""
+msgstr "Recortar la páxina esbillada"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:781
 msgid "Crop"
-msgstr ""
+msgstr "Recortar"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "Preferencies"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "Escan_ear:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1079
 msgid "_Text Resolution:"
-msgstr ""
+msgstr "Resolución de _testu:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1095
 msgid "_Photo Resolution:"
-msgstr ""
+msgstr "Resolución de _fotografía:"
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1139
 msgid "Scan Side:"
-msgstr ""
+msgstr "Escanear la cara:"
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1169
 msgid "Page Size:"
-msgstr ""
+msgstr "Tamañu de páxina:"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "Brillu:"
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "Contraste:"
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "Calidá:"
 
@@ -296,9 +298,9 @@ msgstr "Calidá:"
 msgid "Document Scanner"
 msgstr "Escáner de documentos"
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
-msgstr ""
+msgstr "Escanear documentos"
 
 #: data/simple-scan.desktop.in:6
 msgid "scan;scanner;flatbed;adf;"
@@ -308,7 +310,7 @@ msgstr "escanear;escáner;planu;adf;"
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 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 "
@@ -316,198 +318,198 @@ msgid ""
 "formats."
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 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 ""
+msgstr "Nun hai escáneres disponibles. Coneuta 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 "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:389
 msgid "Failed to scan"
 msgstr "Falló al escanerr"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 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:630
 #, 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 ""
+msgstr "Ficheros d'imaxe"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:527
 msgid "All Files"
-msgstr ""
+msgstr "Tolos Ficheros"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:536
 msgid "PDF (multi-page document)"
-msgstr ""
+msgstr "PDF (documentu multipáxina)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:542
 msgid "JPEG (compressed)"
-msgstr ""
+msgstr "JPEG (comprimíu)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:548
 msgid "PNG (lossless)"
-msgstr ""
+msgstr "PNG (ensin perda)"
 
 #. 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 ""
+msgstr "Los cambeos van perdese pa siempres si nun los atroxes."
 
 #. 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 ""
+msgstr "¿Guardar el documentu actual?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:710
 msgid "Discard Changes"
-msgstr ""
+msgstr "Descartar los cambeos"
 
 #. 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 ""
+msgstr "Nun puede abrise l'aplicación de vista previa d'imaxes"
 
 #. 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 ""
+msgstr "Nun pudo abrise'l ficheru d'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"
@@ -536,16 +538,16 @@ msgstr ""
 "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"
@@ -555,189 +557,189 @@ msgstr ""
 "  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 ""
+msgstr "¿Atroxar los cambeos enantes de colar?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1511
 msgid "Quit without Saving"
-msgstr ""
+msgstr "Colar ensin atroxar"
 
 #. 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 ""
+msgstr "%d ppp (predetermináu)"
 
 #. 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 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 ""
+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 ""
+msgstr "%d ppp"
 
-#: ../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 ""
+msgstr "Camudar d'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 ""
+msgstr "Automáticu"
 
-#: ../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:2182
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Guardando la páxina %d de %d"
diff --git a/po/az.gmo b/po/az.gmo
deleted file mode 100644
index 7ec7301..0000000
--- a/po/az.gmo
+++ /dev/null
diff --git a/po/az.po b/po/az.po
index c2f312f..343308a 100644
--- a/po/az.po
+++ b/po/az.po
@@ -7,288 +7,290 @@ 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"
+"POT-Creation-Date: 2017-03-27 22:33+1300\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-12-19 05:07+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:10+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr ""
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr ""
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Şifrə:"
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/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:192
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr "Ön"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/simple-scan.ui:196
 msgid "Back"
 msgstr "Arxa"
 
 #. 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
+#: src/simple-scan.ui:225 src/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
+#: src/simple-scan.ui:241
 msgid "_Document"
 msgstr "_Sәnәd"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/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
+#: src/simple-scan.ui:273 src/simple-scan.ui:1306 src/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
+#: src/simple-scan.ui:283 src/simple-scan.ui:1315 src/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:294
+#: src/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr ""
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:310 src/simple-scan.ui:1330 src/simple-scan.ui:1380
 msgid "Text"
 msgstr "Mətn"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:320 src/simple-scan.ui:1340 src/simple-scan.ui:1390
 msgid "Photo"
 msgstr ""
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/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
+#: src/simple-scan.ui:367
 msgid "_Email"
 msgstr "_Epoçt"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:430
 msgid "_Page"
 msgstr "_Səhifə"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr ""
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr ""
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:460
 msgid "_Crop"
 msgstr ""
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:470
 msgid "_None"
 msgstr ""
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:514
 msgid "_Letter"
 msgstr ""
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:525
 msgid "Le_gal"
 msgstr ""
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:536
 msgid "4×6"
 msgstr ""
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:547
 msgid "_Custom"
 msgstr ""
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr ""
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/simple-scan.ui:578
 msgid "Move Left"
 msgstr ""
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/simple-scan.ui:587
 msgid "Move Right"
 msgstr ""
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:624
 msgid "_Help"
 msgstr ""
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:632
 msgid "_Contents"
 msgstr ""
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:674 src/simple-scan.ui:885
 msgid "Start a new document"
 msgstr ""
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:675
 msgid "New"
 msgstr ""
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:689 src/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
+#: src/simple-scan.ui:691 src/simple-scan.ui:837
 msgid "Scan"
 msgstr ""
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:707 src/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr ""
 
-#: ../src/ui.vala:1842
+#: src/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
+#: src/simple-scan.ui:724 src/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr ""
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:725 src/simple-scan.ui:825
 msgid "Stop"
 msgstr ""
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:749 src/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
+#: src/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr ""
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:764 src/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
+#: src/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr ""
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:779 src/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "Seçilmiş səhifəni kəs"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:781
 msgid "Crop"
 msgstr "Kəs"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr ""
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr ""
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr ""
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr ""
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1260
 msgid "Quality:"
 msgstr ""
 
@@ -296,7 +298,7 @@ msgstr ""
 msgid "Document Scanner"
 msgstr ""
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr ""
 
@@ -308,7 +310,7 @@ msgstr ""
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 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 "
@@ -316,196 +318,196 @@ msgid ""
 "formats."
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 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:389
 msgid "Failed to scan"
 msgstr ""
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:630
 #, 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"
@@ -522,16 +524,16 @@ msgid ""
 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"
@@ -539,189 +541,189 @@ msgstr ""
 "  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:2182
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/bg.gmo b/po/bg.gmo
deleted file mode 100644
index 62c8b69..0000000
--- a/po/bg.gmo
+++ /dev/null
diff --git a/po/bg.po b/po/bg.po
index 53c66e6..3357b92 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -7,288 +7,290 @@ 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"
+"POT-Creation-Date: 2017-03-27 22:33+1300\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-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:10+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_Идентификация"
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "_Потребителско име за ресурса:"
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Парола:"
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/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
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr "Предна страна"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/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
+#: src/simple-scan.ui:225 src/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
+#: src/simple-scan.ui:241
 msgid "_Document"
 msgstr "_Документ"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/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
+#: src/simple-scan.ui:273 src/simple-scan.ui:1306 src/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
+#: src/simple-scan.ui:283 src/simple-scan.ui:1315 src/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr "Всички страници от _подавача"
 
 #. Menu entry to stop current scan
-#: data/simple-scan.ui:294
+#: src/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "_Спири сканирането"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:310 src/simple-scan.ui:1330 src/simple-scan.ui:1380
 msgid "Text"
 msgstr "Текст"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:320 src/simple-scan.ui:1340 src/simple-scan.ui:1390
 msgid "Photo"
 msgstr "Снимка"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/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
+#: src/simple-scan.ui:367
 msgid "_Email"
 msgstr "Изпрати по _имейл"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:430
 msgid "_Page"
 msgstr "_Страница"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "Завърти _наляво"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "Завърти на_дясно"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:460
 msgid "_Crop"
 msgstr "_Изрежи"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:470
 msgid "_None"
 msgstr "_Нищо"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:514
 msgid "_Letter"
 msgstr "US _Letter"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "US Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:536
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:547
 msgid "_Custom"
 msgstr "_Персонализирано"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr "_Завърти изрязаното"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/simple-scan.ui:578
 msgid "Move Left"
 msgstr "Премести наляво"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/simple-scan.ui:587
 msgid "Move Right"
 msgstr "Премести надясно"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:624
 msgid "_Help"
 msgstr "_Помощ"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:632
 msgid "_Contents"
 msgstr "_Съдържание"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:674 src/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "Създай нов документ"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:675
 msgid "New"
 msgstr "Нов"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:689 src/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
+#: src/simple-scan.ui:691 src/simple-scan.ui:837
 msgid "Scan"
 msgstr "Сканирай"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:707 src/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "Съхрани документа като файл"
 
-#: ../src/ui.vala:1842
+#: src/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
+#: src/simple-scan.ui:724 src/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "Спри текущото сканиране"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:725 src/simple-scan.ui:825
 msgid "Stop"
 msgstr "Спри"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:749 src/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
+#: src/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "Завърти наляво"
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:764 src/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
+#: src/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "Завърти надясно"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:779 src/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "Изрежи избраната страница"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:781
 msgid "Crop"
 msgstr "Изрежи"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "Настройки"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "Изт_очник на сканиране:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "_Резолюция на текста:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "_Резолюция на снимката:"
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "Избор на страна за сканиране:"
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "Размер на листа:"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "Яркост:"
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "Контраст:"
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "Качество:"
 
@@ -296,7 +298,7 @@ msgstr "Качество:"
 msgid "Document Scanner"
 msgstr ""
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr "Сканиране на документи"
 
@@ -308,7 +310,7 @@ msgstr ""
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 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 "
@@ -316,197 +318,197 @@ msgid ""
 "formats."
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 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:389
 msgid "Failed to scan"
 msgstr "Неусшно сканиране"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 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:630
 #, 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"
@@ -537,16 +539,16 @@ 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"
@@ -559,189 +561,189 @@ msgstr ""
 "  Филип Андонов 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:2182
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Съхраняване на страница %d от %d"
diff --git a/po/bo.gmo b/po/bo.gmo
deleted file mode 100644
index 5214c5a..0000000
--- a/po/bo.gmo
+++ /dev/null
diff --git a/po/bo.po b/po/bo.po
index cbe7c76..32ce4c4 100644
--- a/po/bo.po
+++ b/po/bo.po
@@ -7,288 +7,290 @@ 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"
+"POT-Creation-Date: 2017-03-27 22:33+1300\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-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:11+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "ཐོབ་ཐང་སྟེར_A"
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "གཏེར་མཛོད་སྤྱོད་མཁན་གྱི་མིང་_U:"
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr "གསང་གྲངས_P:"
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/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
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr "མདུན་ཕྱོགས"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/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
+#: src/simple-scan.ui:225 src/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
+#: src/simple-scan.ui:241
 msgid "_Document"
 msgstr "ཡི་གེ_D"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/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
+#: src/simple-scan.ui:273 src/simple-scan.ui:1306 src/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
+#: src/simple-scan.ui:283 src/simple-scan.ui:1315 src/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr "སྤྲོད་མཁན་ནས་བྱུང་བའི་ཤོག་ལེབ་ཡོངས་རྫོགས _F"
 
 #. Menu entry to stop current scan
-#: data/simple-scan.ui:294
+#: src/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "པར་ལེན་མཚམས་བཞག_S"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:310 src/simple-scan.ui:1330 src/simple-scan.ui:1380
 msgid "Text"
 msgstr "ཡི་གེ"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:320 src/simple-scan.ui:1340 src/simple-scan.ui:1390
 msgid "Photo"
 msgstr "པར"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/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
+#: src/simple-scan.ui:367
 msgid "_Email"
 msgstr "གློག་འཕྲིན_E"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:430
 msgid "_Page"
 msgstr "ཤོག་ལེབ_P"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "གཡོན་སྐོར _L"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "གཡས་སྐོར་ _R"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:460
 msgid "_Crop"
 msgstr "གཅོད_C"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:470
 msgid "_None"
 msgstr "ཅི་མེད་པ_N"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:514
 msgid "_Letter"
 msgstr "འཕྲིན་ཡིག_L"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "ཁྲིམས་མཐུན_g"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:536
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:547
 msgid "_Custom"
 msgstr "སྲོལ་རྒྱུན_C"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr "དྲས་གཅོད་སྐོར་བ_R"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/simple-scan.ui:578
 msgid "Move Left"
 msgstr "གཡོན་ལ་སྤོར"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/simple-scan.ui:587
 msgid "Move Right"
 msgstr "གཡས་ལ་སྤོར"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:624
 msgid "_Help"
 msgstr "རོགས་རམ_H"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:632
 msgid "_Contents"
 msgstr "ནང་གསེས_C"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:674 src/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "ཡིག་གེ་གསར་འཛུགས"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:675
 msgid "New"
 msgstr "གསར་པ"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:689 src/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
+#: src/simple-scan.ui:691 src/simple-scan.ui:837
 msgid "Scan"
 msgstr "པར་བཤུ"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:707 src/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "ཡི་གེ་ཡིག་ཆའི་ནང་གསོག་ཉར"
 
-#: ../src/ui.vala:1842
+#: src/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
+#: src/simple-scan.ui:724 src/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "པར་བཤུ་བྱེད་བཞིན་པ་དེ་མཚམས་བཞག"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:725 src/simple-scan.ui:825
 msgid "Stop"
 msgstr "མཚམས་བཞག"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:749 src/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
+#: src/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "གཡོན་སྐོར"
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:764 src/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
+#: src/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "གཡས་སྐོར"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:779 src/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "བདམས་ཟིན་པའི་ཤོག་ལེབ་གཅད་བཟོ"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:781
 msgid "Crop"
 msgstr "གཅད"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "རང་མོས་སྒྲིག་བཟོ"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "པར་བཤུ་གཏེར་མཛོད_o:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "ཡི་གེའི་སྤུས་ཚད_T"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "པར་གྱི་སྤྭུས་ཚད"
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "ཟུར་པར་བཤུ"
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "ཤོག་ལེབ་ཞེང་ཚད"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "དཀར་ཚད:"
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "སྤུས་ཚད:"
 
@@ -296,7 +298,7 @@ msgstr "སྤུས་ཚད:"
 msgid "Document Scanner"
 msgstr ""
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr "ཡིག་གེ་པར་བཤུ"
 
@@ -308,7 +310,7 @@ msgstr ""
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 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 "
@@ -316,196 +318,196 @@ msgid ""
 "formats."
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 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:389
 msgid "Failed to scan"
 msgstr "པར་བཤུ་བྱེད་མ་ཐུབ་པ"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:630
 #, 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"
@@ -534,16 +536,16 @@ msgstr ""
 "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"
@@ -551,189 +553,189 @@ msgstr ""
 "  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:2182
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/boldquot.sed b/po/boldquot.sed
deleted file mode 100644
index 4b937aa..0000000
--- a/po/boldquot.sed
+++ /dev/null
@@ -1,10 +0,0 @@
-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
deleted file mode 100644
index 7fd4d6f..0000000
--- a/po/ca.gmo
+++ /dev/null
diff --git a/po/ca.po b/po/ca.po
index fa80893..fdd6250 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,288 +7,290 @@ 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"
+"POT-Creation-Date: 2017-03-27 22:33+1300\n"
 "PO-Revision-Date: 2016-12-24 18:03+0000\n"
 "Last-Translator: Walter Garcia-Fontes <walter.garcia@upf.edu>\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-12-25 05:04+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:10+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_Autoritza"
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "_Nom d'usuari del recurs:"
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Contrasenya:"
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/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:192
+#: src/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:196
+#: src/simple-scan.ui:196
 msgid "Back"
 msgstr "Revers de la pàgina"
 
 #. 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
+#: src/simple-scan.ui:225 src/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:241
+#: src/simple-scan.ui:241
 msgid "_Document"
 msgstr "_Document"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/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:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/simple-scan.ui:273 src/simple-scan.ui:1306 src/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:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/simple-scan.ui:283 src/simple-scan.ui:1315 src/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:294
+#: src/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "_Atura l'escaneig"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:310 src/simple-scan.ui:1330 src/simple-scan.ui:1380
 msgid "Text"
 msgstr "Text"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:320 src/simple-scan.ui:1340 src/simple-scan.ui:1390
 msgid "Photo"
 msgstr "Foto"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/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:367
+#: src/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:430
+#: src/simple-scan.ui:430
 msgid "_Page"
 msgstr "_Pàgina"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "Gira a l'_esquerra"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "Gira a la _dreta"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:460
 msgid "_Crop"
 msgstr "_Escapçament"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:470
 msgid "_None"
 msgstr "_Cap"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:514
 msgid "_Letter"
 msgstr "_Carta EUA"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "Le_gal EUA"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:536
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:547
 msgid "_Custom"
 msgstr "_Personalitzat"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/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:578
+#: src/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:587
+#: src/simple-scan.ui:587
 msgid "Move Right"
 msgstr "Mou a la dreta"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:624
 msgid "_Help"
 msgstr "A_juda"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:632
 msgid "_Contents"
 msgstr "C_ontingut"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:674 src/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "Comença un document nou"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:675
 msgid "New"
 msgstr "Nou"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:689 src/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:691 data/simple-scan.ui:837
+#: src/simple-scan.ui:691 src/simple-scan.ui:837
 msgid "Scan"
 msgstr "Escaneja"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:707 src/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "Desa el document en un fitxer"
 
-#: ../src/ui.vala:1842
+#: src/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "Desa"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/simple-scan.ui:724 src/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "Atura l'escaneig actual"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:725 src/simple-scan.ui:825
 msgid "Stop"
 msgstr "Atura"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:749 src/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:750
+#: src/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "Gira a l'esquerra"
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:764 src/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:765
+#: src/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "Gira a la dreta"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:779 src/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "Escapça la pàgina seleccionada"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:781
 msgid "Crop"
 msgstr "Escapça"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "Preferències"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "Font d'_escaneig:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "_Resolució de text:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "_Resolució fotogràfica:"
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "Cara a escanejar:"
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "Mida de la pàgina:"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "Brillantor:"
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "Contrast:"
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "Qualitat:"
 
@@ -296,7 +298,7 @@ msgstr "Qualitat:"
 msgid "Document Scanner"
 msgstr "Escanejador de documents"
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr "Escanegeu documents"
 
@@ -308,7 +310,7 @@ msgstr "escanejar;escàner;pla;adf;"
 msgid "scanner"
 msgstr "escàner"
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 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 "
@@ -320,7 +322,7 @@ msgstr ""
 "incorrecta.  Podeu imprimir els vostres escanejos, exportar-los a pdf, o "
 "desar-los en diversos formats d'imatge."
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
@@ -328,193 +330,193 @@ msgstr ""
 "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:389
 msgid "Failed to scan"
 msgstr "Ha fallat l'escaneig"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 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:630
 #, 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 "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 "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 "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 "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 "Combina els costats (inrevès)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1226
 msgid "Reverse"
 msgstr "Reverteix"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1236
 msgid "Keep unchanged"
 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"
@@ -546,16 +548,16 @@ msgstr ""
 "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"
@@ -571,22 +573,22 @@ msgstr ""
 "  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 "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>."
@@ -595,12 +597,12 @@ msgstr ""
 "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 "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>."
@@ -609,17 +611,17 @@ msgstr ""
 "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 "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 "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>."
@@ -628,138 +630,138 @@ msgstr ""
 "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 "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 "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 "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 "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 "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 "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 "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 "Quant a"
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1855
 msgid "Quit"
 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 "_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:2182
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "S'està desant la pàgina %d de %d"
diff --git a/po/ca@valencia.gmo b/po/ca@valencia.gmo
deleted file mode 100644
index 938ad71..0000000
--- a/po/ca@valencia.gmo
+++ /dev/null
diff --git a/po/ca@valencia.po b/po/ca@valencia.po
index 90cddce..c81f3cc 100644
--- a/po/ca@valencia.po
+++ b/po/ca@valencia.po
@@ -7,288 +7,290 @@ 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: 2012-04-17 06:12+0000\n"
-"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
+"POT-Creation-Date: 2017-03-27 22:33+1300\n"
+"PO-Revision-Date: 2017-03-29 06:28+0000\n"
+"Last-Translator: David Planella <david.planella@gmail.com>\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-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:11+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_Autoritza"
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "_Nom d'usuari del recurs:"
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Contrasenya:"
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/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:192
+#: src/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:196
+#: src/simple-scan.ui:196
 msgid "Back"
 msgstr "Revers de la pàgina"
 
 #. 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
+#: src/simple-scan.ui:225 src/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:241
+#: src/simple-scan.ui:241
 msgid "_Document"
 msgstr "_Document"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/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:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/simple-scan.ui:273 src/simple-scan.ui:1306 src/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:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/simple-scan.ui:283 src/simple-scan.ui:1315 src/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:294
+#: src/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "_Atura l'escaneig"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:310 src/simple-scan.ui:1330 src/simple-scan.ui:1380
 msgid "Text"
 msgstr "Text"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:320 src/simple-scan.ui:1340 src/simple-scan.ui:1390
 msgid "Photo"
 msgstr "Foto"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/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
+#: src/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:430
+#: src/simple-scan.ui:430
 msgid "_Page"
 msgstr "_Pàgina"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "Gira a l'_esquerra"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "Gira a la _dreta"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:460
 msgid "_Crop"
 msgstr "_Escapçament"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:470
 msgid "_None"
 msgstr "_Cap"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:514
 msgid "_Letter"
 msgstr "_Carta EUA"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "Le_gal EUA"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:536
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:547
 msgid "_Custom"
 msgstr "_Personalitzat"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/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:578
+#: src/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:587
+#: src/simple-scan.ui:587
 msgid "Move Right"
 msgstr "Mou a la dreta"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:624
 msgid "_Help"
 msgstr "A_juda"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:632
 msgid "_Contents"
 msgstr "C_ontingut"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:674 src/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "Comença un document nou"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:675
 msgid "New"
 msgstr "Nou"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:689 src/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:691 data/simple-scan.ui:837
+#: src/simple-scan.ui:691 src/simple-scan.ui:837
 msgid "Scan"
 msgstr "Escaneja"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:707 src/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "Guarda el document en un fitxer"
 
-#: ../src/ui.vala:1842
+#: src/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "Guarda"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/simple-scan.ui:724 src/simple-scan.ui:824
 msgid "Stop the current scan"
-msgstr "Para l'escaneig actual"
+msgstr "Atura l'escaneig actual"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:725 src/simple-scan.ui:825
 msgid "Stop"
-msgstr "Para"
+msgstr "Atura"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:749 src/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:750
+#: src/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "Gira a l'esquerra"
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:764 src/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:765
+#: src/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "Gira a la dreta"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:779 src/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "Escapça la pàgina seleccionada"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:781
 msgid "Crop"
 msgstr "Escapça"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "Preferències"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "Font d'_escaneig:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "_Resolució de text:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "_Resolució fotogràfica:"
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "Cara a escanejar:"
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "Mida de la pàgina:"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "Brillantor:"
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "Contrast:"
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "Qualitat:"
 
@@ -296,7 +298,7 @@ msgstr "Qualitat:"
 msgid "Document Scanner"
 msgstr ""
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr "Escanegeu documents"
 
@@ -308,7 +310,7 @@ msgstr ""
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 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 "
@@ -316,199 +318,199 @@ msgid ""
 "formats."
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 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"
+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:389
 msgid "Failed to scan"
 msgstr "Ha fallat l'escaneig"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 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:630
 #, 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"
@@ -540,16 +542,16 @@ msgstr ""
 "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"
@@ -557,189 +559,189 @@ msgstr ""
 "  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:2182
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "S'està guardant la pàgina %d de %d"
diff --git a/po/ce.gmo b/po/ce.gmo
deleted file mode 100644
index 8987b26..0000000
--- a/po/ce.gmo
+++ /dev/null
diff --git a/po/ce.po b/po/ce.po
index aa437b9..9ddea1b 100644
--- a/po/ce.po
+++ b/po/ce.po
@@ -7,288 +7,290 @@ 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"
+"POT-Creation-Date: 2017-03-27 22:33+1300\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-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:10+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr ""
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr ""
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr ""
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/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
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr ""
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/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
+#: src/simple-scan.ui:225 src/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
+#: src/simple-scan.ui:241
 msgid "_Document"
 msgstr ""
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/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
+#: src/simple-scan.ui:273 src/simple-scan.ui:1306 src/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
+#: src/simple-scan.ui:283 src/simple-scan.ui:1315 src/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr ""
 
 #. Menu entry to stop current scan
-#: data/simple-scan.ui:294
+#: src/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr ""
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:310 src/simple-scan.ui:1330 src/simple-scan.ui:1380
 msgid "Text"
 msgstr ""
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:320 src/simple-scan.ui:1340 src/simple-scan.ui:1390
 msgid "Photo"
 msgstr ""
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/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
+#: src/simple-scan.ui:367
 msgid "_Email"
 msgstr ""
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:430
 msgid "_Page"
 msgstr ""
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr ""
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr ""
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:460
 msgid "_Crop"
 msgstr ""
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:470
 msgid "_None"
 msgstr ""
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:481
 msgid "A_4"
 msgstr ""
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:492
 msgid "A_5"
 msgstr ""
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:503
 msgid "A_6"
 msgstr ""
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:514
 msgid "_Letter"
 msgstr ""
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:525
 msgid "Le_gal"
 msgstr ""
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:536
 msgid "4×6"
 msgstr ""
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:547
 msgid "_Custom"
 msgstr ""
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr ""
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/simple-scan.ui:578
 msgid "Move Left"
 msgstr ""
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/simple-scan.ui:587
 msgid "Move Right"
 msgstr ""
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:624
 msgid "_Help"
 msgstr ""
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:632
 msgid "_Contents"
 msgstr ""
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:674 src/simple-scan.ui:885
 msgid "Start a new document"
 msgstr ""
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:675
 msgid "New"
 msgstr ""
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:689 src/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
+#: src/simple-scan.ui:691 src/simple-scan.ui:837
 msgid "Scan"
 msgstr ""
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:707 src/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr ""
 
-#: ../src/ui.vala:1842
+#: src/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
+#: src/simple-scan.ui:724 src/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr ""
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:725 src/simple-scan.ui:825
 msgid "Stop"
 msgstr ""
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:749 src/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
+#: src/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr ""
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:764 src/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
+#: src/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr ""
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:779 src/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr ""
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:781
 msgid "Crop"
 msgstr ""
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr ""
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr ""
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr ""
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr ""
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1260
 msgid "Quality:"
 msgstr ""
 
@@ -296,7 +298,7 @@ msgstr ""
 msgid "Document Scanner"
 msgstr ""
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr ""
 
@@ -308,7 +310,7 @@ msgstr ""
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 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 "
@@ -316,196 +318,196 @@ msgid ""
 "formats."
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 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:389
 msgid "Failed to scan"
 msgstr ""
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:630
 #, 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"
@@ -522,203 +524,203 @@ msgid ""
 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:2182
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/cs.gmo b/po/cs.gmo
deleted file mode 100644
index f40b2fe..0000000
--- a/po/cs.gmo
+++ /dev/null
diff --git a/po/cs.po b/po/cs.po
index 3d5fa37..dfe9a23 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,288 +7,290 @@ 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"
+"POT-Creation-Date: 2017-03-27 22:33+1300\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-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:10+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_Autorizovat"
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "_Vlastní pojmenování zdroje:"
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Heslo:"
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/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:192
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr "Přední"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/simple-scan.ui:196
 msgid "Back"
 msgstr "Zadní"
 
 #. 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
+#: src/simple-scan.ui:225 src/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:241
+#: src/simple-scan.ui:241
 msgid "_Document"
 msgstr "_Dokument"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/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:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/simple-scan.ui:273 src/simple-scan.ui:1306 src/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:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/simple-scan.ui:283 src/simple-scan.ui:1315 src/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:294
+#: src/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "_Zastavit skenování"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:310 src/simple-scan.ui:1330 src/simple-scan.ui:1380
 msgid "Text"
 msgstr "Text"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:320 src/simple-scan.ui:1340 src/simple-scan.ui:1390
 msgid "Photo"
 msgstr "Fotografie"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/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:367
+#: src/simple-scan.ui:367
 msgid "_Email"
 msgstr "_E-mail"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:430
 msgid "_Page"
 msgstr "_Stránka"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "Otočit do_leva"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "Otočit dop_rava"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:460
 msgid "_Crop"
 msgstr "_Oříznout"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:470
 msgid "_None"
 msgstr "Žád_né"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:514
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:536
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:547
 msgid "_Custom"
 msgstr "_Vlastní"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/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:578
+#: src/simple-scan.ui:578
 msgid "Move Left"
 msgstr "Posunout doleva"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/simple-scan.ui:587
 msgid "Move Right"
 msgstr "Posunout doprava"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:624
 msgid "_Help"
 msgstr "_Nápověda"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:632
 msgid "_Contents"
 msgstr "_Obsah"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:674 src/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "Vytvořit nový dokument"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:675
 msgid "New"
 msgstr "Nový"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:689 src/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:691 data/simple-scan.ui:837
+#: src/simple-scan.ui:691 src/simple-scan.ui:837
 msgid "Scan"
 msgstr "Skenovat"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:707 src/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "Uložit dokument do souboru"
 
-#: ../src/ui.vala:1842
+#: src/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "Uložit"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/simple-scan.ui:724 src/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "Zastavit probíhající skenování"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:725 src/simple-scan.ui:825
 msgid "Stop"
 msgstr "Zastavit"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:749 src/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:750
+#: src/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "Otočit doleva"
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:764 src/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:765
+#: src/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "Otočit doprava"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:779 src/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "Oříznout vybranou stránku"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:781
 msgid "Crop"
 msgstr "Oříznout"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "Předvolby"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "_Zdroj skenování:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "_Rozlišení textu:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "_Rozlišení fotografie:"
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "Skenovat stranu:"
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "Velikost stránky:"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "Jas:"
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "Kontrast:"
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "Kvalita:"
 
@@ -296,7 +298,7 @@ msgstr "Kvalita:"
 msgid "Document Scanner"
 msgstr "Skener dokumentu"
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr "Naskenovat dokumenty"
 
@@ -308,7 +310,7 @@ msgstr "scan;scanner;flatbed;adf;"
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 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 "
@@ -320,200 +322,200 @@ 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/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 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:389
 msgid "Failed to scan"
 msgstr "Skenování selhalo"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 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:630
 #, 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"
@@ -543,16 +545,16 @@ msgstr ""
 "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"
@@ -570,22 +572,22 @@ msgstr ""
 "  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>."
@@ -594,12 +596,12 @@ msgstr ""
 "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>."
@@ -608,17 +610,17 @@ msgstr ""
 "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>."
@@ -627,138 +629,138 @@ msgstr ""
 "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:2182
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Ukládání strany %d z %d"
diff --git a/po/da.gmo b/po/da.gmo
deleted file mode 100644
index 857e192..0000000
--- a/po/da.gmo
+++ /dev/null
diff --git a/po/da.po b/po/da.po
index 0d0390f..2c0ea7c 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,288 +7,290 @@ 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"
+"POT-Creation-Date: 2017-03-27 22:33+1300\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-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:10+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_Autorisér"
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "Br_ugernavn for ressource:"
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Adgangskode:"
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/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:192
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr "Forside"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/simple-scan.ui:196
 msgid "Back"
 msgstr "Bagside"
 
 #. 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
+#: src/simple-scan.ui:225 src/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:241
+#: src/simple-scan.ui:241
 msgid "_Document"
 msgstr "_Dokument"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/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:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/simple-scan.ui:273 src/simple-scan.ui:1306 src/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:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/simple-scan.ui:283 src/simple-scan.ui:1315 src/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:294
+#: src/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "_Stop skanning"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:310 src/simple-scan.ui:1330 src/simple-scan.ui:1380
 msgid "Text"
 msgstr "Tekst"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:320 src/simple-scan.ui:1340 src/simple-scan.ui:1390
 msgid "Photo"
 msgstr "Billede"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/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:367
+#: src/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:430
+#: src/simple-scan.ui:430
 msgid "_Page"
 msgstr "_Side"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "Rotér mod _venstre"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "Rotér mod _højre"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:460
 msgid "_Crop"
 msgstr "_Beskær"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:470
 msgid "_None"
 msgstr "_Ingen"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:514
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:536
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:547
 msgid "_Custom"
 msgstr "_Brugertilpasset"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/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:578
+#: src/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:587
+#: src/simple-scan.ui:587
 msgid "Move Right"
 msgstr "Flyt til højre"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:624
 msgid "_Help"
 msgstr "_Hjælp"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:632
 msgid "_Contents"
 msgstr "_Indhold"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:674 src/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "Start et nyt dokument"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:675
 msgid "New"
 msgstr "Nyt"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:689 src/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:691 data/simple-scan.ui:837
+#: src/simple-scan.ui:691 src/simple-scan.ui:837
 msgid "Scan"
 msgstr "Skan"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:707 src/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "Gem dokument som en fil"
 
-#: ../src/ui.vala:1842
+#: src/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "Gem"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/simple-scan.ui:724 src/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "Stop den igangværende skanning"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:725 src/simple-scan.ui:825
 msgid "Stop"
 msgstr "Stop"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:749 src/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:750
+#: src/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "Rotér mod venstre"
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:764 src/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:765
+#: src/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "Rotér mod højre"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:779 src/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "Beskær den markerede side"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:781
 msgid "Crop"
 msgstr "Beskær"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "Indstillinger"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "Skanner_kilde:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "_Tekstopløsning:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "_Billedopløsning:"
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "Skan side:"
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "Sidestørrelse:"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "Lysstyrke:"
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "Kontrast:"
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "Kvalitet:"
 
@@ -296,7 +298,7 @@ msgstr "Kvalitet:"
 msgid "Document Scanner"
 msgstr "Dokumentskanner"
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr "Skan dokumenter"
 
@@ -308,7 +310,7 @@ msgstr "scan;scanner;flatbed;adf;skan;skanner;"
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 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 "
@@ -320,7 +322,7 @@ msgstr ""
 "kan udskrive dine skanninger, eksportere dem til pdf eller gemme dem i en "
 "række billedformater."
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
@@ -328,192 +330,192 @@ msgstr ""
 "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:389
 msgid "Failed to scan"
 msgstr "Skanning mislykkedes"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 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:630
 #, 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"
@@ -542,21 +544,21 @@ msgstr ""
 "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"
 "  AJenbo https://launchpad.net/~ajenbo\n"
-"  Aputsiaĸ Niels Janussen https://launchpad.net/~aj\n"
+"  Aputsiak Niels Janussen https://launchpad.net/~aj\n"
 "  Ask Hjorth Larsen https://launchpad.net/~askhl\n"
 "  David Nielsen https://launchpad.net/~davidnielsen-deactivatedaccount\n"
 "  Joe Hansen https://launchpad.net/~joedalton2\n"
@@ -568,22 +570,22 @@ msgstr ""
 "  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>."
@@ -592,12 +594,12 @@ msgstr ""
 "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>."
@@ -606,17 +608,17 @@ msgstr ""
 "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>."
@@ -625,138 +627,138 @@ msgstr ""
 "hjemmeside</a>."
 
 #. 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:2182
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Gemmer side %d ud af %d"
diff --git a/po/de.gmo b/po/de.gmo
deleted file mode 100644
index 8ec1a62..0000000
--- a/po/de.gmo
+++ /dev/null
diff --git a/po/de.po b/po/de.po
index 2c52497..962f465 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,288 +7,290 @@ 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: 2015-01-16 18:30+0000\n"
-"Last-Translator: Tobias Bannert <tobannert@gmail.com>\n"
+"POT-Creation-Date: 2017-03-27 22:33+1300\n"
+"PO-Revision-Date: 2017-03-29 06:26+0000\n"
+"Last-Translator: Ettore Atalan <atalanttore@googlemail.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-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:10+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_Legitimieren"
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "_Benutzername für Quelle:"
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Passwort:"
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/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:192
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr "Vorderseite"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/simple-scan.ui:196
 msgid "Back"
 msgstr "Rückseite"
 
 #. 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
+#: src/simple-scan.ui:225 src/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:241
+#: src/simple-scan.ui:241
 msgid "_Document"
 msgstr "_Dokument"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/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:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/simple-scan.ui:273 src/simple-scan.ui:1306 src/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:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/simple-scan.ui:283 src/simple-scan.ui:1315 src/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:294
+#: src/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "_Scanvorgang anhalten"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:310 src/simple-scan.ui:1330 src/simple-scan.ui:1380
 msgid "Text"
 msgstr "Text"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:320 src/simple-scan.ui:1340 src/simple-scan.ui:1390
 msgid "Photo"
 msgstr "Foto"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/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:367
+#: src/simple-scan.ui:367
 msgid "_Email"
 msgstr "_E-Mail"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:430
 msgid "_Page"
 msgstr "_Seite"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "_Links herum drehen"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "_Rechts herum drehen"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:460
 msgid "_Crop"
 msgstr "_Zuschneiden"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:470
 msgid "_None"
 msgstr "_Nicht zuschneiden"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:514
 msgid "_Letter"
 msgstr "US _Letter"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "US _Legal"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:536
 msgid "4×6"
 msgstr "4×6 Zoll"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:547
 msgid "_Custom"
 msgstr "_Benutzerdefiniert"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr "Zuschneideauswahl _drehen"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/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:587
+#: src/simple-scan.ui:587
 msgid "Move Right"
 msgstr "Nach rechts schieben"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:624
 msgid "_Help"
 msgstr "_Hilfe"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:632
 msgid "_Contents"
 msgstr "I_nhalt"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:674 src/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "Neues Dokument erstellen"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:675
 msgid "New"
 msgstr "Neu"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:689 src/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:691 data/simple-scan.ui:837
+#: src/simple-scan.ui:691 src/simple-scan.ui:837
 msgid "Scan"
 msgstr "Scannen"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:707 src/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "Als Datei speichern"
 
-#: ../src/ui.vala:1842
+#: src/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "Speichern"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/simple-scan.ui:724 src/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "Aktuellen Scanvorgang unterbrechen"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:725 src/simple-scan.ui:825
 msgid "Stop"
 msgstr "Anhalten"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:749 src/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:750
+#: src/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "Links herum drehen"
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:764 src/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:765
+#: src/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "Rechts herum drehen"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:779 src/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "Die gewählte Seite zurechtschneiden"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:781
 msgid "Crop"
 msgstr "Zuschneiden"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "Einstellungen"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "Scan-_Quelle:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "_Textauflösung:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "_Fotoauflösung:"
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "Zu scannende Seite:"
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "Seitengröße:"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "Helligkeit:"
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "Kontrast:"
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "Qualität:"
 
@@ -296,7 +298,7 @@ msgstr "Qualität:"
 msgid "Document Scanner"
 msgstr "Dokument-Scanner"
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr "Dokumente scannen"
 
@@ -306,9 +308,9 @@ msgstr "scan;einlesen;scanner;Flachbrett;flatbed;AVW;Vorlagenwechsler;adf;"
 
 #: data/simple-scan.desktop.in:8
 msgid "scanner"
-msgstr ""
+msgstr "Scanner"
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 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 "
@@ -321,7 +323,7 @@ msgstr ""
 "Dokument exportiert oder in einer Anzahl verschiedener Bildformate "
 "gespeichert werden."
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
@@ -329,197 +331,197 @@ msgstr ""
 "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:389
 msgid "Failed to scan"
 msgstr "Scannen fehlgeschlagen"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 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:630
 #, 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"
@@ -553,16 +555,16 @@ msgstr ""
 "<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"
@@ -609,22 +611,22 @@ msgstr ""
 "  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>."
@@ -633,12 +635,12 @@ msgstr ""
 "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>."
@@ -647,17 +649,17 @@ msgstr ""
 "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>."
@@ -666,138 +668,138 @@ msgstr ""
 "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:2182
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Seite %d von %d wird gespeichert"
diff --git a/po/el.gmo b/po/el.gmo
deleted file mode 100644
index 594f02d..0000000
--- a/po/el.gmo
+++ /dev/null
diff --git a/po/el.po b/po/el.po
index ede25bb..0df0fb8 100644
--- a/po/el.po
+++ b/po/el.po
@@ -7,288 +7,290 @@ 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: 2013-07-03 07:45+0000\n"
-"Last-Translator: John Pag <ioanpagges@gmail.com>\n"
+"POT-Creation-Date: 2017-03-27 22:33+1300\n"
+"PO-Revision-Date: 2017-03-29 06:27+0000\n"
+"Last-Translator: George0k00 <hellenicglavkosmos@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-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:10+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_Εξουσιοδότηση"
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "Όνομα _χρήστη για πόρο:"
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Κωδικός:"
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/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
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr "Πρόσοψη"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/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
+#: src/simple-scan.ui:225 src/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
+#: src/simple-scan.ui:241
 msgid "_Document"
 msgstr "_Έγγραφο"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/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
+#: src/simple-scan.ui:273 src/simple-scan.ui:1306 src/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
+#: src/simple-scan.ui:283 src/simple-scan.ui:1315 src/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr "Όλες τις σελίδες από την _τροφοδοσία"
 
 #. Menu entry to stop current scan
-#: data/simple-scan.ui:294
+#: src/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "_Διακοπή σάρωσης"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:310 src/simple-scan.ui:1330 src/simple-scan.ui:1380
 msgid "Text"
 msgstr "ΚΕΙΜΕΝΟ"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:320 src/simple-scan.ui:1340 src/simple-scan.ui:1390
 msgid "Photo"
 msgstr "Φωτογραφία"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/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
+#: src/simple-scan.ui:367
 msgid "_Email"
 msgstr "_Email"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:430
 msgid "_Page"
 msgstr "_Σελίδα"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "Περιστροφή _αριστερά"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "Περιστροφή _δεξιά"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:460
 msgid "_Crop"
 msgstr "_Περικοπή"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:470
 msgid "_None"
 msgstr "_Κανένα"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:514
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:536
 msgid "4×6"
 msgstr "4×6 ίντσες"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:547
 msgid "_Custom"
 msgstr "_Προσαρμοσμένο"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr "_Περιστροφή περικοπής"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/simple-scan.ui:578
 msgid "Move Left"
 msgstr "Μετακίνηση αριστερά"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/simple-scan.ui:587
 msgid "Move Right"
 msgstr "Μετακίνηση δεξιά"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:624
 msgid "_Help"
 msgstr "_Βοήθεια"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:632
 msgid "_Contents"
 msgstr "_Περιεχόμενα"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:674 src/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "Δημιουργία νέου εγγράφου"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:675
 msgid "New"
 msgstr "Νέο"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:689 src/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
+#: src/simple-scan.ui:691 src/simple-scan.ui:837
 msgid "Scan"
 msgstr "Σάρωση"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:707 src/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "Αποθήκευση εγγράφου σε αρχείο"
 
-#: ../src/ui.vala:1842
+#: src/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
+#: src/simple-scan.ui:724 src/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "Διακοπή τρέχουσας σάρωσης"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:725 src/simple-scan.ui:825
 msgid "Stop"
 msgstr "Διακοπή"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:749 src/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
+#: src/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "Περιστροφή αριστερά"
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:764 src/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
+#: src/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "Περιστροφή δεξιά"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:779 src/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "Περικοπή της επιλεγμένης σελίδας"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:781
 msgid "Crop"
 msgstr "Περικοπή"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "Προτιμήσεις"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "_Πηγή σάρωσης:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "Ανάλυση _κειμένου:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "Ανάλυση _φωτογραφίας:"
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "Πλευρά σάρωσης"
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "Μέγεθος σελίδας:"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "Φωτεινότητα:"
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "Αντίθεση:"
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "Ποιότητα:"
 
@@ -296,7 +298,7 @@ msgstr "Ποιότητα:"
 msgid "Document Scanner"
 msgstr "Σαρωτής εγγράφων"
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr "Σάρωση εγγράφων"
 
@@ -308,7 +310,7 @@ msgstr ""
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 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 "
@@ -316,202 +318,202 @@ msgid ""
 "formats."
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 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:389
 msgid "Failed to scan"
 msgstr "Η σάρωση απέτυχε"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[ΣΥΣΚΕΥΗ…] - Εφαρμογή σάρωσης"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:630
 #, 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 ""
+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 ""
+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"
@@ -543,16 +545,16 @@ 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"
@@ -573,189 +575,189 @@ msgstr ""
 "  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:2182
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Αποθήκευση σελίδας %d από %d"
diff --git a/po/en@boldquot.header b/po/en@boldquot.header
deleted file mode 100644
index fedb6a0..0000000
--- a/po/en@boldquot.header
+++ /dev/null
@@ -1,25 +0,0 @@
-# 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
deleted file mode 100644
index a9647fc..0000000
--- a/po/en@quot.header
+++ /dev/null
@@ -1,22 +0,0 @@
-# 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
deleted file mode 100644
index 3400101..0000000
--- a/po/en_GB.gmo
+++ /dev/null
diff --git a/po/en_GB.po b/po/en_GB.po
index c956c58..d41ab66 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,288 +7,290 @@ 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"
+"POT-Creation-Date: 2017-03-27 22:33+1300\n"
 "PO-Revision-Date: 2012-07-23 08:58+0000\n"
 "Last-Translator: James Thorrold <j.thorrold@virgin.net>\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-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:11+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_Authorise"
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "_Username for resource:"
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Password:"
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/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:192
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr "Front"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/simple-scan.ui:196
 msgid "Back"
 msgstr "Back"
 
 #. 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
+#: src/simple-scan.ui:225 src/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:241
+#: src/simple-scan.ui:241
 msgid "_Document"
 msgstr "_Document"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/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:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/simple-scan.ui:273 src/simple-scan.ui:1306 src/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:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/simple-scan.ui:283 src/simple-scan.ui:1315 src/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr "All Pages From _Feeder"
 
 #. Menu entry to stop current scan
-#: data/simple-scan.ui:294
+#: src/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "_Stop Scan"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:310 src/simple-scan.ui:1330 src/simple-scan.ui:1380
 msgid "Text"
 msgstr "Text"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:320 src/simple-scan.ui:1340 src/simple-scan.ui:1390
 msgid "Photo"
 msgstr "Photo"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/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:367
+#: src/simple-scan.ui:367
 msgid "_Email"
 msgstr "_E-mail"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:430
 msgid "_Page"
 msgstr "_Page"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "Rotate _Left"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "Rotate _Right"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:460
 msgid "_Crop"
 msgstr "_Crop"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:470
 msgid "_None"
 msgstr "_None"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:514
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:536
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:547
 msgid "_Custom"
 msgstr "_Custom"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr "_Rotate Crop"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/simple-scan.ui:578
 msgid "Move Left"
 msgstr "Move Left"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/simple-scan.ui:587
 msgid "Move Right"
 msgstr "Move Right"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:624
 msgid "_Help"
 msgstr "_Help"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:632
 msgid "_Contents"
 msgstr "_Contents"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:674 src/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "Start a new document"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:675
 msgid "New"
 msgstr "New"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:689 src/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:691 data/simple-scan.ui:837
+#: src/simple-scan.ui:691 src/simple-scan.ui:837
 msgid "Scan"
 msgstr "Scan"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:707 src/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "Save document to a file"
 
-#: ../src/ui.vala:1842
+#: src/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "Save"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/simple-scan.ui:724 src/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "Stop the current scan"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:725 src/simple-scan.ui:825
 msgid "Stop"
 msgstr "Stop"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:749 src/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:750
+#: src/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "Rotate Left"
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:764 src/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:765
+#: src/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "Rotate Right"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:779 src/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "Crop the selected page"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:781
 msgid "Crop"
 msgstr "Crop"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "Preferences"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "Scan S_ource:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "_Text Resolution:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "_Photo Resolution:"
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "Scan Side:"
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "Page Size:"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "Brightness:"
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "Contrast:"
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "Quality:"
 
@@ -296,7 +298,7 @@ msgstr "Quality:"
 msgid "Document Scanner"
 msgstr "Document Scanner"
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr "Scan Documents"
 
@@ -308,7 +310,7 @@ msgstr "scan;scanner;flatbed;adf;"
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 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 "
@@ -320,198 +322,198 @@ msgstr ""
 "print your scans, export them to PDF or save them in a range of image "
 "formats."
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 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:389
 msgid "Failed to scan"
 msgstr "Failed to scan"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 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:630
 #, 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"
@@ -540,16 +542,16 @@ msgstr ""
 "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"
@@ -564,22 +566,22 @@ msgstr ""
 "  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>."
@@ -588,12 +590,12 @@ msgstr ""
 "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>."
@@ -602,17 +604,17 @@ msgstr ""
 "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>."
@@ -621,138 +623,138 @@ msgstr ""
 "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:2182
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Saving page %d out of %d"
diff --git a/po/eo.gmo b/po/eo.gmo
deleted file mode 100644
index e447c33..0000000
--- a/po/eo.gmo
+++ /dev/null
diff --git a/po/eo.po b/po/eo.po
index 874712d..27362a4 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -7,289 +7,291 @@ 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"
+"POT-Creation-Date: 2017-03-27 22:33+1300\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-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:10+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
 "Language: eo\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "R_ajtigi"
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "Sal_utnomo por risurco:"
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Pasvorto:"
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/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:192
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr "Antaŭo"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/simple-scan.ui:196
 msgid "Back"
 msgstr "Dorso"
 
 #. 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
+#: src/simple-scan.ui:225 src/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:241
+#: src/simple-scan.ui:241
 msgid "_Document"
 msgstr "_Dokumento"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/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:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/simple-scan.ui:273 src/simple-scan.ui:1306 src/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:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/simple-scan.ui:283 src/simple-scan.ui:1315 src/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:294
+#: src/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "Haltigi _skani"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:310 src/simple-scan.ui:1330 src/simple-scan.ui:1380
 msgid "Text"
 msgstr "Teksto"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:320 src/simple-scan.ui:1340 src/simple-scan.ui:1390
 msgid "Photo"
 msgstr "Foto"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/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:367
+#: src/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:430
+#: src/simple-scan.ui:430
 msgid "_Page"
 msgstr "_Paĝo"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "Turni _maldekstren"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "Turni _dekstren"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:460
 msgid "_Crop"
 msgstr "Stu_ci"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:470
 msgid "_None"
 msgstr "_Neniu"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:514
 msgid "_Letter"
 msgstr "US _Letter"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "US Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:536
 msgid "4×6"
 msgstr "4 × 6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:547
 msgid "_Custom"
 msgstr "_Propre"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/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:578
+#: src/simple-scan.ui:578
 msgid "Move Left"
 msgstr "Movi maldekstren"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/simple-scan.ui:587
 msgid "Move Right"
 msgstr "Movi dekstren"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:624
 msgid "_Help"
 msgstr "_Helpo"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:632
 msgid "_Contents"
 msgstr "_Enhavo"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:674 src/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "Komenci novan dokumenton"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:675
 msgid "New"
 msgstr "Nova"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:689 src/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:691 data/simple-scan.ui:837
+#: src/simple-scan.ui:691 src/simple-scan.ui:837
 msgid "Scan"
 msgstr "Skani"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:707 src/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "Konservi dokumenton en dosiero"
 
-#: ../src/ui.vala:1842
+#: src/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "Konservi"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/simple-scan.ui:724 src/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "Haltigi la aktualan skanon"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:725 src/simple-scan.ui:825
 msgid "Stop"
 msgstr "Haltigi"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:749 src/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:750
+#: src/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "Turni maldekstren"
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:764 src/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:765
+#: src/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "Turni dekstren"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:779 src/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "Stuci la elektitan paĝon"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:781
 msgid "Crop"
 msgstr "Stuci"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "Agordoj"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "Skano-f_onto:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "_Teksta distingivo"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "_Fotaĵa distingivo:"
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "Skano-flanko:"
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "Paĝo-grando:"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "Brileco:"
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "Kontrasto:"
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "Kvalito:"
 
@@ -297,7 +299,7 @@ msgstr "Kvalito:"
 msgid "Document Scanner"
 msgstr "Dokumentoskanilo"
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr "Skani dokumentojn"
 
@@ -309,7 +311,7 @@ msgstr "skani;skanilo;plata;adf;"
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 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 "
@@ -317,197 +319,197 @@ msgid ""
 "formats."
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 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:389
 msgid "Failed to scan"
 msgstr "Ne sukcesi skani"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 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:630
 #, 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"
@@ -537,16 +539,16 @@ msgstr ""
 "<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"
@@ -560,189 +562,189 @@ msgstr ""
 "  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:2182
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Konservado de paĝo %d el %d"
diff --git a/po/es.gmo b/po/es.gmo
deleted file mode 100644
index 6e621bb..0000000
--- a/po/es.gmo
+++ /dev/null
diff --git a/po/es.po b/po/es.po
index ef29169..a109606 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,288 +7,290 @@ 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"
+"POT-Creation-Date: 2017-03-27 22:33+1300\n"
 "PO-Revision-Date: 2016-10-27 14:48+0000\n"
 "Last-Translator: Jose Luis Tirado <Unknown>\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-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:11+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_Autorizar"
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "Nombre de _usuario para el recurso:"
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Contraseña:"
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/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:192
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr "Anverso"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/simple-scan.ui:196
 msgid "Back"
 msgstr "Reverso"
 
 #. 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
+#: src/simple-scan.ui:225 src/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:241
+#: src/simple-scan.ui:241
 msgid "_Document"
 msgstr "_Documento"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/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:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/simple-scan.ui:273 src/simple-scan.ui:1306 src/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:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/simple-scan.ui:283 src/simple-scan.ui:1315 src/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:294
+#: src/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "D_etener escaneado"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:310 src/simple-scan.ui:1330 src/simple-scan.ui:1380
 msgid "Text"
 msgstr "Texto"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:320 src/simple-scan.ui:1340 src/simple-scan.ui:1390
 msgid "Photo"
 msgstr "Foto"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/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:367
+#: src/simple-scan.ui:367
 msgid "_Email"
 msgstr "_Correo electrónico"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:430
 msgid "_Page"
 msgstr "_Página"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/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:450
+#: src/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "Girar a la _derecha"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:460
 msgid "_Crop"
 msgstr "_Recortar"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:470
 msgid "_None"
 msgstr "_Ninguno"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:514
 msgid "_Letter"
 msgstr "_Carta"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "_Oficio"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:536
 msgid "4×6"
 msgstr "4 × 6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:547
 msgid "_Custom"
 msgstr "_Personalizado"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr "_Girar recorte"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/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:587
+#: src/simple-scan.ui:587
 msgid "Move Right"
 msgstr "Mover a la derecha"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:624
 msgid "_Help"
 msgstr "Ay_uda"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:632
 msgid "_Contents"
 msgstr "_Contenido"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:674 src/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "Crear un documento nuevo"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:675
 msgid "New"
 msgstr "Nuevo"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:689 src/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:691 data/simple-scan.ui:837
+#: src/simple-scan.ui:691 src/simple-scan.ui:837
 msgid "Scan"
 msgstr "Escanear"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:707 src/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "Guardar documento a un archivo"
 
-#: ../src/ui.vala:1842
+#: src/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "Guardar"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/simple-scan.ui:724 src/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "Detiene el escaneado actual"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:725 src/simple-scan.ui:825
 msgid "Stop"
 msgstr "Detener"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:749 src/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:750
+#: src/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "Girar a la izquierda"
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:764 src/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:765
+#: src/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "Girar a la derecha"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:779 src/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "Recortar la página seleccionada"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:781
 msgid "Crop"
 msgstr "Recortar"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "Preferencias"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "_Origen de escaneo:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "Resolución de _texto:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "Resolución de _fotografía:"
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "Cara a escanear:"
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "Tamaño de página:"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "Brillo:"
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "Contraste:"
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "Calidad:"
 
@@ -296,7 +298,7 @@ msgstr "Calidad:"
 msgid "Document Scanner"
 msgstr "Escáner de documentos"
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr "Escanear documentos"
 
@@ -308,7 +310,7 @@ msgstr "escanear;escáner;plano;adf;"
 msgid "scanner"
 msgstr "escáner"
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 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 "
@@ -320,7 +322,7 @@ msgstr ""
 "imprimir las digitalizaciones, exportarlas a PDF o guardarlas en diversos "
 "formatos de imagen."
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
@@ -328,193 +330,193 @@ msgstr ""
 "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:389
 msgid "Failed to scan"
 msgstr "Falló al escanear"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 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:630
 #, 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"
@@ -545,16 +547,16 @@ msgstr ""
 "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"
@@ -585,22 +587,22 @@ msgstr ""
 "  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>."
@@ -609,12 +611,12 @@ msgstr ""
 "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>."
@@ -623,17 +625,17 @@ msgstr ""
 "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>."
@@ -642,138 +644,138 @@ msgstr ""
 "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:2182
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Guardando la página %d de %d"
diff --git a/po/et.gmo b/po/et.gmo
deleted file mode 100644
index 66364b1..0000000
--- a/po/et.gmo
+++ /dev/null
diff --git a/po/et.po b/po/et.po
index 1814cc2..70eafa1 100644
--- a/po/et.po
+++ b/po/et.po
@@ -7,288 +7,290 @@ 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: 2012-07-23 08:59+0000\n"
+"POT-Creation-Date: 2017-03-27 22:33+1300\n"
+"PO-Revision-Date: 2017-03-29 06:41+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-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:10+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_Autoriseeri"
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "_Kasutajanimi allika jaoks:"
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Parool:"
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/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:192
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr "Esikülg"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/simple-scan.ui:196
 msgid "Back"
 msgstr "Tagakülg"
 
 #. 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
+#: src/simple-scan.ui:225 src/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:241
+#: src/simple-scan.ui:241
 msgid "_Document"
 msgstr "_Dokument"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/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:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/simple-scan.ui:273 src/simple-scan.ui:1306 src/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:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/simple-scan.ui:283 src/simple-scan.ui:1315 src/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:294
+#: src/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "_Lõpeta skannimine"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:310 src/simple-scan.ui:1330 src/simple-scan.ui:1380
 msgid "Text"
 msgstr "Tekst"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:320 src/simple-scan.ui:1340 src/simple-scan.ui:1390
 msgid "Photo"
 msgstr "Foto"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/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
+#: src/simple-scan.ui:367
 msgid "_Email"
 msgstr "_E-post"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:430
 msgid "_Page"
 msgstr "_Lehekülg"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "Pööra _vasakule"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "Pööra _paremale"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:460
 msgid "_Crop"
 msgstr "_Kärbi"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:470
 msgid "_None"
 msgstr "_Puudub"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:514
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "US _Legal"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:536
 msgid "4×6"
 msgstr ""
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:547
 msgid "_Custom"
 msgstr "_Kohandatud"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/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:578
+#: src/simple-scan.ui:578
 msgid "Move Left"
-msgstr ""
+msgstr "Liiguta vasakule"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/simple-scan.ui:587
 msgid "Move Right"
 msgstr ""
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:624
 msgid "_Help"
 msgstr "A_bi"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:632
 msgid "_Contents"
 msgstr "_Sisu"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:674 src/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "Uue dokumendi alustamine"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:675
 msgid "New"
 msgstr "Uus"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:689 src/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:691 data/simple-scan.ui:837
+#: src/simple-scan.ui:691 src/simple-scan.ui:837
 msgid "Scan"
 msgstr "Skanni"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:707 src/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "Dokumendi salvestamine faili"
 
-#: ../src/ui.vala:1842
+#: src/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "Salvesta"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/simple-scan.ui:724 src/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "Selle skannimise lõpetamine"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:725 src/simple-scan.ui:825
 msgid "Stop"
 msgstr "Lõpeta"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:749 src/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:750
+#: src/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "Vasakule pööramine"
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:764 src/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:765
+#: src/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "Paremale pööramine"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:779 src/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "Valitud lehekülje kärpimine"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:781
 msgid "Crop"
 msgstr "Kärbi"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "Eelistused"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "Skannimise _allikas:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "_Teksti eraldusvõime:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "_Foto eraldusvõime:"
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "Slaidi skannimine:"
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "Lehekülje suurus:"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1260
 msgid "Quality:"
 msgstr ""
 
@@ -296,7 +298,7 @@ msgstr ""
 msgid "Document Scanner"
 msgstr ""
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr "Dokumentide skannimine"
 
@@ -308,7 +310,7 @@ msgstr ""
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 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 "
@@ -316,196 +318,196 @@ msgid ""
 "formats."
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 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:389
 msgid "Failed to scan"
 msgstr "Skannimine nurjus"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:630
 #, 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"
@@ -535,16 +537,16 @@ msgstr ""
 "<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"
@@ -553,189 +555,189 @@ msgstr ""
 "  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:2182
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/eu.gmo b/po/eu.gmo
deleted file mode 100644
index 910ee9b..0000000
--- a/po/eu.gmo
+++ /dev/null
diff --git a/po/eu.po b/po/eu.po
index dc71f34..14c1796 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -7,288 +7,290 @@ 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"
+"POT-Creation-Date: 2017-03-27 22:33+1300\n"
 "PO-Revision-Date: 2017-01-25 12:52+0000\n"
 "Last-Translator: Ander Elortondo <ander.elor@gmail.com>\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: 2017-01-26 05:30+0000\n"
-"X-Generator: Launchpad (build 18315)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:10+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_Baimendu"
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "_Erabiltzaile-izena baliabiderako:"
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Pasahitza:"
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/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:192
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr "Aurrealdea"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/simple-scan.ui:196
 msgid "Back"
 msgstr "Atzealdea"
 
 #. 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
+#: src/simple-scan.ui:225 src/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:241
+#: src/simple-scan.ui:241
 msgid "_Document"
 msgstr "_Dokumentua"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/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:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/simple-scan.ui:273 src/simple-scan.ui:1306 src/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:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/simple-scan.ui:283 src/simple-scan.ui:1315 src/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr "_Elikagailuko orri guztiak"
 
 #. Menu entry to stop current scan
-#: data/simple-scan.ui:294
+#: src/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "_Gelditu eskaneatzea"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:310 src/simple-scan.ui:1330 src/simple-scan.ui:1380
 msgid "Text"
 msgstr "Testua"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:320 src/simple-scan.ui:1340 src/simple-scan.ui:1390
 msgid "Photo"
 msgstr "Argazkia"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/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:367
+#: src/simple-scan.ui:367
 msgid "_Email"
 msgstr "_Posta elektronikoa"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:430
 msgid "_Page"
 msgstr "_Orrialdea"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "Biratu e_zkerrera"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "Biratu e_skuinera"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:460
 msgid "_Crop"
 msgstr "_Moztu"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:470
 msgid "_None"
 msgstr "_Bat ere ez"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:514
 msgid "_Letter"
 msgstr "AEBetako gutuna"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "AEBetako le_gala"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:536
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:547
 msgid "_Custom"
 msgstr "_Pertsonalizatua"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr "_Biratu mozketa"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/simple-scan.ui:578
 msgid "Move Left"
 msgstr "Mugitu ezkerrera"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/simple-scan.ui:587
 msgid "Move Right"
 msgstr "Mugitu eskuinera"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:624
 msgid "_Help"
 msgstr "_Laguntza"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:632
 msgid "_Contents"
 msgstr "_Edukiak"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:674 src/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "Hasi dokumentu berria"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:675
 msgid "New"
 msgstr "Berria"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:689 src/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:691 data/simple-scan.ui:837
+#: src/simple-scan.ui:691 src/simple-scan.ui:837
 msgid "Scan"
 msgstr "Eskaneatu"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:707 src/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "Gorde dokumentua fitxategi batean"
 
-#: ../src/ui.vala:1842
+#: src/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "Gorde"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/simple-scan.ui:724 src/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "Gelditu uneko eskaneatzea"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:725 src/simple-scan.ui:825
 msgid "Stop"
 msgstr "Gelditu"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:749 src/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:750
+#: src/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "Biratu ezkerrera"
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:764 src/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:765
+#: src/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "Biratu eskuinera"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:779 src/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "Moztu hautatutako orrialdea"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:781
 msgid "Crop"
 msgstr "Moztu"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "Hobespenak"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "Eskaneatze-_jatorria:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "_Testu-bereizmena:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "Ar_gazki-bereizmena:"
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "Eskaneatze-aldea:"
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "Orrialde-tamaina:"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "Distira:"
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "Kontrastea:"
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "Kalitatea:"
 
@@ -296,7 +298,7 @@ msgstr "Kalitatea:"
 msgid "Document Scanner"
 msgstr "Dokumentuen eskanerra"
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr "Eskaneatu dokumentuak"
 
@@ -309,7 +311,7 @@ msgstr ""
 msgid "scanner"
 msgstr "eskanerra"
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 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 "
@@ -319,7 +321,7 @@ msgstr ""
 "Modu benetan erraza dokumentuak zein argazkiak eskaneatzeko. Argazki baten "
 "parte txarrak ebaki eta"
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
@@ -327,191 +329,191 @@ msgstr ""
 "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:389
 msgid "Failed to scan"
 msgstr "Ezin izan da eskaneatu"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 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:630
 #, 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 "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 "Dokumetu eskaneatua.pdf"
 
 #. 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"
@@ -540,16 +542,16 @@ msgstr ""
 "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"
@@ -566,22 +568,22 @@ msgstr ""
 "  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 "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>."
@@ -590,12 +592,12 @@ msgstr ""
 "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 "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>."
@@ -604,17 +606,17 @@ msgstr ""
 "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 "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 "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>."
@@ -623,138 +625,138 @@ msgstr ""
 "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 "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 "Behin instalatua Simple Scan berabiarazi behar duzu."
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr "Kontrolatzaileak instalatzen..."
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1653
 msgid "Drivers installed successfully!"
 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 "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 "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 "%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 "_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:2182
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "%d orria (%d-etik) gordetzen"
diff --git a/po/fi.gmo b/po/fi.gmo
deleted file mode 100644
index 11bcb96..0000000
--- a/po/fi.gmo
+++ /dev/null
diff --git a/po/fi.po b/po/fi.po
index f294d9c..a7723dd 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,288 +7,290 @@ 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"
+"POT-Creation-Date: 2017-03-27 22:33+1300\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-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:10+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_Valtuuta"
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "Resurssin _käyttäjänimi:"
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Salasana:"
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/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:192
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr "Etupuoli"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/simple-scan.ui:196
 msgid "Back"
 msgstr "Takapuoli"
 
 #. 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
+#: src/simple-scan.ui:225 src/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:241
+#: src/simple-scan.ui:241
 msgid "_Document"
 msgstr "_Asiakirja"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/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:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/simple-scan.ui:273 src/simple-scan.ui:1306 src/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:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/simple-scan.ui:283 src/simple-scan.ui:1315 src/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr "Kaikki sivut _laitteelta"
 
 #. Menu entry to stop current scan
-#: data/simple-scan.ui:294
+#: src/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "Py_säytä kuvanluku"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:310 src/simple-scan.ui:1330 src/simple-scan.ui:1380
 msgid "Text"
 msgstr "Teksti"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:320 src/simple-scan.ui:1340 src/simple-scan.ui:1390
 msgid "Photo"
 msgstr "Valokuva"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/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:367
+#: src/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:430
+#: src/simple-scan.ui:430
 msgid "_Page"
 msgstr "_Sivu"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "Kierrä _vasemmalle"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "Kierrä _oikealle"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:460
 msgid "_Crop"
 msgstr "_Rajaa"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:470
 msgid "_None"
 msgstr "_Ei mitään"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:514
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "US Legal"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:536
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:547
 msgid "_Custom"
 msgstr "_Muu"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr "Kierr_ä rajausta"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/simple-scan.ui:578
 msgid "Move Left"
 msgstr "Siirrä vasemmalle"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/simple-scan.ui:587
 msgid "Move Right"
 msgstr "Siirrä oikealle"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:624
 msgid "_Help"
 msgstr "O_hje"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:632
 msgid "_Contents"
 msgstr "_Sisältö"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:674 src/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "Aloita uusi asiakirja"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:675
 msgid "New"
 msgstr "Uusi"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:689 src/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:691 data/simple-scan.ui:837
+#: src/simple-scan.ui:691 src/simple-scan.ui:837
 msgid "Scan"
 msgstr "Lue"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:707 src/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "Tallenna asiakirja tiedostoon"
 
-#: ../src/ui.vala:1842
+#: src/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "Tallenna"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/simple-scan.ui:724 src/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "Pysäytä kuvan lukeminen"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:725 src/simple-scan.ui:825
 msgid "Stop"
 msgstr "Pysäytä"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:749 src/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:750
+#: src/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "Kierrä vasemmalle"
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:764 src/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:765
+#: src/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "Kierrä oikealle"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:779 src/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "Rajaa nykyistä sivua"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:781
 msgid "Crop"
 msgstr "Rajaa"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "Asetukset"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "Lue lähtee_stä:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "_Tekstin tarkkuus:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "_Valokuvan tarkkuus:"
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "Luettava puoli:"
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "Sivun koko:"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "Kirkkaus:"
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "Kontrasti:"
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "Laatu:"
 
@@ -296,7 +298,7 @@ msgstr "Laatu:"
 msgid "Document Scanner"
 msgstr "Asiakirjojen kuvanlukuohjelma"
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr "Lue asiakirjoja kuvanlukijalta"
 
@@ -308,7 +310,7 @@ msgstr "kuvanluku;skanneri;scan;scanner;flatbed;adf;"
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 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 "
@@ -319,7 +321,7 @@ msgstr ""
 "osat valokuvista pois tai kääntää niitä. Luettuja kuvia voidaan tulostaa, "
 "viedä PDF-muotoon tai tallentaa eri kuvamuodoissa."
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
@@ -327,190 +329,190 @@ msgstr ""
 "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:389
 msgid "Failed to scan"
 msgstr "Kuvanluku epäonnistui"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 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:630
 #, 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"
@@ -541,16 +543,16 @@ msgstr ""
 "<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"
@@ -564,22 +566,22 @@ msgstr ""
 "  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>."
@@ -588,12 +590,12 @@ msgstr ""
 "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>."
@@ -602,17 +604,17 @@ msgstr ""
 "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>."
@@ -621,139 +623,139 @@ msgstr ""
 "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:2182
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Tallennetaan sivua %d/%d"
diff --git a/po/fr.gmo b/po/fr.gmo
deleted file mode 100644
index 8ea7963..0000000
--- a/po/fr.gmo
+++ /dev/null
diff --git a/po/fr.po b/po/fr.po
index 87d326d..012786e 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,288 +7,290 @@ 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"
+"POT-Creation-Date: 2017-03-27 22:33+1300\n"
 "PO-Revision-Date: 2016-08-14 10:33+0000\n"
 "Last-Translator: Anne017 <anneonyme017@openmailbox.org>\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-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:10+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_Autoriser"
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "_Utilisateur :"
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/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
+#: src/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
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr "Recto"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/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
+#: src/simple-scan.ui:225 src/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
+#: src/simple-scan.ui:241
 msgid "_Document"
 msgstr "_Document"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/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
+#: src/simple-scan.ui:273 src/simple-scan.ui:1306 src/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
+#: src/simple-scan.ui:283 src/simple-scan.ui:1315 src/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:294
+#: src/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
+#: src/simple-scan.ui:310 src/simple-scan.ui:1330 src/simple-scan.ui:1380
 msgid "Text"
 msgstr "Texte"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:320 src/simple-scan.ui:1340 src/simple-scan.ui:1390
 msgid "Photo"
 msgstr "Photo"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/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
+#: src/simple-scan.ui:367
 msgid "_Email"
 msgstr "_Courriel"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:430
 msgid "_Page"
 msgstr "_Page"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/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
+#: src/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "Faire pivoter vers la _droite"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:460
 msgid "_Crop"
 msgstr "Re_cadrer"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:470
 msgid "_None"
 msgstr "Aucu_n"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:514
 msgid "_Letter"
 msgstr "_Letter (US)"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "_Legal (US)"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:536
 msgid "4×6"
 msgstr "4 × 6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:547
 msgid "_Custom"
 msgstr "_Personnalisé"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/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
+#: src/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
+#: src/simple-scan.ui:587
 msgid "Move Right"
 msgstr "Déplacer vers la droite"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:624
 msgid "_Help"
 msgstr "_Aide"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:632
 msgid "_Contents"
 msgstr "_Contenus"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:674 src/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "Créer un nouveau document"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:675
 msgid "New"
 msgstr "Nouveau"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:689 src/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
+#: src/simple-scan.ui:691 src/simple-scan.ui:837
 msgid "Scan"
 msgstr "Numériser"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:707 src/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "Enregistrer le document dans un fichier"
 
-#: ../src/ui.vala:1842
+#: src/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
+#: src/simple-scan.ui:724 src/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
+#: src/simple-scan.ui:725 src/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
+#: src/simple-scan.ui:749 src/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
+#: src/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
+#: src/simple-scan.ui:764 src/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
+#: src/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "Faire pivoter vers la droite"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:779 src/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "Recadrer la page sélectionnée"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:781
 msgid "Crop"
 msgstr "Recadrer"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/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
+#: src/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
+#: src/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "Résolution pour le _texte :"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "Résolution de la _photo :"
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "Face à numériser :"
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "Taille de la page :"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "Luminosité :"
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "Contraste :"
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "Qualité :"
 
@@ -296,7 +298,7 @@ msgstr "Qualité :"
 msgid "Document Scanner"
 msgstr "Numériseur de documents"
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr "Numériser des documents"
 
@@ -308,7 +310,7 @@ msgstr "numériser;scanner;numériseur;à plat;adf;"
 msgid "scanner"
 msgstr "numériseur"
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 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 "
@@ -320,7 +322,7 @@ msgstr ""
 "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
+#: data/simple-scan.appdata.xml.in:14
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
@@ -328,197 +330,197 @@ msgstr ""
 "la plupart des périphériques de numérisation existants."
 
 #. 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 ""
 "Aucun périphérique de numérisation disponible. Veuillez en connecter 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 connecter au périphérique de numérisation"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: 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:1236 ../src/scanner.vala:1333
+#: 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:391
+#: src/simple-scan.vala:389
 msgid "Failed to scan"
 msgstr "Échec de la numérisation"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DEVICE...] - Outil de numérisation"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:630
 #, 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
+#: 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:327
+#: 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:375
+#: 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:377
+#: 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:506 ../src/ui.vala:1843
+#: src/ui.vala:506 src/ui.vala:1843
 msgid "Save As..."
 msgstr "Enregistrer sous..."
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:509 src/ui.vala:675
 msgid "_Cancel"
 msgstr "_Annuler"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:510 src/ui.vala:676
 msgid "_Save"
 msgstr "_Enregistrer"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: 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:521
+#: src/ui.vala:521
 msgid "Image Files"
 msgstr "Fichiers image"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:527
 msgid "All Files"
 msgstr "Tous les fichiers"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (document multipage)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (compressé)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: 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:650
+#: 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:673
+#: 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:708
+#: 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:710
+#: src/ui.vala:710
 msgid "Discard Changes"
 msgstr "Abandonner les modifications"
 
 #. 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'enregistrer l'image pour la prévisualiser"
 
 #. 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 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:1451
+#: 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: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"
@@ -548,16 +550,16 @@ msgstr ""
 "<http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "À propos de Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "Numériser simplement vos documents"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -597,22 +599,22 @@ msgstr ""
 "  torglut https://launchpad.net/~torglut"
 
 #. 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 "Enregistrer le document avant de quitter ?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: 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>."
@@ -621,12 +623,12 @@ msgstr ""
 "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>."
@@ -635,17 +637,17 @@ msgstr ""
 "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>."
@@ -654,138 +656,138 @@ msgstr ""
 "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:1784
+#: 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:1787
+#: 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:1790
+#: 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: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 "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:1889
+#: 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:1897
+#: src/ui.vala:1897
 msgid "Automatic"
 msgstr "Automatique"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1947
 msgid "Darker"
 msgstr "Plus foncé"
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1949
 msgid "Lighter"
 msgstr "Plus clair"
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:1957
 msgid "Less"
 msgstr "Moins"
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:1959
 msgid "More"
 msgstr "Plus"
 
-#: ../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 "Enregistrement du document..."
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2182
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Enregistrement de la page %d sur %d"
diff --git a/po/fr_CA.gmo b/po/fr_CA.gmo
deleted file mode 100644
index 636fcad..0000000
--- a/po/fr_CA.gmo
+++ /dev/null
diff --git a/po/fr_CA.po b/po/fr_CA.po
index d71d9bc..fea2cc5 100644
--- a/po/fr_CA.po
+++ b/po/fr_CA.po
@@ -7,288 +7,290 @@ 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"
+"POT-Creation-Date: 2017-03-27 22:33+1300\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-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:11+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_Autoriser"
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "_Utilisateur :"
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/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
+#: src/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
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr "Recto"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/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
+#: src/simple-scan.ui:225 src/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
+#: src/simple-scan.ui:241
 msgid "_Document"
 msgstr "_Document"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/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
+#: src/simple-scan.ui:273 src/simple-scan.ui:1306 src/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
+#: src/simple-scan.ui:283 src/simple-scan.ui:1315 src/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
+#: src/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
+#: src/simple-scan.ui:310 src/simple-scan.ui:1330 src/simple-scan.ui:1380
 msgid "Text"
 msgstr "Texte"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:320 src/simple-scan.ui:1340 src/simple-scan.ui:1390
 msgid "Photo"
 msgstr "Photo"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/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
+#: src/simple-scan.ui:367
 msgid "_Email"
 msgstr "_Courriel"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:430
 msgid "_Page"
 msgstr "_Page"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/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
+#: src/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "Faire pivoter vers la _droite"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:460
 msgid "_Crop"
 msgstr "Re_cadrer"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:470
 msgid "_None"
 msgstr "Aucu_n"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:514
 msgid "_Letter"
 msgstr "_Letter (US)"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "_Legal (US)"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:536
 msgid "4×6"
 msgstr "4 × 6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:547
 msgid "_Custom"
 msgstr "_Personnalisé"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/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
+#: src/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
+#: src/simple-scan.ui:587
 msgid "Move Right"
 msgstr "Déplacer vers la droite"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:624
 msgid "_Help"
 msgstr "_Aide"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:632
 msgid "_Contents"
 msgstr "_Contenus"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:674 src/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "Créer un nouveau document"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:675
 msgid "New"
 msgstr "Nouveau"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:689 src/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
+#: src/simple-scan.ui:691 src/simple-scan.ui:837
 msgid "Scan"
 msgstr "Numériser"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:707 src/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "Enregistrer le document dans un fichier"
 
-#: ../src/ui.vala:1842
+#: src/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
+#: src/simple-scan.ui:724 src/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
+#: src/simple-scan.ui:725 src/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
+#: src/simple-scan.ui:749 src/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
+#: src/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
+#: src/simple-scan.ui:764 src/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
+#: src/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "Faire pivoter vers la droite"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:779 src/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "Recadrer la page sélectionnée"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:781
 msgid "Crop"
 msgstr "Recadrer"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/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
+#: src/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
+#: src/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "Résolution pour le _texte :"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "Résolution de la _photo :"
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "Face à numériser :"
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "Taille de la page :"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "Luminosité :"
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "Contraste :"
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "Qualité :"
 
@@ -296,7 +298,7 @@ msgstr "Qualité :"
 msgid "Document Scanner"
 msgstr "Numériseur de documents"
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr "Numériser des documents"
 
@@ -308,7 +310,7 @@ msgstr "numériser;scanner;numériseur;à plat;adf;"
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 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 "
@@ -320,7 +322,7 @@ msgstr ""
 "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
+#: data/simple-scan.appdata.xml.in:14
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
@@ -328,197 +330,197 @@ msgstr ""
 "la plupart des périphériques de numérisation existants."
 
 #. 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 ""
 "Aucun périphérique de numérisation disponible. Veuillez en connecter 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 connecter au périphérique de numérisation"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: 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:1236 ../src/scanner.vala:1333
+#: 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:391
+#: src/simple-scan.vala:389
 msgid "Failed to scan"
 msgstr "Échec de la numérisation"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DEVICE...] - Outil de numérisation"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:630
 #, 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
+#: 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:327
+#: 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:375
+#: 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:377
+#: 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:506 ../src/ui.vala:1843
+#: src/ui.vala:506 src/ui.vala:1843
 msgid "Save As..."
 msgstr "Enregistrer sous..."
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:509 src/ui.vala:675
 msgid "_Cancel"
 msgstr "_Annuler"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:510 src/ui.vala:676
 msgid "_Save"
 msgstr "_Enregistrer"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: 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:521
+#: src/ui.vala:521
 msgid "Image Files"
 msgstr "Fichiers image"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:527
 msgid "All Files"
 msgstr "Tous les fichiers"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (document multipage)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (compressé)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: 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:650
+#: 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:673
+#: 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:708
+#: 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:710
+#: src/ui.vala:710
 msgid "Discard Changes"
 msgstr "Abandonner les modifications"
 
 #. 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'enregistrer l'image pour la prévisualiser"
 
 #. 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 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:1451
+#: 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: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"
@@ -548,38 +550,38 @@ msgstr ""
 "<http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "À propos de Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "Numériser simplement vos documents"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Mathieu Marin https://launchpad.net/~rama-197"
 
 #. 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 "Enregistrer le document avant de quitter ?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: 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>."
@@ -588,12 +590,12 @@ msgstr ""
 "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>."
@@ -602,17 +604,17 @@ msgstr ""
 "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>."
@@ -621,138 +623,138 @@ msgstr ""
 "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:1784
+#: 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:1787
+#: 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:1790
+#: 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: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 "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:1889
+#: 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:1897
+#: src/ui.vala:1897
 msgid "Automatic"
 msgstr "Automatique"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1947
 msgid "Darker"
 msgstr "Plus foncé"
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1949
 msgid "Lighter"
 msgstr "Plus clair"
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:1957
 msgid "Less"
 msgstr "Moins"
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:1959
 msgid "More"
 msgstr "Plus"
 
-#: ../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 "Enregistrement du document..."
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2182
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Enregistrement de la page %d sur %d"
diff --git a/po/gd.gmo b/po/gd.gmo
deleted file mode 100644
index 4bb099f..0000000
--- a/po/gd.gmo
+++ /dev/null
diff --git a/po/gd.po b/po/gd.po
index a4b7340..b053fba 100644
--- a/po/gd.po
+++ b/po/gd.po
@@ -7,288 +7,290 @@ 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"
+"POT-Creation-Date: 2017-03-27 22:33+1300\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-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:10+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "Ùg_hdarraich"
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "_An t-ainm-cleachdaiche airson a' ghoireis:"
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Facal-faire:"
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/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:192
+#: src/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:196
+#: src/simple-scan.ui:196
 msgid "Back"
 msgstr "A cùl"
 
 #. 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
+#: src/simple-scan.ui:225 src/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:241
+#: src/simple-scan.ui:241
 msgid "_Document"
 msgstr "_Sgrìobhainn"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/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:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/simple-scan.ui:273 src/simple-scan.ui:1306 src/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:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/simple-scan.ui:283 src/simple-scan.ui:1315 src/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:294
+#: src/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "Cuir _stad air an sganadh"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:310 src/simple-scan.ui:1330 src/simple-scan.ui:1380
 msgid "Text"
 msgstr "Teacsa"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:320 src/simple-scan.ui:1340 src/simple-scan.ui:1390
 msgid "Photo"
 msgstr "Dealbh"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/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:367
+#: src/simple-scan.ui:367
 msgid "_Email"
 msgstr "_Post-d"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:430
 msgid "_Page"
 msgstr "_Duilleag"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "Cuairtich gu _tuathail"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "Cuairtich gu _deiseil"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:460
 msgid "_Crop"
 msgstr "_Bearr"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:470
 msgid "_None"
 msgstr "Cha_n eil gin"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:514
 msgid "_Letter"
 msgstr "_Litir"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:536
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:547
 msgid "_Custom"
 msgstr "_Gnàthaichte"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/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:578
+#: src/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:587
+#: src/simple-scan.ui:587
 msgid "Move Right"
 msgstr "Gluais gun taobh deas"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:624
 msgid "_Help"
 msgstr "_Cobhair"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:632
 msgid "_Contents"
 msgstr "_Clàr-innse"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:674 src/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "Tòisich air sgrìobhainn ùr"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:675
 msgid "New"
 msgstr "Ùr"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:689 src/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:691 data/simple-scan.ui:837
+#: src/simple-scan.ui:691 src/simple-scan.ui:837
 msgid "Scan"
 msgstr "Sganaich"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:707 src/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "Sàbhail an sgrìobhainn mar fhaidhle"
 
-#: ../src/ui.vala:1842
+#: src/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "Sàbhail"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/simple-scan.ui:724 src/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "Cuir stad air an sganadh làithreach"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:725 src/simple-scan.ui:825
 msgid "Stop"
 msgstr "Stad"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:749 src/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:750
+#: src/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "Cuairtich gu tuathail"
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:764 src/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:765
+#: src/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "Cuairtich gu deiseil"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:779 src/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "Bearr an duilleag a thagh thu"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:781
 msgid "Crop"
 msgstr "Bearr"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "Roghainnean"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "Tùs an _sganaidh:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "_Dùmhlachd-bhreacaidh an teacsa:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "_Dùmhlachd-bhreacaidh an deilbh:"
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "Sganaich taobh:"
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "Meud na duilleige:"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "Soilleireachd:"
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "Iomsgaradh:"
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "Càileachd:"
 
@@ -296,7 +298,7 @@ msgstr "Càileachd:"
 msgid "Document Scanner"
 msgstr "Sganair sgrìobhainnean"
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr "Sganaich sgrìobhainnean"
 
@@ -308,7 +310,7 @@ msgstr "scan;scanner;flatbed;adf;sganair;sganaich;sganadh;"
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 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 "
@@ -321,7 +323,7 @@ msgstr ""
 "sganaich thu a chlò-bhualadh, às-phortadh gu PDF no a shàbhaladh ann an "
 "taghadh de fhòrmatan deilbh."
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
@@ -329,65 +331,65 @@ msgstr ""
 "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 dhe "
 "Sganadh simplidh"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:391
+#: src/simple-scan.vala:389
 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:619
 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:630
 #, 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 ""
@@ -395,131 +397,131 @@ msgstr ""
 "\"%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 "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 "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 "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"
@@ -548,16 +550,16 @@ msgstr ""
 "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 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"
@@ -566,22 +568,22 @@ msgstr ""
 "  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 "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>."
@@ -590,12 +592,12 @@ msgstr ""
 "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 "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>."
@@ -604,17 +606,17 @@ msgstr ""
 "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 "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 "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>."
@@ -623,139 +625,139 @@ msgstr ""
 "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 "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 "A' stàladh nan draibhearan..."
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1653
 msgid "Drivers installed successfully!"
 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 "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 "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 "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 "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 "Barrachd"
 
-#: ../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:2182
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "A' sàbhaladh duilleag %d a-mach à %d"
diff --git a/po/gl.gmo b/po/gl.gmo
deleted file mode 100644
index 25d2021..0000000
--- a/po/gl.gmo
+++ /dev/null
diff --git a/po/gl.po b/po/gl.po
index 3282c5b..850805f 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -7,288 +7,290 @@ 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"
+"POT-Creation-Date: 2017-03-27 22:33+1300\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-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:10+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_Autorizar"
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "Nome de _usuario para o recurso:"
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Contrasinal:"
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/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:192
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr "Anverso"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/simple-scan.ui:196
 msgid "Back"
 msgstr "Atrás"
 
 #. 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
+#: src/simple-scan.ui:225 src/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:241
+#: src/simple-scan.ui:241
 msgid "_Document"
 msgstr "_Documento"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/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:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/simple-scan.ui:273 src/simple-scan.ui:1306 src/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:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/simple-scan.ui:283 src/simple-scan.ui:1315 src/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:294
+#: src/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "_Deter o escaneado"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:310 src/simple-scan.ui:1330 src/simple-scan.ui:1380
 msgid "Text"
 msgstr "Texto"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:320 src/simple-scan.ui:1340 src/simple-scan.ui:1390
 msgid "Photo"
 msgstr "Fotografía"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/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:367
+#: src/simple-scan.ui:367
 msgid "_Email"
 msgstr "Correo-_e"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:430
 msgid "_Page"
 msgstr "_Páxina"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "Rotar á _esquerda"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "Rotar á _dereita"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:460
 msgid "_Crop"
 msgstr "_Recortar"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:470
 msgid "_None"
 msgstr "_Ningún"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:514
 msgid "_Letter"
 msgstr "_Carta"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:536
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:547
 msgid "_Custom"
 msgstr "_Personalizado"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/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:578
+#: src/simple-scan.ui:578
 msgid "Move Left"
 msgstr "Mover á esquerda"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/simple-scan.ui:587
 msgid "Move Right"
 msgstr "Mover á dereita"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:624
 msgid "_Help"
 msgstr "_Axuda"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:632
 msgid "_Contents"
 msgstr "_Contidos"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:674 src/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "Iniciar un novo documento"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:675
 msgid "New"
 msgstr "Novo"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:689 src/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:691 data/simple-scan.ui:837
+#: src/simple-scan.ui:691 src/simple-scan.ui:837
 msgid "Scan"
 msgstr "Escanear"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:707 src/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "Gardar o documento nun ficheiro"
 
-#: ../src/ui.vala:1842
+#: src/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "Gardar"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/simple-scan.ui:724 src/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "Deter o escaneo actual"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:725 src/simple-scan.ui:825
 msgid "Stop"
 msgstr "Deter"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:749 src/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:750
+#: src/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "Rotar á esquerda"
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:764 src/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:765
+#: src/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "Rotar á dereita"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:779 src/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "Recortar a páxina seleccionada"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:781
 msgid "Crop"
 msgstr "Recortar"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "Preferencias"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "_Orixe de escaneo:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "Resolución de _texto:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "Resolución _fotográfica:"
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "Cara a escanear:"
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "Tamaño da páxina:"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "Brillo:"
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "Contraste:"
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "Calidade:"
 
@@ -296,7 +298,7 @@ msgstr "Calidade:"
 msgid "Document Scanner"
 msgstr "Escáner de documentos"
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr "Escanear documentos"
 
@@ -308,7 +310,7 @@ msgstr "escanear;escáner;flatbed;adf;"
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 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 "
@@ -319,7 +321,7 @@ 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/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
@@ -327,192 +329,192 @@ msgstr ""
 "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:389
 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:619
 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:630
 #, 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"
@@ -541,16 +543,16 @@ msgstr ""
 "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"
@@ -561,22 +563,22 @@ msgstr ""
 "  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>."
@@ -585,12 +587,12 @@ msgstr ""
 "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>."
@@ -599,17 +601,17 @@ msgstr ""
 "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>."
@@ -618,139 +620,139 @@ msgstr ""
 "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:2182
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Gardando páxina %d de %d"
diff --git a/po/he.gmo b/po/he.gmo
deleted file mode 100644
index af7109c..0000000
--- a/po/he.gmo
+++ /dev/null
diff --git a/po/he.po b/po/he.po
index 744a475..59d7215 100644
--- a/po/he.po
+++ b/po/he.po
@@ -7,288 +7,290 @@ 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: 2012-07-23 09:01+0000\n"
-"Last-Translator: Robert Ancell <robert.ancell@canonical.com>\n"
+"POT-Creation-Date: 2017-03-27 22:33+1300\n"
+"PO-Revision-Date: 2017-03-29 06:28+0000\n"
+"Last-Translator: Yaron <sh.yaron@gmail.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-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:10+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_אימות"
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "_שם המשתמש עבור המשאב:"
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_ססמה:"
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/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
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr "חזית"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/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
+#: src/simple-scan.ui:225 src/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
+#: src/simple-scan.ui:241
 msgid "_Document"
 msgstr "מ_סמך"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/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
+#: src/simple-scan.ui:273 src/simple-scan.ui:1306 src/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
+#: src/simple-scan.ui:283 src/simple-scan.ui:1315 src/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr "כל הדפים מהמ_זין"
 
 #. Menu entry to stop current scan
-#: data/simple-scan.ui:294
+#: src/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "ע_צירת הסריקה"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:310 src/simple-scan.ui:1330 src/simple-scan.ui:1380
 msgid "Text"
 msgstr "טקסט"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:320 src/simple-scan.ui:1340 src/simple-scan.ui:1390
 msgid "Photo"
 msgstr "צילום"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/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
+#: src/simple-scan.ui:367
 msgid "_Email"
 msgstr "_דוא״ל"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:430
 msgid "_Page"
 msgstr "_עמוד"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "סיבוב _שמאלה"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "סיבוב _ימינה"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:460
 msgid "_Crop"
 msgstr "_חיתוך"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:470
 msgid "_None"
 msgstr "_ללא"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:514
 msgid "_Letter"
 msgstr "_מכתב"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "_פוליו"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:536
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:547
 msgid "_Custom"
 msgstr "ה_תאמה אישית"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr "_סיבוב חיתוך"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/simple-scan.ui:578
 msgid "Move Left"
-msgstr ""
+msgstr "הזזה שמאלה"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/simple-scan.ui:587
 msgid "Move Right"
-msgstr ""
+msgstr "הזזה ימינה"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:624
 msgid "_Help"
 msgstr "ע_זרה"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:632
 msgid "_Contents"
 msgstr "_תוכן"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:674 src/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "התחלת מסמך חדש"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:675
 msgid "New"
 msgstr "חדש"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:689 src/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
+#: src/simple-scan.ui:691 src/simple-scan.ui:837
 msgid "Scan"
 msgstr "סריקה"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:707 src/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "שמירת המסמך לקובץ"
 
-#: ../src/ui.vala:1842
+#: src/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
+#: src/simple-scan.ui:724 src/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "עצירת הסריקה הנוכחית"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:725 src/simple-scan.ui:825
 msgid "Stop"
 msgstr "עצירה"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:749 src/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
+#: src/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "סיבוב שמאלה"
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:764 src/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
+#: src/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "סיבוב ימינה"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:779 src/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "חיתוך העמוד שנבחר"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:781
 msgid "Crop"
 msgstr "חיתוך"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "העדפות"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "_מקור הסריקה:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "ר_זולוציית הטקסט:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "_רזולוציית התמונה:"
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "הצד הנסרק:"
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "מידות הדף:"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "בהירות:"
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "ניגודיות:"
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "איכות:"
 
@@ -296,7 +298,7 @@ msgstr "איכות:"
 msgid "Document Scanner"
 msgstr "סורק מסמכים"
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr "סריקת מסמכים"
 
@@ -308,7 +310,7 @@ msgstr "סורק;סריקה;משטח;מזין דפים;"
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 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 "
@@ -319,198 +321,198 @@ msgstr ""
 "בתמונה ולהטות אם היא בכיוון הלא נכון. ניתן להדפיס את הסריקות שלך, לייצא אותן "
 "ל־PDF או לשמור אותן במגוון רחב של תסדירי תמונה."
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 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:389
 msgid "Failed to scan"
 msgstr "הסריקה נכשלה"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 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:630
 #, 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"
@@ -537,16 +539,16 @@ msgstr ""
 "ניתן לעיין ב־<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"
@@ -559,22 +561,22 @@ msgstr ""
 "  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>."
@@ -583,12 +585,12 @@ msgstr ""
 "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>."
@@ -597,17 +599,17 @@ msgstr ""
 "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>."
@@ -616,138 +618,138 @@ msgstr ""
 "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:2182
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "נשמר העמוד %d מתוך %d"
diff --git a/po/hr.gmo b/po/hr.gmo
deleted file mode 100644
index a66e2e3..0000000
--- a/po/hr.gmo
+++ /dev/null
diff --git a/po/hr.po b/po/hr.po
index 0bdcb7e..2e88073 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -7,288 +7,290 @@ 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"
+"POT-Creation-Date: 2017-03-27 22:33+1300\n"
 "PO-Revision-Date: 2016-11-26 12:08+0000\n"
 "Last-Translator: gogo <trebelnik2@gmail.com>\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-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:11+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_Ovlasti"
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "_Korisničko ime za izvor:"
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Lozinka:"
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/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:192
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr "Prednja"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/simple-scan.ui:196
 msgid "Back"
 msgstr "Stražnja"
 
 #. 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
+#: src/simple-scan.ui:225 src/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:241
+#: src/simple-scan.ui:241
 msgid "_Document"
 msgstr "_Dokument"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/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:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/simple-scan.ui:273 src/simple-scan.ui:1306 src/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:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/simple-scan.ui:283 src/simple-scan.ui:1315 src/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:294
+#: src/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "_Zaustavi skeniranje"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:310 src/simple-scan.ui:1330 src/simple-scan.ui:1380
 msgid "Text"
 msgstr "Tekst"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:320 src/simple-scan.ui:1340 src/simple-scan.ui:1390
 msgid "Photo"
 msgstr "Fotografija"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/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:367
+#: src/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:430
+#: src/simple-scan.ui:430
 msgid "_Page"
 msgstr "_Stranica"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "Zakreni _lijevo"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "Zakreni _desno"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:460
 msgid "_Crop"
 msgstr "_Izreži"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:470
 msgid "_None"
 msgstr "_Ništa"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:514
 msgid "_Letter"
 msgstr "_Pismo"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "Pr_avno"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:536
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:547
 msgid "_Custom"
 msgstr "_Prilagođeno"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/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:578
+#: src/simple-scan.ui:578
 msgid "Move Left"
 msgstr "Pomakni ulijevo"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/simple-scan.ui:587
 msgid "Move Right"
 msgstr "Pomakni udesno"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:624
 msgid "_Help"
 msgstr "_Priručnik"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:632
 msgid "_Contents"
 msgstr "_Priručnik"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:674 src/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "Započni novi dokument"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:675
 msgid "New"
 msgstr "Novo"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:689 src/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:691 data/simple-scan.ui:837
+#: src/simple-scan.ui:691 src/simple-scan.ui:837
 msgid "Scan"
 msgstr "Skeniraj"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:707 src/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "Spremi dokument u datoteku"
 
-#: ../src/ui.vala:1842
+#: src/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "Spremi"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/simple-scan.ui:724 src/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "Zaustavi trenutno skeniranje"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:725 src/simple-scan.ui:825
 msgid "Stop"
 msgstr "Zaustavi"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:749 src/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:750
+#: src/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "Zakreni lijevo"
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:764 src/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:765
+#: src/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "Zakreni udesno"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:779 src/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "Izreži odabranu stranicu"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:781
 msgid "Crop"
 msgstr "Izreži"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "Osobitosti"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "_Izvor skeniranja:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "_Razlučivost teksta:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "_Razlučivost slike:"
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "Stranica skeniranja:"
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "Veličina stranice:"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "Svjetlina:"
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "Kontrast:"
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "Kvaliteta:"
 
@@ -296,7 +298,7 @@ msgstr "Kvaliteta:"
 msgid "Document Scanner"
 msgstr "Skener dokumenta"
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr "Skenirajte dokumente"
 
@@ -308,7 +310,7 @@ msgstr "skeniraj;skener;plosnat;adf;"
 msgid "scanner"
 msgstr "skener"
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 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 "
@@ -320,7 +322,7 @@ msgstr ""
 "Možete ispisati vaše skenirane dokumente ili fotografije, izvesti ih u pdf "
 "ili ih spremiti u različite slikovne formate."
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
@@ -328,193 +330,193 @@ msgstr ""
 "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:389
 msgid "Failed to scan"
 msgstr "Neuspjelo skeniranje"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 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:630
 #, 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 dodatan 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"
@@ -543,16 +545,16 @@ msgstr ""
 "program. Ako niste, posjetite <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"
@@ -566,22 +568,22 @@ msgstr ""
 "  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>."
@@ -590,12 +592,12 @@ msgstr ""
 "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>."
@@ -604,17 +606,17 @@ msgstr ""
 "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>."
@@ -623,139 +625,139 @@ msgstr ""
 "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 "Priručnik"
 
-#: ../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:2182
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Spremanje stranice %d od %d"
diff --git a/po/hu.gmo b/po/hu.gmo
deleted file mode 100644
index d26b8d3..0000000
--- a/po/hu.gmo
+++ /dev/null
diff --git a/po/hu.po b/po/hu.po
index a271ec0..24c7934 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,288 +7,290 @@ 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"
+"POT-Creation-Date: 2017-03-27 22:33+1300\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-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:10+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_Felhatalmazás"
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/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:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Jelszó:"
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/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:192
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr "Előlap"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/simple-scan.ui:196
 msgid "Back"
 msgstr "Hátlap"
 
 #. 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
+#: src/simple-scan.ui:225 src/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:241
+#: src/simple-scan.ui:241
 msgid "_Document"
 msgstr "_Dokumentum"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/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:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/simple-scan.ui:273 src/simple-scan.ui:1306 src/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:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/simple-scan.ui:283 src/simple-scan.ui:1315 src/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:294
+#: src/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "_Szkennelés megállítása"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:310 src/simple-scan.ui:1330 src/simple-scan.ui:1380
 msgid "Text"
 msgstr "Szöveg"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:320 src/simple-scan.ui:1340 src/simple-scan.ui:1390
 msgid "Photo"
 msgstr "Fénykép"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/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:367
+#: src/simple-scan.ui:367
 msgid "_Email"
 msgstr "_E-mail"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:430
 msgid "_Page"
 msgstr "_Oldal"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "Forgatás b_alra"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "Forgatás _jobbra"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:460
 msgid "_Crop"
 msgstr "_Vágás"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:470
 msgid "_None"
 msgstr "_Nincs vágás"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:514
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:536
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:547
 msgid "_Custom"
 msgstr "_Egyéni"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/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:578
+#: src/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:587
+#: src/simple-scan.ui:587
 msgid "Move Right"
 msgstr "Mozgatás jobbra"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:624
 msgid "_Help"
 msgstr "_Súgó"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:632
 msgid "_Contents"
 msgstr "_Tartalom"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:674 src/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "Új dokumentum létrehozása"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:675
 msgid "New"
 msgstr "Új"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:689 src/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:691 data/simple-scan.ui:837
+#: src/simple-scan.ui:691 src/simple-scan.ui:837
 msgid "Scan"
 msgstr "Szkennelés"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:707 src/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "Dokumentum fájlba mentése"
 
-#: ../src/ui.vala:1842
+#: src/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "Mentés"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/simple-scan.ui:724 src/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "A jelenlegi szkennelés leállítása"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:725 src/simple-scan.ui:825
 msgid "Stop"
 msgstr "Leállít"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:749 src/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:750
+#: src/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "Forgatás balra"
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:764 src/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:765
+#: src/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "Forgatás jobbra"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:779 src/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "A kiválasztott oldal vágása"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:781
 msgid "Crop"
 msgstr "Vágás"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/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:1048
+#: src/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "Szkennelés _forrása:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "_Szöveg felbontása:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "_Fotó felbontása:"
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "Oldal szkennelése:"
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "Oldalméret:"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "Fényerő:"
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "Kontraszt:"
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "Minőség:"
 
@@ -296,7 +298,7 @@ msgstr "Minőség:"
 msgid "Document Scanner"
 msgstr "Dokumentumbeolvasó"
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr "Dokumentumok szkennelése"
 
@@ -308,7 +310,7 @@ msgstr "szkennelés;szkenner;beolvasó;síkágyas;adf;"
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 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 "
@@ -319,7 +321,7 @@ 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/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
@@ -327,192 +329,192 @@ msgstr ""
 "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:389
 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:619
 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:630
 #, 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"
@@ -540,16 +542,16 @@ msgstr ""
 "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"
@@ -566,22 +568,22 @@ msgstr ""
 "  Ú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>."
@@ -590,12 +592,12 @@ msgstr ""
 "é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>."
@@ -604,17 +606,17 @@ msgstr ""
 "é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>."
@@ -623,138 +625,138 @@ msgstr ""
 "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:2182
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "%d. oldal mentése, összesen %d"
diff --git a/po/hy.gmo b/po/hy.gmo
deleted file mode 100644
index 0f66606..0000000
--- a/po/hy.gmo
+++ /dev/null
diff --git a/po/hy.po b/po/hy.po
index 47e1b66..c9f1af1 100644
--- a/po/hy.po
+++ b/po/hy.po
@@ -7,288 +7,290 @@ 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"
+"POT-Creation-Date: 2017-03-27 22:33+1300\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-12-19 05:07+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:10+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr ""
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr ""
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr ""
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/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
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr ""
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/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
+#: src/simple-scan.ui:225 src/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
+#: src/simple-scan.ui:241
 msgid "_Document"
 msgstr ""
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/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
+#: src/simple-scan.ui:273 src/simple-scan.ui:1306 src/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
+#: src/simple-scan.ui:283 src/simple-scan.ui:1315 src/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr ""
 
 #. Menu entry to stop current scan
-#: data/simple-scan.ui:294
+#: src/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr ""
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:310 src/simple-scan.ui:1330 src/simple-scan.ui:1380
 msgid "Text"
 msgstr ""
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:320 src/simple-scan.ui:1340 src/simple-scan.ui:1390
 msgid "Photo"
 msgstr ""
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/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
+#: src/simple-scan.ui:367
 msgid "_Email"
 msgstr ""
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:430
 msgid "_Page"
 msgstr ""
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr ""
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr ""
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:460
 msgid "_Crop"
 msgstr ""
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:470
 msgid "_None"
 msgstr ""
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:514
 msgid "_Letter"
 msgstr ""
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:525
 msgid "Le_gal"
 msgstr ""
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:536
 msgid "4×6"
 msgstr ""
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:547
 msgid "_Custom"
 msgstr ""
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr ""
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/simple-scan.ui:578
 msgid "Move Left"
 msgstr ""
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/simple-scan.ui:587
 msgid "Move Right"
 msgstr ""
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:624
 msgid "_Help"
 msgstr ""
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:632
 msgid "_Contents"
 msgstr ""
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:674 src/simple-scan.ui:885
 msgid "Start a new document"
 msgstr ""
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:675
 msgid "New"
 msgstr ""
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:689 src/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
+#: src/simple-scan.ui:691 src/simple-scan.ui:837
 msgid "Scan"
 msgstr ""
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:707 src/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr ""
 
-#: ../src/ui.vala:1842
+#: src/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
+#: src/simple-scan.ui:724 src/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr ""
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:725 src/simple-scan.ui:825
 msgid "Stop"
 msgstr ""
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:749 src/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
+#: src/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr ""
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:764 src/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
+#: src/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr ""
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:779 src/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr ""
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:781
 msgid "Crop"
 msgstr ""
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr ""
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr ""
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr ""
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr ""
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1260
 msgid "Quality:"
 msgstr ""
 
@@ -296,7 +298,7 @@ msgstr ""
 msgid "Document Scanner"
 msgstr ""
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr ""
 
@@ -308,7 +310,7 @@ msgstr ""
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 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 "
@@ -316,196 +318,196 @@ msgid ""
 "formats."
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 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:389
 msgid "Failed to scan"
 msgstr ""
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:630
 #, 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"
@@ -522,205 +524,205 @@ msgid ""
 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:2182
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/id.gmo b/po/id.gmo
deleted file mode 100644
index 5146765..0000000
--- a/po/id.gmo
+++ /dev/null
diff --git a/po/id.po b/po/id.po
index b2775c1..6a93263 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,288 +7,290 @@ 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: 2014-01-18 00:43+0000\n"
-"Last-Translator: Andika Triwidada <andika@gmail.com>\n"
+"POT-Creation-Date: 2017-03-27 22:33+1300\n"
+"PO-Revision-Date: 2017-03-29 06:37+0000\n"
+"Last-Translator: Rahman Yusri Aftian <fn.aftian@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-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:10+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "Otoris_asikan"
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "Nama pengg_una untuk sumber daya:"
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Sandi:"
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/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:192
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr "Depan"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/simple-scan.ui:196
 msgid "Back"
 msgstr "Belakang"
 
 #. 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
+#: src/simple-scan.ui:225 src/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:241
+#: src/simple-scan.ui:241
 msgid "_Document"
 msgstr "_Dokumen"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/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:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/simple-scan.ui:273 src/simple-scan.ui:1306 src/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:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/simple-scan.ui:283 src/simple-scan.ui:1315 src/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr "Semua Halaman Dari _Feeder"
 
 #. Menu entry to stop current scan
-#: data/simple-scan.ui:294
+#: src/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "Berhenti _Memindai"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:310 src/simple-scan.ui:1330 src/simple-scan.ui:1380
 msgid "Text"
 msgstr "Teks"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:320 src/simple-scan.ui:1340 src/simple-scan.ui:1390
 msgid "Photo"
 msgstr "Foto"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/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:367
+#: src/simple-scan.ui:367
 msgid "_Email"
 msgstr "Sur_el"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:430
 msgid "_Page"
 msgstr "_Halaman"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:440
 msgid "Rotate _Left"
-msgstr ""
+msgstr "Putar _Kiri"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:450
 msgid "Rotate _Right"
-msgstr ""
+msgstr "Putar Ka_nan"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:460
 msgid "_Crop"
-msgstr ""
+msgstr "_Potong"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:470
 msgid "_None"
 msgstr "_Nihil"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:514
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:536
 msgid "4×6"
 msgstr "4x6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:547
 msgid "_Custom"
 msgstr "_Ubahan"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/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:578
+#: src/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:587
+#: src/simple-scan.ui:587
 msgid "Move Right"
 msgstr "Pindah Ke Kanan"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:624
 msgid "_Help"
-msgstr ""
+msgstr "Ba_ntuan"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:632
 msgid "_Contents"
 msgstr "_Isi"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:674 src/simple-scan.ui:885
 msgid "Start a new document"
-msgstr ""
+msgstr "Mulai dokumen baru"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:675
 msgid "New"
-msgstr ""
+msgstr "Baru"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:689 src/simple-scan.ui:836
 msgid "Scan a single page from the scanner"
-msgstr ""
+msgstr "Pindai sebuah halaman dari pemindai"
 
 #. Label on scan toolbar item
-#: data/simple-scan.ui:691 data/simple-scan.ui:837
+#: src/simple-scan.ui:691 src/simple-scan.ui:837
 msgid "Scan"
 msgstr "Pindai"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:707 src/simple-scan.ui:864
 msgid "Save document to a file"
-msgstr ""
+msgstr "Simpan hasil dalam berkas"
 
-#: ../src/ui.vala:1842
+#: src/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
-msgstr ""
+msgstr "Simpan"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/simple-scan.ui:724 src/simple-scan.ui:824
 msgid "Stop the current scan"
-msgstr ""
+msgstr "Hentikan pemindaian"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:725 src/simple-scan.ui:825
 msgid "Stop"
-msgstr ""
+msgstr "Stop"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:749 src/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:750
+#: src/simple-scan.ui:750
 msgid "Rotate Left"
-msgstr ""
+msgstr "Putar Kiri"
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:764 src/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:765
+#: src/simple-scan.ui:765
 msgid "Rotate Right"
-msgstr ""
+msgstr "Putar Kanan"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:779 src/simple-scan.ui:963
 msgid "Crop the selected page"
-msgstr ""
+msgstr "Potong halaman yang dipilih"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:781
 msgid "Crop"
-msgstr ""
+msgstr "Potong"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "Preferensi"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "_Sumber Pindai:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "Resolusi _Teks:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "Resolusi _Foto:"
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1139
 msgid "Scan Side:"
-msgstr ""
+msgstr "Bidang Pindai:"
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1169
 msgid "Page Size:"
-msgstr ""
+msgstr "Ukuran Halaman:"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "Kecerahan:"
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "Kontras:"
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "Kualitas:"
 
@@ -296,7 +298,7 @@ msgstr "Kualitas:"
 msgid "Document Scanner"
 msgstr "Pelarik Dokumen"
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr "Pindai Dokumen"
 
@@ -308,7 +310,7 @@ msgstr "scan;scanner;pelarik;pemindai;flatbed;adf;"
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 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 "
@@ -319,7 +321,7 @@ msgstr ""
 "jelek dari suatu foto dan memutarnya bila itu terbalik. Anda dapat mencetak "
 "pindaian Anda, mengekspor ke pdf, atau menyimpan ke sejumlah format berkas."
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
@@ -327,191 +329,191 @@ msgstr ""
 "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:389
 msgid "Failed to scan"
 msgstr "Gagal memindai"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 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:630
 #, 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 "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 "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 "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"
@@ -539,16 +541,16 @@ msgstr ""
 "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"
@@ -567,22 +569,22 @@ msgstr ""
 "  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 "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>."
@@ -591,12 +593,12 @@ msgstr ""
 "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 "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>."
@@ -605,17 +607,17 @@ msgstr ""
 "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 "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 "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>."
@@ -624,138 +626,138 @@ msgstr ""
 "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 "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 "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 "Memasang penggerak..."
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1653
 msgid "Drivers installed successfully!"
 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 "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 "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 "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 "_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:2182
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Menyimpan halaman %d dari %d"
diff --git a/po/insert-header.sin b/po/insert-header.sin
deleted file mode 100644
index b26de01..0000000
--- a/po/insert-header.sin
+++ /dev/null
@@ -1,23 +0,0 @@
-# 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
deleted file mode 100644
index 23f8072..0000000
--- a/po/it.gmo
+++ /dev/null
diff --git a/po/it.po b/po/it.po
index 4b78ad2..caaf243 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,288 +7,290 @@ 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"
+"POT-Creation-Date: 2017-03-27 22:33+1300\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-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:10+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_Autorizza"
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "_Nome utente per la risorsa:"
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr "Pass_word:"
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/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:192
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr "Fronte"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/simple-scan.ui:196
 msgid "Back"
 msgstr "Retro"
 
 #. 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
+#: src/simple-scan.ui:225 src/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:241
+#: src/simple-scan.ui:241
 msgid "_Document"
 msgstr "_Documento"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/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:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/simple-scan.ui:273 src/simple-scan.ui:1306 src/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:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/simple-scan.ui:283 src/simple-scan.ui:1315 src/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:294
+#: src/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "Ferma l'acqui_sizione"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:310 src/simple-scan.ui:1330 src/simple-scan.ui:1380
 msgid "Text"
 msgstr "Testo"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:320 src/simple-scan.ui:1340 src/simple-scan.ui:1390
 msgid "Photo"
 msgstr "Foto"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/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:367
+#: src/simple-scan.ui:367
 msgid "_Email"
 msgstr "_Email"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:430
 msgid "_Page"
 msgstr "_Pagina"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "Ruota a _sinistra"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "Ruota a _destra"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:460
 msgid "_Crop"
 msgstr "_Ritaglio"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:470
 msgid "_None"
 msgstr "_Nessuno"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:514
 msgid "_Letter"
 msgstr "US _Letter"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:536
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:547
 msgid "_Custom"
 msgstr "_Personalizzato"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr "_Ruota ritaglio"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/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:587
+#: src/simple-scan.ui:587
 msgid "Move Right"
 msgstr "Sposta a destra"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:624
 msgid "_Help"
 msgstr "A_iuto"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:632
 msgid "_Contents"
 msgstr "_Sommario"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:674 src/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "Crea un nuovo documento"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:675
 msgid "New"
 msgstr "Nuovo"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:689 src/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:691 data/simple-scan.ui:837
+#: src/simple-scan.ui:691 src/simple-scan.ui:837
 msgid "Scan"
 msgstr "Acquisisci"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:707 src/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "Salva documento in un file"
 
-#: ../src/ui.vala:1842
+#: src/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "Salva"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/simple-scan.ui:724 src/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "Interrompe l'acquisizione in corso"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:725 src/simple-scan.ui:825
 msgid "Stop"
 msgstr "Ferma"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:749 src/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:750
+#: src/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "Ruota a sinistra"
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:764 src/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:765
+#: src/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "Ruota a destra"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:779 src/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "Ritaglia la pagina selezionata"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:781
 msgid "Crop"
 msgstr "Ritaglia"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "Preferenze"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "S_orgente di acquisizione:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "Risoluzione _testo:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "_Risoluzione foto:"
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "Lato acquisizione:"
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "Dimensione pagina:"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "Luminosità:"
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "Contrasto:"
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "Qualità:"
 
@@ -296,7 +298,7 @@ msgstr "Qualità:"
 msgid "Document Scanner"
 msgstr "Scansiona documenti"
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr "Acquisisci documenti"
 
@@ -308,7 +310,7 @@ msgstr "scan;scanner;scansiona;adf;"
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 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 "
@@ -320,7 +322,7 @@ msgstr ""
 "sbagliato. È anche possibile stampare i file acquisiti esportarli in formato "
 "PDF o salvarli in vari formati di immagine."
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
@@ -328,193 +330,193 @@ msgstr ""
 "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:389
 msgid "Failed to scan"
 msgstr "Acquisizione non riuscita"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 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:630
 #, 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"
@@ -545,16 +547,16 @@ msgstr ""
 "<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"
@@ -581,22 +583,22 @@ msgstr ""
 "  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>."
@@ -605,12 +607,12 @@ msgstr ""
 "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>."
@@ -619,17 +621,17 @@ msgstr ""
 "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>."
@@ -638,139 +640,139 @@ msgstr ""
 "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:2182
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Salvataggio pagina %d di %d"
diff --git a/po/ja.gmo b/po/ja.gmo
deleted file mode 100644
index 8614803..0000000
--- a/po/ja.gmo
+++ /dev/null
diff --git a/po/ja.po b/po/ja.po
index 15b3a11..e7f6d2c 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,288 +7,290 @@ 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"
+"POT-Creation-Date: 2017-03-27 22:33+1300\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-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:10+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "認証(_A)"
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "リソースに対するユーザ名(_U):"
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr "パスワード(_P):"
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/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
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr "表面"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/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
+#: src/simple-scan.ui:225 src/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
+#: src/simple-scan.ui:241
 msgid "_Document"
 msgstr "ドキュメント(_D)"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/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
+#: src/simple-scan.ui:273 src/simple-scan.ui:1306 src/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
+#: src/simple-scan.ui:283 src/simple-scan.ui:1315 src/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr "フィーダより全てのページ(_F)"
 
 #. Menu entry to stop current scan
-#: data/simple-scan.ui:294
+#: src/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "スキャン停止(_S)"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:310 src/simple-scan.ui:1330 src/simple-scan.ui:1380
 msgid "Text"
 msgstr "テキスト"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:320 src/simple-scan.ui:1340 src/simple-scan.ui:1390
 msgid "Photo"
 msgstr "写真"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/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
+#: src/simple-scan.ui:367
 msgid "_Email"
 msgstr "電子メール(_E)"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:430
 msgid "_Page"
 msgstr "ページ(_P)"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "左へ回転(_L)"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "右へ回転(_R)"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:460
 msgid "_Crop"
 msgstr "切り抜き(_C)"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:470
 msgid "_None"
 msgstr "なし(_N)"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:514
 msgid "_Letter"
 msgstr "US レター(_L)"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "US リーガル(_G)"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:536
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:547
 msgid "_Custom"
 msgstr "カスタム(_C)"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr "切り抜きを回転(_R)"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/simple-scan.ui:578
 msgid "Move Left"
 msgstr "左へ移動"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/simple-scan.ui:587
 msgid "Move Right"
 msgstr "右へ移動"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:624
 msgid "_Help"
 msgstr "ヘルプ(_H)"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:632
 msgid "_Contents"
 msgstr "コンテンツ(_C)"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:674 src/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "新規ドキュメントの作成"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:675
 msgid "New"
 msgstr "新規"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:689 src/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
+#: src/simple-scan.ui:691 src/simple-scan.ui:837
 msgid "Scan"
 msgstr "スキャン"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:707 src/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "ドキュメントをファイルに保存"
 
-#: ../src/ui.vala:1842
+#: src/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
+#: src/simple-scan.ui:724 src/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "スキャンを停止します"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:725 src/simple-scan.ui:825
 msgid "Stop"
 msgstr "停止"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:749 src/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
+#: src/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "左へ回転"
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:764 src/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
+#: src/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "右へ回転"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:779 src/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "選択した範囲の切り抜き"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:781
 msgid "Crop"
 msgstr "切り抜き"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "設定"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "スキャンする対象(_O):"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "テキストの画素数(_T):"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "写真の画素数(_P):"
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "スキャン面:"
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "ページサイズ:"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "明るさ:"
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "コントラスト:"
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "品質:"
 
@@ -296,7 +298,7 @@ msgstr "品質:"
 msgid "Document Scanner"
 msgstr "ドキュメントスキャナ―"
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr "ドキュメントをスキャンします"
 
@@ -308,7 +310,7 @@ msgstr "scan;scanner;flatbed;adf;スキャン;スキャナー;フラットベッ
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 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 "
@@ -318,196 +320,196 @@ msgstr ""
 "ドキュメントや写真を本当に簡単な方法でスキャンします。写真の不要な部分を切り取ったり、間違った方向に向いている場合は回転できます。スキャンしたものを印刷、"
 "PDFへのエクスポート、多くの画像フォーマットに保存することができます。"
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 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:389
 msgid "Failed to scan"
 msgstr "スキャンに失敗しました"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[デバイス...] - スキャンユーティリティ"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:630
 #, 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"
@@ -536,20 +538,20 @@ msgstr ""
 "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"
-"  Akira Tanaka https://launchpad.net/~akira-tanaka\n"
+"  Akira Tanaka https://launchpad.net/~popo1897\n"
 "  Hajime Mizuno https://launchpad.net/~mizuno-as\n"
 "  Jeroen Hoek https://launchpad.net/~mail-jeroenhoek\n"
 "  Jun Kobayashi https://launchpad.net/~jkbys\n"
@@ -562,22 +564,22 @@ msgstr ""
 "  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>."
@@ -586,12 +588,12 @@ msgstr ""
 "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>."
@@ -600,17 +602,17 @@ 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 "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>."
@@ -618,138 +620,138 @@ 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:2182
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "%2$dページ中%1$dページを保存しています"
diff --git a/po/kk.gmo b/po/kk.gmo
deleted file mode 100644
index d94d46d..0000000
--- a/po/kk.gmo
+++ /dev/null
diff --git a/po/kk.po b/po/kk.po
index 777ca09..1885464 100644
--- a/po/kk.po
+++ b/po/kk.po
@@ -7,288 +7,290 @@ 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"
+"POT-Creation-Date: 2017-03-27 22:33+1300\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-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:10+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr ""
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr ""
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Құпия сөз:"
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/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
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr "Бет жағы"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/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
+#: src/simple-scan.ui:225 src/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
+#: src/simple-scan.ui:241
 msgid "_Document"
 msgstr ""
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/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
+#: src/simple-scan.ui:273 src/simple-scan.ui:1306 src/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
+#: src/simple-scan.ui:283 src/simple-scan.ui:1315 src/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr ""
 
 #. Menu entry to stop current scan
-#: data/simple-scan.ui:294
+#: src/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr ""
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:310 src/simple-scan.ui:1330 src/simple-scan.ui:1380
 msgid "Text"
 msgstr "Мәтін"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:320 src/simple-scan.ui:1340 src/simple-scan.ui:1390
 msgid "Photo"
 msgstr "Фото"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/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
+#: src/simple-scan.ui:367
 msgid "_Email"
 msgstr ""
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:430
 msgid "_Page"
 msgstr ""
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "_Солға бұру"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "_Оңға бұру"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:460
 msgid "_Crop"
 msgstr "Қ_иып жіберу"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:470
 msgid "_None"
 msgstr "_Ешнәрсе"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:481
 msgid "A_4"
 msgstr ""
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:492
 msgid "A_5"
 msgstr ""
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:503
 msgid "A_6"
 msgstr ""
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:514
 msgid "_Letter"
 msgstr ""
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:525
 msgid "Le_gal"
 msgstr ""
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:536
 msgid "4×6"
 msgstr ""
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:547
 msgid "_Custom"
 msgstr ""
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr ""
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/simple-scan.ui:578
 msgid "Move Left"
 msgstr ""
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/simple-scan.ui:587
 msgid "Move Right"
 msgstr ""
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:624
 msgid "_Help"
 msgstr "_Көмек"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:632
 msgid "_Contents"
 msgstr "Құра_масы"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:674 src/simple-scan.ui:885
 msgid "Start a new document"
 msgstr ""
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:675
 msgid "New"
 msgstr "Жаңа"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:689 src/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
+#: src/simple-scan.ui:691 src/simple-scan.ui:837
 msgid "Scan"
 msgstr "Іздеу"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:707 src/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr ""
 
-#: ../src/ui.vala:1842
+#: src/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
+#: src/simple-scan.ui:724 src/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr ""
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:725 src/simple-scan.ui:825
 msgid "Stop"
 msgstr "Тоқтау"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:749 src/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
+#: src/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "Солға бұру"
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:764 src/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
+#: src/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "Оңға бұру"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:779 src/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr ""
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:781
 msgid "Crop"
 msgstr "Қиып жіберу"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "Баптаулары"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr ""
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr ""
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr ""
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1260
 msgid "Quality:"
 msgstr ""
 
@@ -296,7 +298,7 @@ msgstr ""
 msgid "Document Scanner"
 msgstr ""
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr ""
 
@@ -308,7 +310,7 @@ msgstr ""
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 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 "
@@ -316,196 +318,196 @@ msgid ""
 "formats."
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 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:389
 msgid "Failed to scan"
 msgstr ""
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:630
 #, 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"
@@ -522,16 +524,16 @@ msgid ""
 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"
@@ -539,189 +541,189 @@ msgstr ""
 "  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:2182
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/km.gmo b/po/km.gmo
deleted file mode 100644
index 2c140b8..0000000
--- a/po/km.gmo
+++ /dev/null
diff --git a/po/km.po b/po/km.po
index 463ab15..636256f 100644
--- a/po/km.po
+++ b/po/km.po
@@ -7,288 +7,290 @@ 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"
+"POT-Creation-Date: 2017-03-27 22:33+1300\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-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:10+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "ការ​អនុញ្ញាត"
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "ឈ្មោះ​អ្នកប្រើ​ធនធាន ៖"
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr "ពាក្យសម្ងាត់ ៖"
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/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
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr "មុខ"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/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
+#: src/simple-scan.ui:225 src/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
+#: src/simple-scan.ui:241
 msgid "_Document"
 msgstr "ឯកសារ"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/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
+#: src/simple-scan.ui:273 src/simple-scan.ui:1306 src/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
+#: src/simple-scan.ui:283 src/simple-scan.ui:1315 src/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr "ទំព័រ​ទាំងអស់​ពី​កម្មវិធី​មតិ"
 
 #. Menu entry to stop current scan
-#: data/simple-scan.ui:294
+#: src/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "ឈប់​ស្កេន"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:310 src/simple-scan.ui:1330 src/simple-scan.ui:1380
 msgid "Text"
 msgstr "អត្ថបទ"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:320 src/simple-scan.ui:1340 src/simple-scan.ui:1390
 msgid "Photo"
 msgstr "រូបថត"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/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
+#: src/simple-scan.ui:367
 msgid "_Email"
 msgstr "អ៊ីមែល"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:430
 msgid "_Page"
 msgstr "ទំព័រ"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "បង្វិល​ឆ្វេង"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "បង្វិល​ស្ដាំ"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:460
 msgid "_Crop"
 msgstr "ច្រឹប"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:470
 msgid "_None"
 msgstr "គ្មាន"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:481
 msgid "A_4"
 msgstr "A4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:492
 msgid "A_5"
 msgstr "A5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:503
 msgid "A_6"
 msgstr "A6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:514
 msgid "_Letter"
 msgstr "សំបុត្រ"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "ស្រប​ច្បាប់"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:536
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:547
 msgid "_Custom"
 msgstr "ផ្ទាល់ខ្លួន"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr "បង្វិល​ការ​ច្រឹប"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/simple-scan.ui:578
 msgid "Move Left"
 msgstr "ផ្លាស់ទី​ទៅ​ឆ្វេង"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/simple-scan.ui:587
 msgid "Move Right"
 msgstr "ផ្លាស់ទី​ទៅ​ស្ដាំ"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:624
 msgid "_Help"
 msgstr "ជំនួយ"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:632
 msgid "_Contents"
 msgstr "មាតិកា"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:674 src/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "ចាប់ផ្ដើម​ឯកសារ​ថ្មី"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:675
 msgid "New"
 msgstr "ថ្មី"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:689 src/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
+#: src/simple-scan.ui:691 src/simple-scan.ui:837
 msgid "Scan"
 msgstr "ស្កេន"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:707 src/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "រក្សាទុក​ឯកសារ​ទៅ​ឯកសារ"
 
-#: ../src/ui.vala:1842
+#: src/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
+#: src/simple-scan.ui:724 src/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "បញ្ឈប់​ការ​ស្កេន​បច្ចុប្បន្ន"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:725 src/simple-scan.ui:825
 msgid "Stop"
 msgstr "ឈប់"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:749 src/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
+#: src/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "បង្វិល​ឆ្វេង"
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:764 src/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
+#: src/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "បង្វិល​ស្ដាំ"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:779 src/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "ច្រឹប​ទំព័រ​ដែល​បាន​ជ្រើស"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:781
 msgid "Crop"
 msgstr "ច្រឹប"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "ចំណូលចិត្ត"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "ស្កេន​ប្រភព ៖"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "គុណភាព​បង្ហាញ​អត្ថបទ ៖"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "គុណភាព​បង្ហាញ​រូបថត ៖"
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "ស្កេន​ចំហៀង ៖"
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "ទំហំ​ទំព័រ ៖"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "ពន្លឺ ៖"
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "កម្រិត​ពណ៌ ៖"
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "គុណភាព ៖"
 
@@ -296,7 +298,7 @@ msgstr "គុណភាព ៖"
 msgid "Document Scanner"
 msgstr "ម៉ាស៊ីនស្កេនឯកសារ"
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr "ស្កេន​ឯកសារ"
 
@@ -308,7 +310,7 @@ msgstr "ស្កេន;ម៉ាស៊ីនស្កេន;flatbed;adf;"
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 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 "
@@ -316,202 +318,202 @@ msgid ""
 "formats."
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 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:389
 msgid "Failed to scan"
 msgstr "បាន​បរាជ័យ​ក្នុង​ការ​ស្កេន"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[ឧបករណ៍...] - ការ​ស្កេន​ឧបករណ៍​ប្រើប្រាស់"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:630
 #, 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"
@@ -541,16 +543,16 @@ 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"
@@ -560,189 +562,189 @@ msgstr ""
 "  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:2182
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "រក្សាទុក​ទំព័រ %d ផុត​សម័យ %d"
diff --git a/po/ko.gmo b/po/ko.gmo
deleted file mode 100644
index fb63022..0000000
--- a/po/ko.gmo
+++ /dev/null
diff --git a/po/ko.po b/po/ko.po
index f43509d..539202d 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -7,288 +7,290 @@ 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"
+"POT-Creation-Date: 2017-03-27 22:33+1300\n"
 "PO-Revision-Date: 2016-06-01 06:12+0000\n"
-"Last-Translator: MinSoo Kim <misol@korea.ac.kr>\n"
+"Last-Translator: Min-Soo Kim <misol.kr@gmail.com>\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-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:10+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "인증(_A)"
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "리소스에 대한 사용자 이름(_U):"
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr "비밀번호(_P):"
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/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
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr "앞면"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/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
+#: src/simple-scan.ui:225 src/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
+#: src/simple-scan.ui:241
 msgid "_Document"
 msgstr "문서(_D)"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/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
+#: src/simple-scan.ui:273 src/simple-scan.ui:1306 src/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
+#: src/simple-scan.ui:283 src/simple-scan.ui:1315 src/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr "스케너의 모든 페이지(_F)"
 
 #. Menu entry to stop current scan
-#: data/simple-scan.ui:294
+#: src/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "스캔 중지(_S)"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:310 src/simple-scan.ui:1330 src/simple-scan.ui:1380
 msgid "Text"
 msgstr "텍스트"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:320 src/simple-scan.ui:1340 src/simple-scan.ui:1390
 msgid "Photo"
 msgstr "사진"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/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
+#: src/simple-scan.ui:367
 msgid "_Email"
 msgstr "이메일(_E)"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:430
 msgid "_Page"
 msgstr "페이지(_P)"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "왼쪽으로 돌리기(_L)"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "오른쪽으로 돌리기(_R)"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:460
 msgid "_Crop"
 msgstr "잘라내기(_C)"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:470
 msgid "_None"
 msgstr "없음(_N)"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:514
 msgid "_Letter"
 msgstr "편지(_L)"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "미국  법정 규격(_G)"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:536
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:547
 msgid "_Custom"
 msgstr "사용자 설정(_C)"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr "잘라낸 영역 회전(_R)"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/simple-scan.ui:578
 msgid "Move Left"
 msgstr "왼쪽으로 이동"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/simple-scan.ui:587
 msgid "Move Right"
 msgstr "오른쪽으로 이동"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:624
 msgid "_Help"
 msgstr "도움말(_H)"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:632
 msgid "_Contents"
 msgstr "내용(_C)"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:674 src/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "새 문서 시작"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:675
 msgid "New"
 msgstr "새로 만들기"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:689 src/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
+#: src/simple-scan.ui:691 src/simple-scan.ui:837
 msgid "Scan"
 msgstr "스캔"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:707 src/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "파일로 문서 저장하기"
 
-#: ../src/ui.vala:1842
+#: src/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
+#: src/simple-scan.ui:724 src/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "현재 스캔 중지"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:725 src/simple-scan.ui:825
 msgid "Stop"
 msgstr "정지"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:749 src/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
+#: src/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "왼쪽으로 회전"
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:764 src/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
+#: src/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "오른쪽으로 회전"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:779 src/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "선택한 페이지 자르기"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:781
 msgid "Crop"
 msgstr "잘라내기"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "기본 설정"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "스캔 원본(_O)"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "텍스트 해상도(_T)"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "사진 해상도(_P)"
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "가장자리 스캔:"
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "페이지 크기:"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "밝기:"
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "명암:"
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "품질:"
 
@@ -296,7 +298,7 @@ msgstr "품질:"
 msgid "Document Scanner"
 msgstr "문서 스캐너"
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr "스캔 문서"
 
@@ -308,7 +310,7 @@ msgstr "scan;스캔;scanner;스캐너;flatbed;평판 스캐너;adf;"
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 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 "
@@ -318,196 +320,196 @@ msgstr ""
 "문서나 사진을 스캐닝하는 쉬운 방법입니다. 사진에서 쓰지 않는 부분을 잘라내거나 방향이 틀리면 돌려서 바로잡을 수 있습니다. 스캐닝한 "
 "것을 출력하거나, pdf 파일로 내보내거나, 여러 가지 형식으로 저장할 수 있습니다."
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 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:389
 msgid "Failed to scan"
 msgstr "스캔 실패"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[장치...] - 스캐닝 도구"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:630
 #, 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"
@@ -536,16 +538,16 @@ msgstr ""
 "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"
@@ -555,28 +557,28 @@ msgstr ""
 "  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"
+"  Min-Soo 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"
 
 #. 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>."
@@ -584,12 +586,12 @@ msgstr ""
 "사용 가능한 드라이버 확인 <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 "삼성 스캐너를 가지고 계신 것 같습니다."
 
 #. 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>."
@@ -597,17 +599,17 @@ msgstr ""
 "사용 가능한 드라이버 확인 <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 "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>."
@@ -615,138 +617,138 @@ msgstr ""
 "사용 가능한 드라이버 확인 <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 "드라이버 설치"
 
 #. 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:2182
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "%d 페이지(전체 %d 페이지) 저장 중"
diff --git a/po/ku.gmo b/po/ku.gmo
deleted file mode 100644
index 68ebe4c..0000000
--- a/po/ku.gmo
+++ /dev/null
diff --git a/po/ku.po b/po/ku.po
index 73a4e52..fe5de2d 100644
--- a/po/ku.po
+++ b/po/ku.po
@@ -7,288 +7,290 @@ 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"
+"POT-Creation-Date: 2017-03-27 22:33+1300\n"
 "PO-Revision-Date: 2017-02-28 22:55+0000\n"
 "Last-Translator: Euphrates <f_akad@hotmail.com>\n"
 "Language-Team: Kurdish <ku@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: 2017-03-01 05:37+0000\n"
-"X-Generator: Launchpad (build 18329)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:10+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_Rayedar bike"
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr ""
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Şîfre:"
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/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
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr "Pêş"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/simple-scan.ui:196
 msgid "Back"
 msgstr "Paş"
 
 #. 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
+#: src/simple-scan.ui:225 src/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
+#: src/simple-scan.ui:241
 msgid "_Document"
 msgstr ""
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/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
+#: src/simple-scan.ui:273 src/simple-scan.ui:1306 src/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
+#: src/simple-scan.ui:283 src/simple-scan.ui:1315 src/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr ""
 
 #. Menu entry to stop current scan
-#: data/simple-scan.ui:294
+#: src/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr ""
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:310 src/simple-scan.ui:1330 src/simple-scan.ui:1380
 msgid "Text"
 msgstr "Nivîs"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:320 src/simple-scan.ui:1340 src/simple-scan.ui:1390
 msgid "Photo"
 msgstr "Wêne"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/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
+#: src/simple-scan.ui:367
 msgid "_Email"
 msgstr ""
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:430
 msgid "_Page"
 msgstr ""
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "Bizivirîne _Çepê"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "Bizivirîne _Rastê"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:460
 msgid "_Crop"
 msgstr "_Jê Bike"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:470
 msgid "_None"
 msgstr "_Tune"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:514
 msgid "_Letter"
 msgstr ""
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:525
 msgid "Le_gal"
 msgstr ""
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:536
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:547
 msgid "_Custom"
 msgstr "_Taybet"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr ""
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/simple-scan.ui:578
 msgid "Move Left"
 msgstr ""
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/simple-scan.ui:587
 msgid "Move Right"
 msgstr ""
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:624
 msgid "_Help"
 msgstr "_Alîkarî"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:632
 msgid "_Contents"
 msgstr "_Naverok"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:674 src/simple-scan.ui:885
 msgid "Start a new document"
 msgstr ""
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:675
 msgid "New"
 msgstr "Nû"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:689 src/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
+#: src/simple-scan.ui:691 src/simple-scan.ui:837
 msgid "Scan"
 msgstr "Venihêre"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:707 src/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr ""
 
-#: ../src/ui.vala:1842
+#: src/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "Tomar Bike"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/simple-scan.ui:724 src/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr ""
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:725 src/simple-scan.ui:825
 msgid "Stop"
 msgstr "Sekinandin"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:749 src/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
+#: src/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "Bizivirîne Çepê"
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:764 src/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
+#: src/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "Bizivirîne Rastê"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:779 src/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr ""
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:781
 msgid "Crop"
 msgstr "Bibire"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "Vebijêrk"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr ""
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr ""
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr ""
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "Biriqandin:"
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "Kontrast:"
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "çawanî:"
 
@@ -296,7 +298,7 @@ msgstr "çawanî:"
 msgid "Document Scanner"
 msgstr ""
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr ""
 
@@ -308,7 +310,7 @@ msgstr ""
 msgid "scanner"
 msgstr "Skener"
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 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 "
@@ -316,196 +318,196 @@ msgid ""
 "formats."
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 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 "îlan version bibînin"
 
 #. 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:389
 msgid "Failed to scan"
 msgstr ""
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:630
 #, 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 "_Bigire"
 
 #. 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 "Cuda Tomar Bike..."
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:509 src/ui.vala:675
 msgid "_Cancel"
 msgstr "_Betal"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:510 src/ui.vala:676
 msgid "_Save"
 msgstr "_Tomar bike"
 
 #. 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 "Pelên Wêne"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:527
 msgid "All Files"
 msgstr "Hemû Pel"
 
 #. 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 "Formata pelan:"
 
 #. 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 "Ger hûn tomar nekin, wê guhertin heta hetayê wenda bibin."
 
 #. 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 "Guhertinan Jê Bibe"
 
 #. 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"
@@ -522,16 +524,16 @@ msgid ""
 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"
@@ -539,189 +541,189 @@ msgstr ""
 "  Rokar ✌ https://launchpad.net/~rokarali"
 
 #. 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 "Pelgeya nû"
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1840
 msgid "Document"
 msgstr "Belge"
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1844
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1845
 msgid "Print..."
 msgstr "Çapkirin..."
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1853
 msgid "Help"
 msgstr "Alîkarî"
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1854
 msgid "About"
 msgstr "Der barê"
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1855
 msgid "Quit"
 msgstr "Derkeve"
 
 #. 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 "Bixwe"
 
-#: ../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 "Kêmtir"
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:1959
 msgid "More"
 msgstr "Bêhtir"
 
-#: ../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:2182
+#: src/ui.vala:2182
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/ky.gmo b/po/ky.gmo
deleted file mode 100644
index fce5ae4..0000000
--- a/po/ky.gmo
+++ /dev/null
diff --git a/po/ky.po b/po/ky.po
index 7a7807f..f3ec6a9 100644
--- a/po/ky.po
+++ b/po/ky.po
@@ -7,288 +7,290 @@ 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: 2012-04-17 06:12+0000\n"
-"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
+"POT-Creation-Date: 2017-03-27 22:33+1300\n"
+"PO-Revision-Date: 2017-03-29 06:36+0000\n"
+"Last-Translator: Saltanat Osmonova <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-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:10+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr ""
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr ""
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr ""
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/simple-scan.ui:188
 msgid "Front and Back"
-msgstr ""
+msgstr "Алды жана Арты"
 
 #. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
+#: src/simple-scan.ui:192
 msgid "Front"
-msgstr ""
+msgstr "Алды"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/simple-scan.ui:196
 msgid "Back"
-msgstr ""
+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
+#: src/simple-scan.ui:225 src/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
+#: src/simple-scan.ui:241
 msgid "_Document"
 msgstr ""
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/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
+#: src/simple-scan.ui:273 src/simple-scan.ui:1306 src/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
+#: src/simple-scan.ui:283 src/simple-scan.ui:1315 src/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr ""
 
 #. Menu entry to stop current scan
-#: data/simple-scan.ui:294
+#: src/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr ""
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:310 src/simple-scan.ui:1330 src/simple-scan.ui:1380
 msgid "Text"
 msgstr ""
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:320 src/simple-scan.ui:1340 src/simple-scan.ui:1390
 msgid "Photo"
-msgstr ""
+msgstr "Фото"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/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
+#: src/simple-scan.ui:367
 msgid "_Email"
 msgstr ""
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:430
 msgid "_Page"
 msgstr ""
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:440
 msgid "Rotate _Left"
-msgstr ""
+msgstr "_Солго тегеретүү"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:450
 msgid "Rotate _Right"
-msgstr ""
+msgstr "_Оңго тегеретүү"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:460
 msgid "_Crop"
 msgstr ""
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:470
 msgid "_None"
 msgstr ""
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:481
 msgid "A_4"
-msgstr ""
+msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:492
 msgid "A_5"
-msgstr ""
+msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:503
 msgid "A_6"
-msgstr ""
+msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:514
 msgid "_Letter"
 msgstr ""
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:525
 msgid "Le_gal"
 msgstr ""
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:536
 msgid "4×6"
 msgstr ""
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:547
 msgid "_Custom"
 msgstr ""
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr ""
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/simple-scan.ui:578
 msgid "Move Left"
-msgstr ""
+msgstr "Солго жылуу"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/simple-scan.ui:587
 msgid "Move Right"
-msgstr ""
+msgstr "Оңго жылуу"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:624
 msgid "_Help"
 msgstr ""
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:632
 msgid "_Contents"
 msgstr ""
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:674 src/simple-scan.ui:885
 msgid "Start a new document"
 msgstr ""
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:675
 msgid "New"
-msgstr ""
+msgstr "Жаңы"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:689 src/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
+#: src/simple-scan.ui:691 src/simple-scan.ui:837
 msgid "Scan"
 msgstr ""
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:707 src/simple-scan.ui:864
 msgid "Save document to a file"
-msgstr ""
+msgstr "Документти файлга сактоо"
 
-#: ../src/ui.vala:1842
+#: src/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
-msgstr ""
+msgstr "Сактоо"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/simple-scan.ui:724 src/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr ""
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:725 src/simple-scan.ui:825
 msgid "Stop"
 msgstr ""
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:749 src/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
+#: src/simple-scan.ui:750
 msgid "Rotate Left"
-msgstr ""
+msgstr "Солго тегеретүү"
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:764 src/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
+#: src/simple-scan.ui:765
 msgid "Rotate Right"
-msgstr ""
+msgstr "Оңго тегеретүү"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:779 src/simple-scan.ui:963
 msgid "Crop the selected page"
-msgstr ""
+msgstr "Тандалган баракты кесүү"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:781
 msgid "Crop"
-msgstr ""
+msgstr "Кесүү"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr ""
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr ""
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr ""
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1169
 msgid "Page Size:"
-msgstr ""
+msgstr "Барактын чоңдугу"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1260
 msgid "Quality:"
 msgstr ""
 
@@ -296,7 +298,7 @@ msgstr ""
 msgid "Document Scanner"
 msgstr ""
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr ""
 
@@ -308,7 +310,7 @@ msgstr ""
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 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 "
@@ -316,196 +318,196 @@ msgid ""
 "formats."
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 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:389
 msgid "Failed to scan"
 msgstr ""
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:630
 #, 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"
@@ -522,205 +524,205 @@ msgid ""
 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:2182
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/lt.gmo b/po/lt.gmo
deleted file mode 100644
index 16cba25..0000000
--- a/po/lt.gmo
+++ /dev/null
diff --git a/po/lt.po b/po/lt.po
index 5c49619..f9ba353 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -7,288 +7,290 @@ 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"
+"POT-Creation-Date: 2017-03-27 22:33+1300\n"
 "PO-Revision-Date: 2016-11-05 18:11+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-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:10+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "Į_galioti"
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "Ištekliaus na_udotojo vardas:"
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr "Sla_ptažodis:"
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/simple-scan.ui:188
 msgid "Front and Back"
 msgstr "Abi pusės"
 
 #. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr "Priekinė pusė"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/simple-scan.ui:196
 msgid "Back"
 msgstr "Galinė pusė"
 
 #. 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
+#: src/simple-scan.ui:225 src/simple-scan.ui:809 data/simple-scan.desktop.in:3
+#: data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr "Paprastas skenavimas"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
+#: src/simple-scan.ui:241
 msgid "_Document"
 msgstr "_Dokumentas"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/simple-scan.ui:260
 msgid "Sc_an"
 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:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/simple-scan.ui:273 src/simple-scan.ui:1306 src/simple-scan.ui:1356
 msgid "Single _Page"
 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:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/simple-scan.ui:283 src/simple-scan.ui:1315 src/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr "Visus puslapius iš _padaviklio"
 
 #. Menu entry to stop current scan
-#: data/simple-scan.ui:294
+#: src/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "_Stabdyti skenavimą"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:310 src/simple-scan.ui:1330 src/simple-scan.ui:1380
 msgid "Text"
 msgstr "Tekstas"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:320 src/simple-scan.ui:1340 src/simple-scan.ui:1390
 msgid "Photo"
 msgstr "Nuotrauka"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr "Pakeisti puslapių tvarką"
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/simple-scan.ui:367
 msgid "_Email"
 msgstr "_Siųsti el. paštu"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:430
 msgid "_Page"
 msgstr "_Puslapis"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "Pasukti _kairėn"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "Pasukti _dešinėn"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:460
 msgid "_Crop"
 msgstr "_Apkirpti"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:470
 msgid "_None"
 msgstr "_Nėra"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:514
 msgid "_Letter"
 msgstr "_Laiškas"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "Tei_sinis"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:536
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:547
 msgid "_Custom"
 msgstr "_Pasirinktinis"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr "_Pasukti apkirpimą"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/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:587
+#: src/simple-scan.ui:587
 msgid "Move Right"
 msgstr "Perkelti dešinėn"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:624
 msgid "_Help"
 msgstr "_Žinynas"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:632
 msgid "_Contents"
 msgstr "_Turinys"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:674 src/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "Pradėti naują dokumentą"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:675
 msgid "New"
 msgstr "Naujas"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:689 src/simple-scan.ui:836
 msgid "Scan a single page from the scanner"
 msgstr "Skenuoti vieną puslapį iš skenerio."
 
 #. Label on scan toolbar item
-#: data/simple-scan.ui:691 data/simple-scan.ui:837
+#: src/simple-scan.ui:691 src/simple-scan.ui:837
 msgid "Scan"
 msgstr "Skenuoti"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:707 src/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "Įrašyti dokumentą į failą"
 
-#: ../src/ui.vala:1842
+#: src/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "Įrašyti"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/simple-scan.ui:724 src/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "Stabdyti esamą skenavimą"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:725 src/simple-scan.ui:825
 msgid "Stop"
 msgstr "Stabdyti"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:749 src/simple-scan.ui:936
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Pasukti puslapį kairėn (prieš laikrodžio rodyklę)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: data/simple-scan.ui:750
+#: src/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "Pasukti kairėn"
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:764 src/simple-scan.ui:914
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Pasukti puslapį dešinėn (pagal laikrodžio rodyklę)"
 
 #. Label on rotate page right (clockwise) item
-#: data/simple-scan.ui:765
+#: src/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "Pasukti dešinėn"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:779 src/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "Apkirpti pažymėtą puslapį"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:781
 msgid "Crop"
 msgstr "Apkirpti"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "Nuostatos"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "Skenavimo š_altinis:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "_Teksto raiška:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "_Nuotraukos raiška:"
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "Skenuojama pusė:"
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "Puslapio dydis:"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "Skaistis:"
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "Kontrastas:"
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "Kokybė:"
 
@@ -296,7 +298,7 @@ msgstr "Kokybė:"
 msgid "Document Scanner"
 msgstr "Dokumentų skeneris"
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr "Skenuoti dokumentus"
 
@@ -308,7 +310,7 @@ msgstr "skenuoti;nuskaityti;adf;skaitytuvas;skeneris;plokštuminis;"
 msgid "scanner"
 msgstr "skeneris"
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 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 "
@@ -320,7 +322,7 @@ msgstr ""
 "atvaizduojama. Galite spausdinti savo skenavimus, eksportuoti juos į pdf, ar "
 "įrašyti juos daugeliu paveikslų formatų."
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
@@ -328,192 +330,192 @@ msgstr ""
 "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 "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 "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 "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 "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 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 sukurtus su senesnėmis „Paprasto skenavimo“ versijomis"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:391
+#: src/simple-scan.vala:389
 msgid "Failed to scan"
 msgstr "Skenavimas nepavyko"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[ĮRENGINYS...] - Skenavimo paslaugų programa"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:630
 #, 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 "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 "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 "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 "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 "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 "Į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 "Nuskenuotas dokumentas.pdf"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:521
 msgid "Image Files"
 msgstr "Paveikslų failai"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:527
 msgid "All Files"
 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 "PDF (kelių puslapių dokumentas)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (suglaudintas)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:548
 msgid "PNG (lossless)"
 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 "Failo formatas:"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/ui.vala:650
 msgid "Failed to save file"
 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 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 "Į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 į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 "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 "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 "Suskirstyti puses (atvirkščiai)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1226
 msgid "Reverse"
 msgstr "Atvirkščiai"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1236
 msgid "Keep unchanged"
 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 "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"
@@ -543,16 +545,16 @@ msgstr ""
 "š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 "Apie Paprastą skenavimą"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "Paprastas dokumentų skenavimo įrankis"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -561,27 +563,27 @@ msgstr ""
 "  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"
+"  Rytis Usalis 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 "Į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 "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 "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>."
@@ -590,12 +592,12 @@ msgstr ""
 "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 "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>."
@@ -604,17 +606,17 @@ msgstr ""
 "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 "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 "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>."
@@ -623,138 +625,138 @@ msgstr ""
 "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 "Į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 "Į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 "Įdiegiamos tvarkyklės..."
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1653
 msgid "Drivers installed successfully!"
 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 "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 "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 "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 "%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 "%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 "%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 "%d tašk./col."
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1835
 msgid "New Document"
 msgstr "Naujas dokumentas"
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1840
 msgid "Document"
 msgstr "Dokumentas"
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1844
 msgid "Email..."
 msgstr "El. paštas..."
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1845
 msgid "Print..."
 msgstr "Spausdinti..."
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1853
 msgid "Help"
 msgstr "Žinynas"
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1854
 msgid "About"
 msgstr "Apie"
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1855
 msgid "Quit"
 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 "Keisti _skenerį"
 
 #. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1891
 msgid "_Install Drivers"
 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 "Žemiausia"
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:1969
 msgid "Maximum"
 msgstr "Aukščiausia"
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2008
 msgid "Saving document..."
 msgstr "Įrašomas dokumentas..."
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2182
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Įrašomas puslapis %d iš %d"
diff --git a/po/lv.gmo b/po/lv.gmo
deleted file mode 100644
index 109c570..0000000
--- a/po/lv.gmo
+++ /dev/null
diff --git a/po/lv.po b/po/lv.po
index 3ddfb24..1c95a89 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -7,288 +7,290 @@ 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: 2012-10-07 21:28+0000\n"
-"Last-Translator: Rūdolfs Mazurs <Unknown>\n"
+"POT-Creation-Date: 2017-03-27 22:33+1300\n"
+"PO-Revision-Date: 2017-03-29 06:41+0000\n"
+"Last-Translator: Pēteris Krišjānis <pecisk@gmail.com>\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-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:10+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_Autorizēties"
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "Res_ursa lietotājvārds:"
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Parole:"
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/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:192
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr "Priekšpuse"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/simple-scan.ui:196
 msgid "Back"
 msgstr "Aizmugure"
 
 #. 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
+#: src/simple-scan.ui:225 src/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:241
+#: src/simple-scan.ui:241
 msgid "_Document"
 msgstr "_Dokuments"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/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:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/simple-scan.ui:273 src/simple-scan.ui:1306 src/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:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/simple-scan.ui:283 src/simple-scan.ui:1315 src/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr "Visas lapas no _padeves"
 
 #. Menu entry to stop current scan
-#: data/simple-scan.ui:294
+#: src/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "Apturēt _skenēšanu"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:310 src/simple-scan.ui:1330 src/simple-scan.ui:1380
 msgid "Text"
 msgstr "Teksts"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:320 src/simple-scan.ui:1340 src/simple-scan.ui:1390
 msgid "Photo"
 msgstr "Foto"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/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
+#: src/simple-scan.ui:367
 msgid "_Email"
 msgstr "_E-pasts"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:430
 msgid "_Page"
 msgstr "La_pa"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "Pagriezt pa _kreisi"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "Pag_riezt pa labi"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:460
 msgid "_Crop"
 msgstr "Ap_cirst"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:470
 msgid "_None"
 msgstr "_Bez"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:514
 msgid "_Letter"
-msgstr "_Letter"
+msgstr "_Vēstules forma"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:525
 msgid "Le_gal"
-msgstr "Le_gal"
+msgstr "Le_gāls"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:536
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:547
 msgid "_Custom"
 msgstr "_Pielāgots"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/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:578
+#: src/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:587
+#: src/simple-scan.ui:587
 msgid "Move Right"
 msgstr "Pārvietot pa labi"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:624
 msgid "_Help"
 msgstr "_Palīdzība"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:632
 msgid "_Contents"
 msgstr "_Saturs"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:674 src/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "Sākt jaunu dokumentu"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:675
 msgid "New"
 msgstr "Jauns"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:689 src/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:691 data/simple-scan.ui:837
+#: src/simple-scan.ui:691 src/simple-scan.ui:837
 msgid "Scan"
 msgstr "Skenēt"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:707 src/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "Saglabāt dokumentu datnē"
 
-#: ../src/ui.vala:1842
+#: src/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "Saglabāt"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/simple-scan.ui:724 src/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "Apturēt pašreizējo skenēšanu"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:725 src/simple-scan.ui:825
 msgid "Stop"
 msgstr "Apturēt"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:749 src/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:750
+#: src/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "Pagriezt pa kreisi"
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:764 src/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:765
+#: src/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "Pagriezt pa labi"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:779 src/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "Apcirst izvēlēto lapu"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:781
 msgid "Crop"
 msgstr "Apcirst"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "Iestatījumi"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "Skenēšanas av_ots:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "_Teksta izšķirtspēja:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "Fotogrāfijas izšķirts_pēja:"
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "Skenējamā puse:"
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "Lapas izmērs:"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "Gaišums:"
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "Kontrasts:"
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "Kvalitāte:"
 
@@ -296,7 +298,7 @@ msgstr "Kvalitāte:"
 msgid "Document Scanner"
 msgstr ""
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr "Skenēt dokumentus"
 
@@ -308,7 +310,7 @@ msgstr ""
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 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 "
@@ -316,198 +318,198 @@ msgid ""
 "formats."
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 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:389
 msgid "Failed to scan"
 msgstr "Neizdevās skenēt"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 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:630
 #, 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"
@@ -533,16 +535,16 @@ msgstr ""
 "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"
@@ -552,189 +554,189 @@ msgstr ""
 "  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:2182
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Saglabā lapu %d no %d"
diff --git a/po/meson.build b/po/meson.build
new file mode 100644
index 0000000..d41bf17
--- /dev/null
+++ b/po/meson.build
@@ -0,0 +1,8 @@
+i18n.gettext ('simple-scan',
+              args: [ '--default-domain="' + meson.project_name (),
+                      '--from-code=UTF-8',
+                      '--add-comments',
+                      '--keyword=_',
+                      '--keyword=N_' ] )
+
+podir = meson.current_source_dir ()
diff --git a/po/mhr.gmo b/po/mhr.gmo
deleted file mode 100644
index 8b09f4c..0000000
--- a/po/mhr.gmo
+++ /dev/null
diff --git a/po/mhr.po b/po/mhr.po
index d54be43..e59b598 100644
--- a/po/mhr.po
+++ b/po/mhr.po
@@ -7,288 +7,290 @@ 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"
+"POT-Creation-Date: 2017-03-27 22:33+1300\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-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:11+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr ""
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr ""
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Шолыпмут:"
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/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
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr "Шрифт"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/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
+#: src/simple-scan.ui:225 src/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:241
+#: src/simple-scan.ui:241
 msgid "_Document"
 msgstr "_Документ"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/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
+#: src/simple-scan.ui:273 src/simple-scan.ui:1306 src/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
+#: src/simple-scan.ui:283 src/simple-scan.ui:1315 src/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr ""
 
 #. Menu entry to stop current scan
-#: data/simple-scan.ui:294
+#: src/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr ""
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:310 src/simple-scan.ui:1330 src/simple-scan.ui:1380
 msgid "Text"
 msgstr "Текст"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:320 src/simple-scan.ui:1340 src/simple-scan.ui:1390
 msgid "Photo"
 msgstr "Фотосӱрет"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/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
+#: src/simple-scan.ui:367
 msgid "_Email"
 msgstr ""
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:430
 msgid "_Page"
 msgstr "_Лаштык"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr ""
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr ""
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:460
 msgid "_Crop"
 msgstr "_Лектыш"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:470
 msgid "_None"
 msgstr "_Иктат"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:514
 msgid "_Letter"
 msgstr "_Серыш"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "US Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:536
 msgid "4×6"
 msgstr ""
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:547
 msgid "_Custom"
 msgstr "_Йӱла"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr ""
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/simple-scan.ui:578
 msgid "Move Left"
 msgstr "Шола"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/simple-scan.ui:587
 msgid "Move Right"
 msgstr "Пурла"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:624
 msgid "_Help"
 msgstr "_Полышык"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:632
 msgid "_Contents"
 msgstr "_Содержаний"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:674 src/simple-scan.ui:885
 msgid "Start a new document"
 msgstr ""
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:675
 msgid "New"
 msgstr "У"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:689 src/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
+#: src/simple-scan.ui:691 src/simple-scan.ui:837
 msgid "Scan"
 msgstr ""
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:707 src/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr ""
 
-#: ../src/ui.vala:1842
+#: src/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
+#: src/simple-scan.ui:724 src/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr ""
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:725 src/simple-scan.ui:825
 msgid "Stop"
 msgstr "Шогалташ"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:749 src/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
+#: src/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr ""
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:764 src/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
+#: src/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr ""
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:779 src/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr ""
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:781
 msgid "Crop"
 msgstr "Лектыш"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "Келыштарымаш-влак"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr ""
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr ""
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "Лаштыкын кугыт"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "Ыштыш-кучыш:"
 
@@ -296,7 +298,7 @@ msgstr "Ыштыш-кучыш:"
 msgid "Document Scanner"
 msgstr ""
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr ""
 
@@ -308,7 +310,7 @@ msgstr ""
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 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 "
@@ -316,196 +318,196 @@ msgid ""
 "formats."
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 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:389
 msgid "Failed to scan"
 msgstr ""
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:630
 #, 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"
@@ -522,16 +524,16 @@ msgid ""
 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"
@@ -539,189 +541,189 @@ msgstr ""
 "  Снежана 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:2182
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/ms.gmo b/po/ms.gmo
deleted file mode 100644
index 3738c88..0000000
--- a/po/ms.gmo
+++ /dev/null
diff --git a/po/ms.po b/po/ms.po
index f815b05..83369ec 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -7,288 +7,290 @@ 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"
+"POT-Creation-Date: 2017-03-27 22:33+1300\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-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:10+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_Benarkan"
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "_Nama pengguna untuk sumber:"
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Kata Laluan:"
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/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:192
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr "Hadapan"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/simple-scan.ui:196
 msgid "Back"
 msgstr "Ke belakang"
 
 #. 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
+#: src/simple-scan.ui:225 src/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:241
+#: src/simple-scan.ui:241
 msgid "_Document"
 msgstr "_Dokumen"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/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:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/simple-scan.ui:273 src/simple-scan.ui:1306 src/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:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/simple-scan.ui:283 src/simple-scan.ui:1315 src/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr "Semua Halaman Dari _Suapan"
 
 #. Menu entry to stop current scan
-#: data/simple-scan.ui:294
+#: src/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "_Henti Imbas"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:310 src/simple-scan.ui:1330 src/simple-scan.ui:1380
 msgid "Text"
 msgstr "Teks"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:320 src/simple-scan.ui:1340 src/simple-scan.ui:1390
 msgid "Photo"
 msgstr "Foto"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/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:367
+#: src/simple-scan.ui:367
 msgid "_Email"
 msgstr "_Emel"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:430
 msgid "_Page"
 msgstr "_Halaman"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "Putar Ke Ki_ri"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "Putar Ke Ka_nan"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:460
 msgid "_Crop"
 msgstr "_Crop"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:470
 msgid "_None"
 msgstr "_Tiada"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:514
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:536
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:547
 msgid "_Custom"
 msgstr "_Tersendiri"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr "_Putar & Kerat"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/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:587
+#: src/simple-scan.ui:587
 msgid "Move Right"
 msgstr "ALih Ke Kanan"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:624
 msgid "_Help"
 msgstr "_Bantuan"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:632
 msgid "_Contents"
 msgstr "_Kandungan"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:674 src/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "Mulakan dokumen baru"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:675
 msgid "New"
 msgstr "Baru"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:689 src/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:691 data/simple-scan.ui:837
+#: src/simple-scan.ui:691 src/simple-scan.ui:837
 msgid "Scan"
 msgstr "Imbas"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:707 src/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "Simpan dokumen ke fail"
 
-#: ../src/ui.vala:1842
+#: src/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "Simpan"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/simple-scan.ui:724 src/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "Hentikan Imbasan semasa"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:725 src/simple-scan.ui:825
 msgid "Stop"
 msgstr "Henti"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:749 src/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:750
+#: src/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "Putar Ke Kiri"
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:764 src/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:765
+#: src/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "Putar Ke Kanan"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:779 src/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "Kerat halaman pilihan"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:781
 msgid "Crop"
 msgstr "Kerat"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "Keutamaan"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "Imbas Su_mber:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "Resolusi _Teks:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "Resolusi _Foto:"
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "Imbas Sisi:"
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "Saiz Halaman:"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "Kecerahan:"
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "Beza Jelas:"
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "Kualiti:"
 
@@ -296,7 +298,7 @@ msgstr "Kualiti:"
 msgid "Document Scanner"
 msgstr "Pengimbas dokumen"
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr "Imbas Dokumen"
 
@@ -308,7 +310,7 @@ msgstr "imbs;pengimbas;rata;adf;"
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 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 "
@@ -320,7 +322,7 @@ msgstr ""
 "kedudukan yang salah. Anda boleh cetak imbasan anda, eksport ia ke pdf, atau "
 "simpan ia dengan sejumlah besar format imej."
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
@@ -328,192 +330,192 @@ msgstr ""
 "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:389
 msgid "Failed to scan"
 msgstr "Gagal mengimbas"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 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:630
 #, 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"
@@ -542,16 +544,16 @@ msgstr ""
 "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"
@@ -563,22 +565,22 @@ msgstr ""
 "  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>."
@@ -587,12 +589,12 @@ msgstr ""
 "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>."
@@ -601,17 +603,17 @@ msgstr ""
 "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>."
@@ -620,138 +622,138 @@ msgstr ""
 "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:2182
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Menyimpan halaman %d daripada %d"
diff --git a/po/my.gmo b/po/my.gmo
deleted file mode 100644
index 1b01392..0000000
--- a/po/my.gmo
+++ /dev/null
diff --git a/po/my.po b/po/my.po
index 97d2db1..a330a69 100644
--- a/po/my.po
+++ b/po/my.po
@@ -7,288 +7,290 @@ 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"
+"POT-Creation-Date: 2017-03-27 22:33+1300\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-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:10+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_A ခွင့်ပြုခြင်း"
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "_Username for resource:"
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Pစကားဝှက်"
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/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
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr "အရှေ့"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/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
+#: src/simple-scan.ui:225 src/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:241
+#: src/simple-scan.ui:241
 msgid "_Document"
 msgstr "_Dစာရွက်စာတမ်း"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/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:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/simple-scan.ui:273 src/simple-scan.ui:1306 src/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:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/simple-scan.ui:283 src/simple-scan.ui:1315 src/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr "_F Feeder မှ စာမျက်နှာအားလုံး"
 
 #. Menu entry to stop current scan
-#: data/simple-scan.ui:294
+#: src/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "_S Scan ရပ်မည်။"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:310 src/simple-scan.ui:1330 src/simple-scan.ui:1380
 msgid "Text"
 msgstr "စာ"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:320 src/simple-scan.ui:1340 src/simple-scan.ui:1390
 msgid "Photo"
 msgstr "ဓာတ်ပုံ"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/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
+#: src/simple-scan.ui:367
 msgid "_Email"
 msgstr "_Eအီးမေး"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:430
 msgid "_Page"
 msgstr "_Pစာမျက်နှာ"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "_L ဘယ်ဖက်လှည့်ပါ။"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "_R ညာဖက်သို့လှည့်မည်။"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:460
 msgid "_Crop"
 msgstr "_C ဖြတ်ပါ။"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:470
 msgid "_None"
 msgstr "_Nဘာမှမဟုတ်"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:514
 msgid "_Letter"
 msgstr "_L စာ"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:536
 msgid "4×6"
 msgstr ""
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:547
 msgid "_Custom"
 msgstr "_Custom"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr "_Rotate Crop"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/simple-scan.ui:578
 msgid "Move Left"
 msgstr "ဘယ်ဖက်သို့ရွှေ့ပါ။"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/simple-scan.ui:587
 msgid "Move Right"
 msgstr "ညာဖက်သို့ရွှေ့ပါ။"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:624
 msgid "_Help"
 msgstr "_H အကူအညီ"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:632
 msgid "_Contents"
 msgstr "_  C ခေါင်းစဉ်"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:674 src/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "အသစ်စတင်ရန်"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:675
 msgid "New"
 msgstr "အသစ်"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:689 src/simple-scan.ui:836
 msgid "Scan a single page from the scanner"
 msgstr "Scanner ထဲမှ စာမျက်နှာ တစ်ရွက်တည်းကို Scan ဖတ်မည်။"
 
 #. Label on scan toolbar item
-#: data/simple-scan.ui:691 data/simple-scan.ui:837
+#: src/simple-scan.ui:691 src/simple-scan.ui:837
 msgid "Scan"
 msgstr "Scan"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:707 src/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "ဖိုင် တစ်ခုထဲသို့ စာရွက်စာတမ်း ကိုသိမ်းပါ။"
 
-#: ../src/ui.vala:1842
+#: src/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
+#: src/simple-scan.ui:724 src/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "ယခု Scan ဖတ်နေခြင်းကိုရပ်မည်။"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:725 src/simple-scan.ui:825
 msgid "Stop"
 msgstr "ရပ်မည်"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:749 src/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
+#: src/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "ဘယ်ဖက် လှည့်ပါ။"
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:764 src/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
+#: src/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "ညာဖက်လှည့်ပါ။"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:779 src/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "ရွေးချယ်ထားသောစာမျက်နှာကို ဖြတ်ပါ။"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:781
 msgid "Crop"
 msgstr "ဖြတ်ပါ။"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "Preferences"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "Scan S_ource:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "_Text Resolution:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "_Pဓာတ်ပုံ resolution-"
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "Scan Side:"
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "စာရွက်အရွယ်အစား"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1260
 msgid "Quality:"
 msgstr ""
 
@@ -296,7 +298,7 @@ msgstr ""
 msgid "Document Scanner"
 msgstr ""
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr "Scan Documents"
 
@@ -308,7 +310,7 @@ msgstr ""
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 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 "
@@ -316,198 +318,198 @@ msgid ""
 "formats."
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 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:389
 msgid "Failed to scan"
 msgstr "Scan မဖတ်ဖြစ်ပါ။"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 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:630
 #, 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"
@@ -536,16 +538,16 @@ msgstr ""
 "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"
@@ -553,189 +555,189 @@ msgstr ""
 "  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:2182
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/nb.gmo b/po/nb.gmo
deleted file mode 100644
index cbca9da..0000000
--- a/po/nb.gmo
+++ /dev/null
diff --git a/po/nb.po b/po/nb.po
index b53d63a..34b851b 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -7,288 +7,290 @@ 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"
+"POT-Creation-Date: 2017-03-27 22:33+1300\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-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:10+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_Autoriser"
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "_Brukernavn for ressurs:"
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Passord:"
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/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:192
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr "Forside"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/simple-scan.ui:196
 msgid "Back"
 msgstr "Bakside"
 
 #. 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
+#: src/simple-scan.ui:225 src/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:241
+#: src/simple-scan.ui:241
 msgid "_Document"
 msgstr "_Dokument"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/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:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/simple-scan.ui:273 src/simple-scan.ui:1306 src/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:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/simple-scan.ui:283 src/simple-scan.ui:1315 src/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr "Alle sider fra papirmater"
 
 #. Menu entry to stop current scan
-#: data/simple-scan.ui:294
+#: src/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "_Stopp skanning"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:310 src/simple-scan.ui:1330 src/simple-scan.ui:1380
 msgid "Text"
 msgstr "Tekst"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:320 src/simple-scan.ui:1340 src/simple-scan.ui:1390
 msgid "Photo"
 msgstr "Bilde"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/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:367
+#: src/simple-scan.ui:367
 msgid "_Email"
 msgstr "_E-post"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:430
 msgid "_Page"
 msgstr "_Side"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "Roter mot _venstre"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "Roter mot _høyre"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:460
 msgid "_Crop"
 msgstr "_Beskjær"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:470
 msgid "_None"
 msgstr "_Ingen"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:514
 msgid "_Letter"
 msgstr "US _Letter"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "US Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:536
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:547
 msgid "_Custom"
 msgstr "E_gendefinert"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/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:578
+#: src/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:587
+#: src/simple-scan.ui:587
 msgid "Move Right"
 msgstr "Flytt til høyre"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:624
 msgid "_Help"
 msgstr "_Hjelp"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:632
 msgid "_Contents"
 msgstr "_Innhold"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:674 src/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "Begynn et nytt dokument"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:675
 msgid "New"
 msgstr "Ny"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:689 src/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:691 data/simple-scan.ui:837
+#: src/simple-scan.ui:691 src/simple-scan.ui:837
 msgid "Scan"
 msgstr "Skann"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:707 src/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "Lagre dokument til fil"
 
-#: ../src/ui.vala:1842
+#: src/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "Lagre"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/simple-scan.ui:724 src/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "Stopp skanning"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:725 src/simple-scan.ui:825
 msgid "Stop"
 msgstr "Stopp"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:749 src/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:750
+#: src/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "Roter mot venstre"
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:764 src/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:765
+#: src/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "Roter mot høyre"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:779 src/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "Beskjær valgt side"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:781
 msgid "Crop"
 msgstr "Beskjær"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "Innstillinger"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "Hent fra:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "_Tekstoppløsning"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "_Bildeoppløsning:"
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "Skann side:"
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "Sidestørrelse:"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "Lysstyrke:"
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "Kontrast:"
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "Kvalitet:"
 
@@ -296,7 +298,7 @@ msgstr "Kvalitet:"
 msgid "Document Scanner"
 msgstr "Dokumentskanner"
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr "Skann dokumenter"
 
@@ -308,7 +310,7 @@ msgstr "skan;skanner;plan;adf;"
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 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 "
@@ -319,199 +321,199 @@ 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/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 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:389
 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:619
 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:630
 #, 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"
@@ -540,44 +542,44 @@ msgstr ""
 "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"
+"  Allan Nordhøy https://launchpad.net/~comradekingu\n"
 "  Hans Rødtang https://launchpad.net/~hansrodtang\n"
 "  Kenneth Salvesen https://launchpad.net/~kesalves\n"
 "  Kjetil Birkeland Moe https://launchpad.net/~kjetilbmoe\n"
 "  Kåre Birger Lapstuen https://launchpad.net/~lapstue\n"
 "  Mats Taraldsvik https://launchpad.net/~meastp\n"
-"  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>."
@@ -586,12 +588,12 @@ msgstr ""
 "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>."
@@ -600,17 +602,17 @@ msgstr ""
 "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>."
@@ -619,138 +621,138 @@ msgstr ""
 "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:2182
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Lagrer side nr. %d av %d"
diff --git a/po/nl.gmo b/po/nl.gmo
deleted file mode 100644
index 708ad87..0000000
--- a/po/nl.gmo
+++ /dev/null
diff --git a/po/nl.po b/po/nl.po
index de9cde2..dd55784 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,288 +7,290 @@ 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"
+"POT-Creation-Date: 2017-03-27 22:33+1300\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-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:10+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "M_achtigen"
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "Gebr_uikersnaam voor bron:"
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Wachtwoord:"
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/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:192
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr "Voorzijde"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/simple-scan.ui:196
 msgid "Back"
 msgstr "Achterzijde"
 
 #. 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
+#: src/simple-scan.ui:225 src/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:241
+#: src/simple-scan.ui:241
 msgid "_Document"
 msgstr "_Document"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/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:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/simple-scan.ui:273 src/simple-scan.ui:1306 src/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:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/simple-scan.ui:283 src/simple-scan.ui:1315 src/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:294
+#: src/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "_Scannen staken"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:310 src/simple-scan.ui:1330 src/simple-scan.ui:1380
 msgid "Text"
 msgstr "Tekst"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:320 src/simple-scan.ui:1340 src/simple-scan.ui:1390
 msgid "Photo"
 msgstr "Foto"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/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:367
+#: src/simple-scan.ui:367
 msgid "_Email"
 msgstr "_E-mailen"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:430
 msgid "_Page"
 msgstr "_Pagina"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "_Linksom draaien"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "_Rechtsom draaien"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:460
 msgid "_Crop"
 msgstr "_Bijsnijden"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:470
 msgid "_None"
 msgstr "_Geen"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:514
 msgid "_Letter"
 msgstr "VS _Letter"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "VS Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:536
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:547
 msgid "_Custom"
 msgstr "_Aangepast"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/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:578
+#: src/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:587
+#: src/simple-scan.ui:587
 msgid "Move Right"
 msgstr "Naar rechts verplaatsen"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:624
 msgid "_Help"
 msgstr "_Hulp"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:632
 msgid "_Contents"
 msgstr "_Inhoud"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:674 src/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "Een nieuw document beginnen"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:675
 msgid "New"
 msgstr "Nieuw"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:689 src/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:691 data/simple-scan.ui:837
+#: src/simple-scan.ui:691 src/simple-scan.ui:837
 msgid "Scan"
 msgstr "Scannen"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:707 src/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "Document naar een bestand opslaan"
 
-#: ../src/ui.vala:1842
+#: src/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "Opslaan"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/simple-scan.ui:724 src/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "De huidige scan stoppen"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:725 src/simple-scan.ui:825
 msgid "Stop"
 msgstr "Stoppen"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:749 src/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:750
+#: src/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "Linksom draaien"
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:764 src/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:765
+#: src/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "Rechtsom draaien"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:779 src/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "De geselecteerde pagina bijsnijden"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:781
 msgid "Crop"
 msgstr "Bijsnijden"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "Voorkeuren"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "Scanner:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "_Tekstresolutie:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "_Fotoresolutie:"
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "Scangrootte:"
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "Paginagrootte:"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "Helderheid:"
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "Contrast:"
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "Kwaliteit:"
 
@@ -296,7 +298,7 @@ msgstr "Kwaliteit:"
 msgid "Document Scanner"
 msgstr "Documentenscanner"
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr "Documenten scannen"
 
@@ -308,7 +310,7 @@ msgstr "scan;scanner;flatbed;adf;"
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 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 "
@@ -320,7 +322,7 @@ msgstr ""
 "staat. U kunt uw scans afdrukken, exporteren naar pdf, of opslaan in een "
 "reeks afbeeldingsbestandsoorten."
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
@@ -328,196 +330,196 @@ msgstr ""
 "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:389
 msgid "Failed to scan"
 msgstr "Scannen is mislukt"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 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:630
 #, 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"
@@ -548,23 +550,23 @@ msgstr ""
 "<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"
+"  Dionysos https://launchpad.net/~dionysoz\n"
 "  Elco https://launchpad.net/~eajnab\n"
 "  Hannie Dumoleyn https://launchpad.net/~lafeber-dumoleyn\n"
 "  Jeroen Hoek https://launchpad.net/~mail-jeroenhoek\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"
@@ -582,22 +584,22 @@ msgstr ""
 "  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>."
@@ -606,12 +608,12 @@ msgstr ""
 "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>."
@@ -620,17 +622,17 @@ msgstr ""
 "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>."
@@ -639,138 +641,138 @@ msgstr ""
 "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:2182
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Bezig met opslaan van pagina %d van %d"
diff --git a/po/oc.gmo b/po/oc.gmo
deleted file mode 100644
index 5e5f01e..0000000
--- a/po/oc.gmo
+++ /dev/null
diff --git a/po/oc.po b/po/oc.po
index ab92be0..5fd6cd3 100644
--- a/po/oc.po
+++ b/po/oc.po
@@ -7,289 +7,291 @@ 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"
+"POT-Creation-Date: 2017-03-27 22:33+1300\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-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:11+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_Autorizar"
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "_Utilizaire :"
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr "Sen_hal :"
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/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
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr "Fàcia"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/simple-scan.ui:196
 msgid "Back"
 msgstr "Precedenta"
 
 #. 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
+#: src/simple-scan.ui:225 src/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:241
+#: src/simple-scan.ui:241
 msgid "_Document"
 msgstr "_Document"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/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:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/simple-scan.ui:273 src/simple-scan.ui:1306 src/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:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/simple-scan.ui:283 src/simple-scan.ui:1315 src/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:294
+#: src/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "_Arrestar la numerizacion"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:310 src/simple-scan.ui:1330 src/simple-scan.ui:1380
 msgid "Text"
 msgstr "Tèxte"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:320 src/simple-scan.ui:1340 src/simple-scan.ui:1390
 msgid "Photo"
 msgstr "Fòto"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
 msgid "Reorder Pages"
-msgstr ""
+msgstr "Reorganizar las paginas"
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/simple-scan.ui:367
 msgid "_Email"
 msgstr "_Corrièl"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:430
 msgid "_Page"
 msgstr "_Pagina"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/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:450
+#: src/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "Pivotar cap a _drecha"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:460
 msgid "_Crop"
 msgstr "Re_quadrar"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:470
 msgid "_None"
 msgstr "_Pas cap"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:514
 msgid "_Letter"
 msgstr "_Letter (US)"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "_Legal (US)"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:536
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:547
 msgid "_Custom"
 msgstr "_Personalizar"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/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:578
+#: src/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:587
+#: src/simple-scan.ui:587
 msgid "Move Right"
 msgstr "Se desplaçar cap a drecha"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:624
 msgid "_Help"
 msgstr "_Ajuda"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:632
 msgid "_Contents"
 msgstr "_Ensenhador"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:674 src/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "Crear un document novèl"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:675
 msgid "New"
 msgstr "Novèl"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:689 src/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:691 data/simple-scan.ui:837
+#: src/simple-scan.ui:691 src/simple-scan.ui:837
 msgid "Scan"
 msgstr "Numerizar"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:707 src/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "Enregistrar lo document dins un fichièr"
 
-#: ../src/ui.vala:1842
+#: src/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "Enregistrar"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/simple-scan.ui:724 src/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "Arrestar la numerizacion en cors"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:725 src/simple-scan.ui:825
 msgid "Stop"
 msgstr "Arrèsta"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:749 src/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:750
+#: src/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "Rotacion a esquèrra"
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:764 src/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:765
+#: src/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "Rotacion a drecha"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:779 src/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "Requadrar la pagina seleccionada"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:781
 msgid "Crop"
 msgstr "Requadrar"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "Preferéncias"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "F_ont de numerizacion :"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "Resolucion del _Tèxte :"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "Resolucion de la _fòto :"
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "Fàcia de numerizar :"
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "Talha de la pagina :"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "Luminositat :"
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "Contraste :"
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "Qualitat :"
 
@@ -297,7 +299,7 @@ msgstr "Qualitat :"
 msgid "Document Scanner"
 msgstr ""
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr "Numerizar de documents"
 
@@ -309,7 +311,7 @@ msgstr ""
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 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 "
@@ -317,199 +319,199 @@ msgid ""
 "formats."
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 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:389
 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:619
 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:630
 #, 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 ""
+msgstr "Logicial suplementari necessari"
 
 #. 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 "Vos cal installar lo logicial del pilòt de vòstre 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 "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 ""
+msgstr "Associar los 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 "Associar los costats (inversar)"
 
 #. 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 ""
+msgstr "Manténer incambiat"
 
 #. 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"
@@ -539,16 +541,16 @@ msgstr ""
 "<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"
@@ -556,189 +558,189 @@ msgstr ""
 "  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 ""
+msgstr "Installar los pilòts"
 
 #. 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 còp installats, vos caldrà reaviar Simple Scan."
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1645
 msgid "Installing drivers..."
-msgstr ""
+msgstr "Installacion dels pilòts..."
 
 #. 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:2182
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Enregistrament de la pagina %d sus %d"
diff --git a/po/pa.gmo b/po/pa.gmo
deleted file mode 100644
index 6c81c69..0000000
--- a/po/pa.gmo
+++ /dev/null
diff --git a/po/pa.po b/po/pa.po
index 0f5f67f..f9469aa 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -7,288 +7,290 @@ 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"
+"POT-Creation-Date: 2017-03-27 22:33+1300\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-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:11+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "ਪਰਮਾਣਿਤ(_A)"
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "ਸਰੋਤ ਲਈ ਯੂਜ਼ਰ-ਨਾਂ(_U):"
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr "ਪਾਸਵਰਡ(_P):"
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/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
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr "ਅੱਗੇ"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/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
+#: src/simple-scan.ui:225 src/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
+#: src/simple-scan.ui:241
 msgid "_Document"
 msgstr "ਡੌਕੂਮੈਂਟ(_D)"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/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
+#: src/simple-scan.ui:273 src/simple-scan.ui:1306 src/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
+#: src/simple-scan.ui:283 src/simple-scan.ui:1315 src/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr "ਫੀਡਰ ਤੋਂ ਸਭ ਸਫ਼ੇ(_F)"
 
 #. Menu entry to stop current scan
-#: data/simple-scan.ui:294
+#: src/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "ਸਕੈਨ ਨੂੰ ਰੋਕੋ(_S)"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:310 src/simple-scan.ui:1330 src/simple-scan.ui:1380
 msgid "Text"
 msgstr "ਟੈਕਸਟ"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:320 src/simple-scan.ui:1340 src/simple-scan.ui:1390
 msgid "Photo"
 msgstr "ਫੋਟੋ"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/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
+#: src/simple-scan.ui:367
 msgid "_Email"
 msgstr "ਈਮੇਲ(_E)"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:430
 msgid "_Page"
 msgstr "ਸਫ਼ਾ(_P)"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "ਖੱਬੇ ਘੁੰਮਾਓ(_L)"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "ਸੱਜੇ ਘੁੰਮਾਓ(_R)"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:460
 msgid "_Crop"
 msgstr "ਕਰੋਪ ਕਰੋ(_C)"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:470
 msgid "_None"
 msgstr "ਕੁਝ ਨਹੀਂ(_N)"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:514
 msgid "_Letter"
 msgstr "ਪੱਤਰ(_L)"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "ਲੀਗਲ(_g)"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:536
 msgid "4×6"
 msgstr ""
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:547
 msgid "_Custom"
 msgstr "ਕਸਟਮ(_C)"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr "ਕਰੋਪ ਨੂੰ ਘੁੰਮਾਓ(_R)"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/simple-scan.ui:578
 msgid "Move Left"
 msgstr ""
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/simple-scan.ui:587
 msgid "Move Right"
 msgstr ""
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:624
 msgid "_Help"
 msgstr "ਮੱਦਦ(_H)"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:632
 msgid "_Contents"
 msgstr "ਸਮੱਗਰੀ(_C)"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:674 src/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "ਨਵਾਂ ਡੌਕੂਮੈਂਟ ਸ਼ੁਰੂ ਕਰੋ"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:675
 msgid "New"
 msgstr "ਨਵਾਂ"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:689 src/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
+#: src/simple-scan.ui:691 src/simple-scan.ui:837
 msgid "Scan"
 msgstr "ਸਕੈਨ"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:707 src/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "ਡੌਕੂਮੈਂਟ ਫਾਇਲ ਵਿੱਚ ਸੰਭਾਲੋ"
 
-#: ../src/ui.vala:1842
+#: src/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
+#: src/simple-scan.ui:724 src/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "ਮੌਜੂਦਾ ਸਕੈਨ ਰੋਕੋ"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:725 src/simple-scan.ui:825
 msgid "Stop"
 msgstr "ਰੋਕੋ"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:749 src/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
+#: src/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "ਖੱਬੇ ਘੁੰਮਾਓ"
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:764 src/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
+#: src/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "ਸੱਜੇ ਘੁੰਮਾਓ"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:779 src/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "ਚੁਣੇ ਸਫ਼ੇ ਨੂੰ ਕਰੋਪ ਕਰੋ"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:781
 msgid "Crop"
 msgstr "ਕਰੋਪ ਕਰੋ"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "ਮੇਰੀ ਪਸੰਦ"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "ਸਕੈਨ ਸਰੋਤ(_o):"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "ਟੈਕਸਟ ਰੈਜ਼ੋਲੂਸ਼ਨ(_T):"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "ਫੋਟੋ ਰੈਜ਼ੋਲੂਸ਼ਨ(_P):"
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "ਸਕੈਨ ਸਾਈਡ"
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "ਸਫਾ ਆਕਾਰ:"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1260
 msgid "Quality:"
 msgstr ""
 
@@ -296,7 +298,7 @@ msgstr ""
 msgid "Document Scanner"
 msgstr ""
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr "ਸਕੈਨ ਕੀਤੇ ਡੌਕੂਮੈਂਟ"
 
@@ -308,7 +310,7 @@ msgstr ""
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 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 "
@@ -316,196 +318,196 @@ msgid ""
 "formats."
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 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:389
 msgid "Failed to scan"
 msgstr "ਸਕੈਨ ਕਰਨ ਲਈ ਫੇਲ੍ਹ"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:630
 #, 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"
@@ -522,205 +524,205 @@ msgid ""
 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:2182
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/pl.gmo b/po/pl.gmo
deleted file mode 100644
index a9ddad3..0000000
--- a/po/pl.gmo
+++ /dev/null
diff --git a/po/pl.po b/po/pl.po
index 1b09107..69adb90 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,288 +7,290 @@ 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"
+"POT-Creation-Date: 2017-03-27 22:33+1300\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-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:11+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "Upow_ażnij"
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "Nazwa _użytkownika dla zasobu:"
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Hasło:"
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/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:192
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr "Przód"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/simple-scan.ui:196
 msgid "Back"
 msgstr "Tył"
 
 #. 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
+#: src/simple-scan.ui:225 src/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:241
+#: src/simple-scan.ui:241
 msgid "_Document"
 msgstr "_Dokument"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/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:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/simple-scan.ui:273 src/simple-scan.ui:1306 src/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:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/simple-scan.ui:283 src/simple-scan.ui:1315 src/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr "_Wszystkie strony z podajnika"
 
 #. Menu entry to stop current scan
-#: data/simple-scan.ui:294
+#: src/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "Zatrzymaj _skanowanie"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:310 src/simple-scan.ui:1330 src/simple-scan.ui:1380
 msgid "Text"
 msgstr "Tekst"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:320 src/simple-scan.ui:1340 src/simple-scan.ui:1390
 msgid "Photo"
 msgstr "Zdjęcie"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/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:367
+#: src/simple-scan.ui:367
 msgid "_Email"
 msgstr "_E-mail"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:430
 msgid "_Page"
 msgstr "_Strona"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "Obróć w _lewo"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "Obróć w p_rawo"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:460
 msgid "_Crop"
 msgstr "_Kadruj"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:470
 msgid "_None"
 msgstr "_Brak"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:514
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:536
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:547
 msgid "_Custom"
 msgstr "_Niestandardowy"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr "Ob_róć obszar kadrowania"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/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:587
+#: src/simple-scan.ui:587
 msgid "Move Right"
 msgstr "Przesuń w prawo"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:624
 msgid "_Help"
 msgstr "Pomo_c"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:632
 msgid "_Contents"
 msgstr "_Spis treści"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:674 src/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "Tworzy nowy dokument"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:675
 msgid "New"
 msgstr "Nowy"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:689 src/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:691 data/simple-scan.ui:837
+#: src/simple-scan.ui:691 src/simple-scan.ui:837
 msgid "Scan"
 msgstr "Skanuj"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:707 src/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "Zapisuje dokument do pliku"
 
-#: ../src/ui.vala:1842
+#: src/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "Zapisz"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/simple-scan.ui:724 src/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "Zatrzymuje bieżące skanowanie"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:725 src/simple-scan.ui:825
 msgid "Stop"
 msgstr "Zatrzymaj"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:749 src/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:750
+#: src/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "Obróć w lewo"
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:764 src/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:765
+#: src/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "Obróć w prawo"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:779 src/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "Kadruje zaznaczoną stronę"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:781
 msgid "Crop"
 msgstr "Kadruj"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "Preferencje"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "Źródło skan_owania:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "_Rozdzielczość tekstu:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "Rozdzielczość z_djęcia:"
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "Skanowanie stron:"
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "Rozmiar strony:"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "Jasność:"
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "Kontrast:"
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "Jakość:"
 
@@ -296,7 +298,7 @@ msgstr "Jakość:"
 msgid "Document Scanner"
 msgstr "Skaner dokumentów"
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr "Skanowanie dokumentów"
 
@@ -308,7 +310,7 @@ msgstr "skan;skanowanie;skaner;scan;scanner;flatbed;adf;"
 msgid "scanner"
 msgstr "scanner"
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 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 "
@@ -319,7 +321,7 @@ msgstr ""
 "i obracanie zdjęć, drukowanie, eksportowanie do formatu PDF oraz zapisywanie "
 "w wielu formatach."
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
@@ -327,191 +329,191 @@ msgstr ""
 "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:389
 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:619
 msgid "[DEVICE...] - Scanning utility"
 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:630
 #, 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ń."
 
-#: ../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"
@@ -543,16 +545,16 @@ msgstr ""
 "— 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"
@@ -571,22 +573,22 @@ msgstr ""
 "  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>."
@@ -595,12 +597,12 @@ msgstr ""
 "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>."
@@ -609,17 +611,17 @@ msgstr ""
 "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>."
@@ -628,138 +630,138 @@ msgstr ""
 "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 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…"
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1653
 msgid "Drivers installed successfully!"
 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 "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 "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 "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:2182
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Zapisywanie strony %d z %d"
diff --git a/po/pt.gmo b/po/pt.gmo
deleted file mode 100644
index 47ee84d..0000000
--- a/po/pt.gmo
+++ /dev/null
diff --git a/po/pt.po b/po/pt.po
index 0ca5ddc..ec44699 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,288 +7,290 @@ 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"
+"POT-Creation-Date: 2017-03-27 22:33+1300\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-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:11+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_Autorizar"
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "Nome do _utilizador para o recurso:"
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Palavra-passe:"
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/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:192
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr "Frente"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/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
+#: src/simple-scan.ui:225 src/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:241
+#: src/simple-scan.ui:241
 msgid "_Document"
 msgstr "_Documento"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/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:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/simple-scan.ui:273 src/simple-scan.ui:1306 src/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:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/simple-scan.ui:283 src/simple-scan.ui:1315 src/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:294
+#: src/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "_Parar digitalização"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:310 src/simple-scan.ui:1330 src/simple-scan.ui:1380
 msgid "Text"
 msgstr "Texto"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:320 src/simple-scan.ui:1340 src/simple-scan.ui:1390
 msgid "Photo"
 msgstr "Foto"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/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:367
+#: src/simple-scan.ui:367
 msgid "_Email"
 msgstr "_Email"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:430
 msgid "_Page"
 msgstr "_Página"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "Rodar à _esquerda"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "Rodar à _direita"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:460
 msgid "_Crop"
 msgstr "_Cortar"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:470
 msgid "_None"
 msgstr "_Nenhum"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:514
 msgid "_Letter"
 msgstr "_Carta"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:536
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:547
 msgid "_Custom"
 msgstr "_Personalizar"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr "_Rodar recorte"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/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:587
+#: src/simple-scan.ui:587
 msgid "Move Right"
 msgstr "Mover para a direita"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:624
 msgid "_Help"
 msgstr "_Ajuda"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:632
 msgid "_Contents"
 msgstr "_Conteúdos"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:674 src/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "Iniciar um novo documento"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:675
 msgid "New"
 msgstr "Novo"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:689 src/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:691 data/simple-scan.ui:837
+#: src/simple-scan.ui:691 src/simple-scan.ui:837
 msgid "Scan"
 msgstr "Digitalizar"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:707 src/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "Guardar documento num ficheiro"
 
-#: ../src/ui.vala:1842
+#: src/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "Guardar"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/simple-scan.ui:724 src/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "Parar digitalização atual"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:725 src/simple-scan.ui:825
 msgid "Stop"
 msgstr "Parar"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:749 src/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:750
+#: src/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "Rodar à esquerda"
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:764 src/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:765
+#: src/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "Rodar à direita"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:779 src/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "Cortar a página selecionada"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:781
 msgid "Crop"
 msgstr "Recortar"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "Preferências"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "Origem da digitalizaçã_o:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "Resolução do _texto:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "_Resolução da foto:"
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "Lado da digitalização"
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "Tamanho da página:"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "Brilho:"
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "Contraste:"
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "Qualidade:"
 
@@ -296,7 +298,7 @@ msgstr "Qualidade:"
 msgid "Document Scanner"
 msgstr "Scanner de documentos"
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr "Digitalizar documentos"
 
@@ -308,7 +310,7 @@ msgstr "scan;scanner;flatbed;adf;"
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 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 "
@@ -319,7 +321,7 @@ msgstr ""
 "cortar e rodar. Pode imprimir as digitalizações, exportar para PDF, ou "
 "guardar em vários tipos de formatos de imagem."
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
@@ -327,194 +329,194 @@ msgstr ""
 "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:389
 msgid "Failed to scan"
 msgstr "Falhou ao digitalizar"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 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:630
 #, 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"
@@ -544,16 +546,16 @@ msgstr ""
 "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"
@@ -587,22 +589,22 @@ msgstr ""
 "  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>."
@@ -611,12 +613,12 @@ msgstr ""
 "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>."
@@ -625,17 +627,17 @@ msgstr ""
 "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>."
@@ -644,139 +646,139 @@ msgstr ""
 "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:2182
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "A guardar a página %d de %d"
diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo
deleted file mode 100644
index baf2f40..0000000
--- a/po/pt_BR.gmo
+++ /dev/null
diff --git a/po/pt_BR.po b/po/pt_BR.po
index b85e8c5..47f9f09 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,288 +7,290 @@ 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"
+"POT-Creation-Date: 2017-03-27 22:33+1300\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-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:11+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_Autorizar"
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "Nome de _usuário para o recurso:"
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Senha:"
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/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:192
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr "Frente"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/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
+#: src/simple-scan.ui:225 src/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:241
+#: src/simple-scan.ui:241
 msgid "_Document"
 msgstr "_Documento"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/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:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/simple-scan.ui:273 src/simple-scan.ui:1306 src/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:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/simple-scan.ui:283 src/simple-scan.ui:1315 src/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:294
+#: src/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "Par_ar digitalização"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:310 src/simple-scan.ui:1330 src/simple-scan.ui:1380
 msgid "Text"
 msgstr "Texto"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:320 src/simple-scan.ui:1340 src/simple-scan.ui:1390
 msgid "Photo"
 msgstr "Foto"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/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:367
+#: src/simple-scan.ui:367
 msgid "_Email"
 msgstr "_E-mail"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:430
 msgid "_Page"
 msgstr "_Página"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "Girar à _esquerda"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "Girar à di_reita"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:460
 msgid "_Crop"
 msgstr "Re_cortar"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:470
 msgid "_None"
 msgstr "_Nenhum"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:514
 msgid "_Letter"
 msgstr "_Carta"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "_Ofício"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:536
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:547
 msgid "_Custom"
 msgstr "_Personalizar"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/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:578
+#: src/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:587
+#: src/simple-scan.ui:587
 msgid "Move Right"
 msgstr "Mover para a direita"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:624
 msgid "_Help"
 msgstr "A_juda"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:632
 msgid "_Contents"
 msgstr "_Conteúdo"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:674 src/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "Iniciar um novo documento"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:675
 msgid "New"
 msgstr "Novo"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:689 src/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:691 data/simple-scan.ui:837
+#: src/simple-scan.ui:691 src/simple-scan.ui:837
 msgid "Scan"
 msgstr "Digitalizar"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:707 src/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "Salvar documento em arquivo"
 
-#: ../src/ui.vala:1842
+#: src/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "Salvar"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/simple-scan.ui:724 src/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "Parar a digitalização atual"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:725 src/simple-scan.ui:825
 msgid "Stop"
 msgstr "Parar"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:749 src/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:750
+#: src/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "Girar à esquerda"
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:764 src/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:765
+#: src/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "Girar à direita"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:779 src/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "Recortar a página selecionada"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:781
 msgid "Crop"
 msgstr "Recortar"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "Preferências"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "Origem da digitalizaçã_o:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "Resolução do _texto:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "Resolução da _foto:"
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "Lado a digitalizar:"
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "Tamanho da página:"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "Brilho:"
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "Contraste:"
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "Qualidade:"
 
@@ -296,7 +298,7 @@ msgstr "Qualidade:"
 msgid "Document Scanner"
 msgstr ""
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr "Digitalizar documentos"
 
@@ -308,7 +310,7 @@ msgstr ""
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 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 "
@@ -316,200 +318,200 @@ msgid ""
 "formats."
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 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:389
 msgid "Failed to scan"
 msgstr "Falha ao digitalizar"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 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:630
 #, 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"
@@ -539,16 +541,16 @@ msgstr ""
 "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"
@@ -577,189 +579,189 @@ msgstr ""
 "  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:2182
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Salvando página %d de %d"
diff --git a/po/quot.sed b/po/quot.sed
deleted file mode 100644
index 0122c46..0000000
--- a/po/quot.sed
+++ /dev/null
@@ -1,6 +0,0 @@
-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
deleted file mode 100644
index 2436c49..0000000
--- a/po/remove-potcdate.sin
+++ /dev/null
@@ -1,19 +0,0 @@
-# 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
deleted file mode 100644
index 3a42394..0000000
--- a/po/ro.gmo
+++ /dev/null
diff --git a/po/ro.po b/po/ro.po
index 196a414..9c546d9 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -7,289 +7,291 @@ 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: 2012-09-11 18:43+0000\n"
-"Last-Translator: Lucian Adrian Grijincu <lucian.grijincu@gmail.com>\n"
+"POT-Creation-Date: 2017-03-27 22:33+1300\n"
+"PO-Revision-Date: 2017-03-29 06:32+0000\n"
+"Last-Translator: Angelescu <titus0818@yahoo.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-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:11+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
 "Language: ro\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_Autorizează"
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "Numele de _utilizator pentru resursă:"
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Parolă:"
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/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:192
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr "Față"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/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
+#: src/simple-scan.ui:225 src/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:241
+#: src/simple-scan.ui:241
 msgid "_Document"
 msgstr "_Document"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/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:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/simple-scan.ui:273 src/simple-scan.ui:1306 src/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:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/simple-scan.ui:283 src/simple-scan.ui:1315 src/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:294
+#: src/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "Oprește _scanarea"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:310 src/simple-scan.ui:1330 src/simple-scan.ui:1380
 msgid "Text"
 msgstr "Text"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:320 src/simple-scan.ui:1340 src/simple-scan.ui:1390
 msgid "Photo"
 msgstr "Foto"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
 msgid "Reorder Pages"
-msgstr ""
+msgstr "Reordonare pagini"
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/simple-scan.ui:367
 msgid "_Email"
 msgstr "_Email"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:430
 msgid "_Page"
 msgstr "_Pagină"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/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:450
+#: src/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "Rotește la _dreapta"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:460
 msgid "_Crop"
 msgstr "De_cupează"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:470
 msgid "_None"
 msgstr "_Niciunul"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:514
 msgid "_Letter"
 msgstr "_Scrisoare"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:536
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:547
 msgid "_Custom"
 msgstr "_Personalizat"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/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:578
+#: src/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:587
+#: src/simple-scan.ui:587
 msgid "Move Right"
 msgstr "Mută la dreapta"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:624
 msgid "_Help"
 msgstr "_Ajutor"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:632
 msgid "_Contents"
 msgstr "_Cuprins"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:674 src/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "Începeți un document nou"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:675
 msgid "New"
 msgstr "Nou"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:689 src/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:691 data/simple-scan.ui:837
+#: src/simple-scan.ui:691 src/simple-scan.ui:837
 msgid "Scan"
 msgstr "Scanează"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:707 src/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "Salvează documentul ca fișier"
 
-#: ../src/ui.vala:1842
+#: src/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "Salvează"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/simple-scan.ui:724 src/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "Oprește scanarea curentă"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:725 src/simple-scan.ui:825
 msgid "Stop"
 msgstr "Oprește"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:749 src/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:750
+#: src/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "Rotește la stânga"
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:764 src/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:765
+#: src/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "Rotește la dreapta"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:779 src/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "Decupează pagina selectată"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:781
 msgid "Crop"
 msgstr "Decupează"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "Preferințe"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "S_ursă scanare:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "Rezoluție _text:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "Rezoluție _foto :"
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "Partea scanată:"
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "Dimensiunea paginii:"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "Luminozitate:"
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "Contrast:"
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "Calitate:"
 
@@ -297,7 +299,7 @@ msgstr "Calitate:"
 msgid "Document Scanner"
 msgstr ""
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr "Scanează documente"
 
@@ -309,7 +311,7 @@ msgstr ""
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 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 "
@@ -317,200 +319,200 @@ msgid ""
 "formats."
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 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:389
 msgid "Failed to scan"
 msgstr "Scanarea a eșuat"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 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:630
 #, 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 ""
+msgstr "Combină fețele"
 
 #. 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 "Combină fețeke (invers)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1226
 msgid "Reverse"
-msgstr ""
+msgstr "Invers"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1236
 msgid "Keep unchanged"
-msgstr ""
+msgstr "Păstrează nemodificat"
 
 #. 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"
@@ -542,16 +544,16 @@ msgstr ""
 "<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"
@@ -565,189 +567,189 @@ msgstr ""
 "  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 ""
+msgstr "Document nou"
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1840
 msgid "Document"
-msgstr ""
+msgstr "Document"
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1844
 msgid "Email..."
-msgstr ""
+msgstr "Email..."
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1845
 msgid "Print..."
-msgstr ""
+msgstr "Tipărire..."
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1853
 msgid "Help"
-msgstr ""
+msgstr "Ajutor"
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1854
 msgid "About"
-msgstr ""
+msgstr "Despre"
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1855
 msgid "Quit"
-msgstr ""
+msgstr "Închide"
 
 #. 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:2182
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Se salvează pagina %d din %d"
diff --git a/po/ru.gmo b/po/ru.gmo
deleted file mode 100644
index 2889b4c..0000000
--- a/po/ru.gmo
+++ /dev/null
diff --git a/po/ru.po b/po/ru.po
index 2752740..186e06c 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,288 +7,290 @@ 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"
+"POT-Creation-Date: 2017-03-27 22:33+1300\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-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:11+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "Р_азрешить"
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "Имя поль_зователя для ресурса:"
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Пароль:"
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/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
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr "Лицевая сторона"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/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
+#: src/simple-scan.ui:225 src/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
+#: src/simple-scan.ui:241
 msgid "_Document"
 msgstr "_Документ"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/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
+#: src/simple-scan.ui:273 src/simple-scan.ui:1306 src/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
+#: src/simple-scan.ui:283 src/simple-scan.ui:1315 src/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr "Все страницы из _автоподатчика"
 
 #. Menu entry to stop current scan
-#: data/simple-scan.ui:294
+#: src/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "_Остановить сканирование"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:310 src/simple-scan.ui:1330 src/simple-scan.ui:1380
 msgid "Text"
 msgstr "Текст"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:320 src/simple-scan.ui:1340 src/simple-scan.ui:1390
 msgid "Photo"
 msgstr "Фотография"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/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
+#: src/simple-scan.ui:367
 msgid "_Email"
 msgstr "Отправить _почтой"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:430
 msgid "_Page"
 msgstr "_Страница"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "Повернуть в_лево"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "Повернуть в_право"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:460
 msgid "_Crop"
 msgstr "_Обрезать"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:470
 msgid "_None"
 msgstr "_Нет"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:514
 msgid "_Letter"
 msgstr "US _Letter"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "US Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:536
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:547
 msgid "_Custom"
 msgstr "_Другое..."
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr "_Повернуть выбранное"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/simple-scan.ui:578
 msgid "Move Left"
 msgstr "Переместить влево"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/simple-scan.ui:587
 msgid "Move Right"
 msgstr "Переместить вправо"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:624
 msgid "_Help"
 msgstr "_Справка"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:632
 msgid "_Contents"
 msgstr "_Содержание"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:674 src/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "Создать новый документ"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:675
 msgid "New"
 msgstr "Создать"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:689 src/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
+#: src/simple-scan.ui:691 src/simple-scan.ui:837
 msgid "Scan"
 msgstr "Сканировать"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:707 src/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "Сохранить документ в файл"
 
-#: ../src/ui.vala:1842
+#: src/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
+#: src/simple-scan.ui:724 src/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "Прервать выполняемое сканирование"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:725 src/simple-scan.ui:825
 msgid "Stop"
 msgstr "Завершить"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:749 src/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
+#: src/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "Повернуть влево"
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:764 src/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
+#: src/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "Повернуть вправо"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:779 src/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "Обрезать выбранную страницу"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:781
 msgid "Crop"
 msgstr "Обрезать"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "Параметры"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "Ист_очник сканирования:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "Р_азрешение текста:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "_Разрешение фотографии:"
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "Сканируемая сторона:"
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "Размер листа:"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "Яркость:"
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "Контрастность:"
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "Качество:"
 
@@ -296,7 +298,7 @@ msgstr "Качество:"
 msgid "Document Scanner"
 msgstr "Сканер документов"
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr "Сканирование документов"
 
@@ -308,7 +310,7 @@ msgstr "сканировать;сканер;планшетный;автопод�
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 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 "
@@ -320,7 +322,7 @@ msgstr ""
 "неправильно. Вы можете распечатать сканированные материалы, экспортировать "
 "их в PDF или изображения ряда форматов."
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
@@ -328,190 +330,190 @@ 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:389
 msgid "Failed to scan"
 msgstr "Сканирование не удалось"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 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:630
 #, 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"
@@ -540,16 +542,16 @@ 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"
@@ -588,22 +590,22 @@ msgstr ""
 "  ☠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>."
@@ -612,12 +614,12 @@ msgstr ""
 "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>."
@@ -626,17 +628,17 @@ msgstr ""
 "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>."
@@ -645,138 +647,138 @@ msgstr ""
 "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:2182
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Сохранение страницы %d из %d"
diff --git a/po/sd.gmo b/po/sd.gmo
deleted file mode 100644
index 932f4b7..0000000
--- a/po/sd.gmo
+++ /dev/null
diff --git a/po/sd.po b/po/sd.po
index b3a80fc..53a9b4f 100644
--- a/po/sd.po
+++ b/po/sd.po
@@ -7,288 +7,290 @@ 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"
+"POT-Creation-Date: 2017-03-27 22:33+1300\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-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:11+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_اجازت ڏيو"
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr ""
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_ڳجھو لفظ:"
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/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
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr "اڳيون"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/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
+#: src/simple-scan.ui:225 src/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
+#: src/simple-scan.ui:241
 msgid "_Document"
 msgstr "_دستاويز"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/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
+#: src/simple-scan.ui:273 src/simple-scan.ui:1306 src/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
+#: src/simple-scan.ui:283 src/simple-scan.ui:1315 src/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr ""
 
 #. Menu entry to stop current scan
-#: data/simple-scan.ui:294
+#: src/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "اسڪين _روڪيو"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:310 src/simple-scan.ui:1330 src/simple-scan.ui:1380
 msgid "Text"
 msgstr "تحرير"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:320 src/simple-scan.ui:1340 src/simple-scan.ui:1390
 msgid "Photo"
 msgstr "فوٽو"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/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
+#: src/simple-scan.ui:367
 msgid "_Email"
 msgstr "_ايميل"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:430
 msgid "_Page"
 msgstr "_صفحو"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "_کاٻي ڦيرايو"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "_ساڄي ڦيرايو"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:460
 msgid "_Crop"
 msgstr "_ڪاٽيو"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:470
 msgid "_None"
 msgstr "_ڪوبه نه"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:514
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:536
 msgid "4×6"
 msgstr ""
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:547
 msgid "_Custom"
 msgstr "_مرضي مطابق"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr ""
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/simple-scan.ui:578
 msgid "Move Left"
 msgstr "کاٻي چوريو"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/simple-scan.ui:587
 msgid "Move Right"
 msgstr "ساڄي چوريو"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:624
 msgid "_Help"
 msgstr "_مدد"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:632
 msgid "_Contents"
 msgstr "_مواد"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:674 src/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "نئون دستاويز بنايو"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:675
 msgid "New"
 msgstr "نئون"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:689 src/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
+#: src/simple-scan.ui:691 src/simple-scan.ui:837
 msgid "Scan"
 msgstr "اسڪين"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:707 src/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "دستاويز کي فائل ۾ سانڍيو"
 
-#: ../src/ui.vala:1842
+#: src/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
+#: src/simple-scan.ui:724 src/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "هلندڙ اسڪين روڪيو"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:725 src/simple-scan.ui:825
 msgid "Stop"
 msgstr "روڪيو"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:749 src/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
+#: src/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "کاٻي ڦيرايو"
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:764 src/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
+#: src/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "ساڄي ڦيرايو"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:779 src/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "چونڊيل صفحي کي ڪاٽيو"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:781
 msgid "Crop"
 msgstr "ڪاٽيو"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "ترجيحون"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr ""
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "پاسو اسڪين ڪريو:"
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "صفحي جي ماپ:"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1260
 msgid "Quality:"
 msgstr ""
 
@@ -296,7 +298,7 @@ msgstr ""
 msgid "Document Scanner"
 msgstr ""
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr "دستاويزات اسڪين ڪريو"
 
@@ -308,7 +310,7 @@ msgstr ""
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 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 "
@@ -316,196 +318,196 @@ msgid ""
 "formats."
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 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:389
 msgid "Failed to scan"
 msgstr "اسڪين ڪرڻ ۾ ناڪامي"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:630
 #, 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"
@@ -522,205 +524,205 @@ msgid ""
 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:2182
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/se.gmo b/po/se.gmo
deleted file mode 100644
index ac21c90..0000000
--- a/po/se.gmo
+++ /dev/null
diff --git a/po/se.po b/po/se.po
index 3b02cc3..8c8e12c 100644
--- a/po/se.po
+++ b/po/se.po
@@ -7,288 +7,290 @@ 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"
+"POT-Creation-Date: 2017-03-27 22:33+1300\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-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:11+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr ""
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr ""
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Beassansátni:"
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/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
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr "Ovdabealli"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/simple-scan.ui:196
 msgid "Back"
 msgstr "Maŋos"
 
 #. 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
+#: src/simple-scan.ui:225 src/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:241
+#: src/simple-scan.ui:241
 msgid "_Document"
 msgstr "_Dokumeanta"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/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
+#: src/simple-scan.ui:273 src/simple-scan.ui:1306 src/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
+#: src/simple-scan.ui:283 src/simple-scan.ui:1315 src/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr ""
 
 #. Menu entry to stop current scan
-#: data/simple-scan.ui:294
+#: src/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr ""
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:310 src/simple-scan.ui:1330 src/simple-scan.ui:1380
 msgid "Text"
 msgstr "Teaksta"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:320 src/simple-scan.ui:1340 src/simple-scan.ui:1390
 msgid "Photo"
 msgstr "Fotografiija"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/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
+#: src/simple-scan.ui:367
 msgid "_Email"
 msgstr "_E-boasta"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:430
 msgid "_Page"
 msgstr ""
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr ""
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr ""
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:460
 msgid "_Crop"
 msgstr "_Čuohpa"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:470
 msgid "_None"
 msgstr ""
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:481
 msgid "A_4"
 msgstr ""
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:492
 msgid "A_5"
 msgstr ""
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:503
 msgid "A_6"
 msgstr ""
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:514
 msgid "_Letter"
 msgstr ""
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:525
 msgid "Le_gal"
 msgstr ""
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:536
 msgid "4×6"
 msgstr ""
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:547
 msgid "_Custom"
 msgstr ""
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr ""
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/simple-scan.ui:578
 msgid "Move Left"
 msgstr ""
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/simple-scan.ui:587
 msgid "Move Right"
 msgstr "Sirdde olgešguvlui"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:624
 msgid "_Help"
 msgstr "_Veahkki"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:632
 msgid "_Contents"
 msgstr ""
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:674 src/simple-scan.ui:885
 msgid "Start a new document"
 msgstr ""
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:675
 msgid "New"
 msgstr "Ođđa"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:689 src/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
+#: src/simple-scan.ui:691 src/simple-scan.ui:837
 msgid "Scan"
 msgstr "Oza"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:707 src/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr ""
 
-#: ../src/ui.vala:1842
+#: src/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "Vurke"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/simple-scan.ui:724 src/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr ""
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:725 src/simple-scan.ui:825
 msgid "Stop"
 msgstr "Bisset"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:749 src/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
+#: src/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr ""
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:764 src/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
+#: src/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "Jorat olgešguvlui"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:779 src/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr ""
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:781
 msgid "Crop"
 msgstr ""
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "Oidimat"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr ""
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr ""
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr ""
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1260
 msgid "Quality:"
 msgstr ""
 
@@ -296,7 +298,7 @@ msgstr ""
 msgid "Document Scanner"
 msgstr ""
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr ""
 
@@ -308,7 +310,7 @@ msgstr ""
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 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 "
@@ -316,196 +318,196 @@ msgid ""
 "formats."
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 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:389
 msgid "Failed to scan"
 msgstr ""
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:630
 #, 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"
@@ -522,205 +524,205 @@ msgid ""
 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:2182
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/shn.gmo b/po/shn.gmo
deleted file mode 100644
index c0ac957..0000000
--- a/po/shn.gmo
+++ /dev/null
diff --git a/po/shn.po b/po/shn.po
index 051c5a6..3988e60 100644
--- a/po/shn.po
+++ b/po/shn.po
@@ -7,288 +7,290 @@ 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"
+"POT-Creation-Date: 2017-03-27 22:33+1300\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-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:11+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_မၵ်းမၼ်ႈၶႂၢင်းပၼ်"
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr ""
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr ""
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/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
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr ""
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/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
+#: src/simple-scan.ui:225 src/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
+#: src/simple-scan.ui:241
 msgid "_Document"
 msgstr ""
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/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
+#: src/simple-scan.ui:273 src/simple-scan.ui:1306 src/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
+#: src/simple-scan.ui:283 src/simple-scan.ui:1315 src/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr ""
 
 #. Menu entry to stop current scan
-#: data/simple-scan.ui:294
+#: src/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr ""
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:310 src/simple-scan.ui:1330 src/simple-scan.ui:1380
 msgid "Text"
 msgstr "လိၵ်ႈ"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:320 src/simple-scan.ui:1340 src/simple-scan.ui:1390
 msgid "Photo"
 msgstr ""
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/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
+#: src/simple-scan.ui:367
 msgid "_Email"
 msgstr ""
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:430
 msgid "_Page"
 msgstr ""
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr ""
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr ""
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:460
 msgid "_Crop"
 msgstr ""
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:470
 msgid "_None"
 msgstr ""
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:481
 msgid "A_4"
 msgstr ""
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:492
 msgid "A_5"
 msgstr ""
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:503
 msgid "A_6"
 msgstr ""
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:514
 msgid "_Letter"
 msgstr ""
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:525
 msgid "Le_gal"
 msgstr ""
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:536
 msgid "4×6"
 msgstr ""
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:547
 msgid "_Custom"
 msgstr ""
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr ""
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/simple-scan.ui:578
 msgid "Move Left"
 msgstr ""
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/simple-scan.ui:587
 msgid "Move Right"
 msgstr ""
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:624
 msgid "_Help"
 msgstr ""
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:632
 msgid "_Contents"
 msgstr ""
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:674 src/simple-scan.ui:885
 msgid "Start a new document"
 msgstr ""
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:675
 msgid "New"
 msgstr ""
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:689 src/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
+#: src/simple-scan.ui:691 src/simple-scan.ui:837
 msgid "Scan"
 msgstr ""
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:707 src/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr ""
 
-#: ../src/ui.vala:1842
+#: src/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
+#: src/simple-scan.ui:724 src/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr ""
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:725 src/simple-scan.ui:825
 msgid "Stop"
 msgstr ""
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:749 src/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
+#: src/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr ""
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:764 src/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
+#: src/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr ""
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:779 src/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr ""
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:781
 msgid "Crop"
 msgstr ""
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr ""
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr ""
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr ""
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr ""
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1260
 msgid "Quality:"
 msgstr ""
 
@@ -296,7 +298,7 @@ msgstr ""
 msgid "Document Scanner"
 msgstr ""
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr ""
 
@@ -308,7 +310,7 @@ msgstr ""
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 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 "
@@ -316,196 +318,196 @@ msgid ""
 "formats."
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 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:389
 msgid "Failed to scan"
 msgstr ""
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:630
 #, 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"
@@ -522,205 +524,205 @@ msgid ""
 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:2182
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/simple-scan.pot b/po/simple-scan.pot
index a6f23dc..73f2934 100644
--- a/po/simple-scan.pot
+++ b/po/simple-scan.pot
@@ -1,14 +1,14 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Robert Ancell <robert.ancell@canonical.com>
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # 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"
+"Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-29 12:47+1200\n"
+"POT-Creation-Date: 2017-04-16 08:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,286 +18,298 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr ""
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr ""
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr ""
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/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
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr ""
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/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
+#: src/simple-scan.ui:231 src/simple-scan.ui:815 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
+#: src/simple-scan.ui:247
 msgid "_Document"
 msgstr ""
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/simple-scan.ui:266
 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
+#: src/simple-scan.ui:279 src/simple-scan.ui:1343 src/simple-scan.ui:1402
 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
+#: src/simple-scan.ui:289 src/simple-scan.ui:1352 src/simple-scan.ui:1411
 msgid "All Pages From _Feeder"
 msgstr ""
 
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/simple-scan.ui:299 src/simple-scan.ui:1361 src/simple-scan.ui:1420
+msgid "_Multiple Pages From Flatbed"
+msgstr ""
+
 #. Menu entry to stop current scan
-#: data/simple-scan.ui:294
+#: src/simple-scan.ui:310
 msgid "_Stop Scan"
 msgstr ""
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:326 src/simple-scan.ui:1376 src/simple-scan.ui:1435
 msgid "Text"
 msgstr ""
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:336 src/simple-scan.ui:1386 src/simple-scan.ui:1445
 msgid "Photo"
 msgstr ""
 
 #. Menu item to reorder pages
-#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
+#. Title of dialog to reorder pages
+#: src/simple-scan.ui:352 src/ui.vala:1247 src/ui.vala:1891
 msgid "Reorder Pages"
 msgstr ""
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/simple-scan.ui:371
 msgid "_Email"
 msgstr ""
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:436
 msgid "_Page"
 msgstr ""
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:446
 msgid "Rotate _Left"
 msgstr ""
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:456
 msgid "Rotate _Right"
 msgstr ""
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:466
 msgid "_Crop"
 msgstr ""
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:476
 msgid "_None"
 msgstr ""
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:487
 msgid "A_4"
 msgstr ""
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:498
 msgid "A_5"
 msgstr ""
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:509
 msgid "A_6"
 msgstr ""
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:520
 msgid "_Letter"
 msgstr ""
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:531
 msgid "Le_gal"
 msgstr ""
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:542
 msgid "4×6"
 msgstr ""
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:553
 msgid "_Custom"
 msgstr ""
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:571
 msgid "_Rotate Crop"
 msgstr ""
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/simple-scan.ui:584
 msgid "Move Left"
 msgstr ""
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/simple-scan.ui:593
 msgid "Move Right"
 msgstr ""
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:630
 msgid "_Help"
 msgstr ""
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:638
 msgid "_Contents"
 msgstr ""
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:680 src/simple-scan.ui:891
 msgid "Start a new document"
 msgstr ""
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:681
 msgid "New"
 msgstr ""
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:695 src/simple-scan.ui:842
 msgid "Scan a single page from the scanner"
 msgstr ""
 
 #. Label on scan toolbar item
-#: data/simple-scan.ui:691 data/simple-scan.ui:837
+#: src/simple-scan.ui:697 src/simple-scan.ui:843
 msgid "Scan"
 msgstr ""
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:713 src/simple-scan.ui:870
 msgid "Save document to a file"
 msgstr ""
 
-#: data/simple-scan.ui:709 src/ui.vala:1842
+#: src/simple-scan.ui:715 src/ui.vala:1892
 msgid "Save"
 msgstr ""
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/simple-scan.ui:730 src/simple-scan.ui:830
 msgid "Stop the current scan"
 msgstr ""
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:731 src/simple-scan.ui:831
 msgid "Stop"
 msgstr ""
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:755 src/simple-scan.ui:942
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr ""
 
 #. Label on rotate page left (anti-clockwise) item
-#: data/simple-scan.ui:750
+#: src/simple-scan.ui:756
 msgid "Rotate Left"
 msgstr ""
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:770 src/simple-scan.ui:920
 msgid "Rotate the page to the right (clockwise)"
 msgstr ""
 
 #. Label on rotate page right (clockwise) item
-#: data/simple-scan.ui:765
+#: src/simple-scan.ui:771
 msgid "Rotate Right"
 msgstr ""
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:785 src/simple-scan.ui:969
 msgid "Crop the selected page"
 msgstr ""
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:787
 msgid "Crop"
 msgstr ""
 
 #. Title of preferences dialog
-#: data/simple-scan.ui:997 src/ui.vala:1849
+#: src/simple-scan.ui:1003 src/ui.vala:1898
 msgid "Preferences"
 msgstr ""
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1054
 msgid "Scan S_ource:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1085
 msgid "_Text Resolution:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1101
 msgid "_Photo Resolution:"
 msgstr ""
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1145
 msgid "Scan Side:"
 msgstr ""
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1175
 msgid "Page Size:"
 msgstr ""
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1205
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1235
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1266
 msgid "Quality:"
 msgstr ""
 
+#. Label beside page delay scale
+#: src/simple-scan.ui:1297
+msgid "Delay between pages:"
+msgstr ""
+
 #: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr ""
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr ""
 
@@ -309,7 +321,7 @@ msgstr ""
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 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 "
@@ -317,30 +329,36 @@ msgid ""
 "formats."
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 msgid "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
-#: src/scanner.vala:841
+#. Error displayed when no scanners to scan with
+#: src/scanner.vala:844
 msgid "No scanners available.  Please connect a scanner."
 msgstr ""
 
-#: src/scanner.vala:871
+#. Error displayed when cannot connect to scanner
+#: src/scanner.vala:874
 msgid "Unable to connect to scanner"
 msgstr ""
 
-#: src/scanner.vala:1223
+#. Error display when unable to start scan
+#: src/scanner.vala:1227
 msgid "Unable to start scan"
 msgstr ""
 
-#: src/scanner.vala:1236 src/scanner.vala:1333
+#. Error displayed when communication with scanner broken
+#: src/scanner.vala:1240 src/scanner.vala:1340
 msgid "Error communicating with scanner"
 msgstr ""
 
+#. Help string for command line --version flag
 #: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr ""
 
+#. Help string for command line --debug flag
 #: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr ""
@@ -349,129 +367,168 @@ msgstr ""
 msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr ""
 
-#: src/simple-scan.vala:391
+#. Title of error dialog when scan failed
+#: src/simple-scan.vala:389
 msgid "Failed to scan"
 msgstr ""
 
-#: src/simple-scan.vala:621
+#. Arguments and description for --help text
+#: src/simple-scan.vala:619
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
-#: src/simple-scan.vala:632
+#. Text printed out when an unknown command-line argument provided
+#: src/simple-scan.vala:630
 #, 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:332 src/ui.vala:1655 src/ui.vala:1935
 msgid "_Close"
 msgstr ""
 
-#: src/ui.vala:327
+#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
+#: src/ui.vala:341
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr ""
 
-#: src/ui.vala:375
+#. Warning displayed when no scanners are detected
+#: src/ui.vala:389
 msgid "No scanners detected"
 msgstr ""
 
-#: src/ui.vala:377
+#. Hint to user on why there are no scanners detected
+#: src/ui.vala:391
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
-#: src/ui.vala:382
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: src/ui.vala:396
 msgid "Additional software needed"
 msgstr ""
 
-#: src/ui.vala:384
+#. Instructions to install driver software
+#: src/ui.vala:398
 msgid "You need to install driver software for your scanner."
 msgstr ""
 
-#: src/ui.vala:506 src/ui.vala:1843
+#. Save dialog: Dialog title
+#: src/ui.vala:510
 msgid "Save As..."
 msgstr ""
 
-#: src/ui.vala:509 src/ui.vala:675
+#: src/ui.vala:513 src/ui.vala:648 src/ui.vala:723
 msgid "_Cancel"
 msgstr ""
 
-#: src/ui.vala:510 src/ui.vala:676
+#: src/ui.vala:514 src/ui.vala:724
 msgid "_Save"
 msgstr ""
 
-#: src/ui.vala:516
+#. Default filename to use when saving document
+#: src/ui.vala:522
 msgid "Scanned Document.pdf"
 msgstr ""
 
-#: src/ui.vala:521
+#. Save dialog: Filter name to show only image files
+#: src/ui.vala:528
 msgid "Image Files"
 msgstr ""
 
-#: src/ui.vala:527
+#. Save dialog: Filter name to show all files
+#: src/ui.vala:534
 msgid "All Files"
 msgstr ""
 
-#: src/ui.vala:536
+#. Save dialog: Label for saving in PDF format
+#: src/ui.vala:543
 msgid "PDF (multi-page document)"
 msgstr ""
 
-#: src/ui.vala:542
+#. Save dialog: Label for saving in JPEG format
+#: src/ui.vala:549
 msgid "JPEG (compressed)"
 msgstr ""
 
-#: src/ui.vala:548
+#. Save dialog: Label for saving in PNG format
+#: src/ui.vala:555
 msgid "PNG (lossless)"
 msgstr ""
 
-#: src/ui.vala:557
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: src/ui.vala:564
 msgid "File format:"
 msgstr ""
 
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/ui.vala:647
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr ""
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
 #: src/ui.vala:650
+msgid "_Replace"
+msgstr ""
+
+#. Title of error dialog when save failed
+#: src/ui.vala:698
 msgid "Failed to save file"
 msgstr ""
 
-#: src/ui.vala:673
+#. Text in dialog warning when a document is about to be lost
+#: src/ui.vala:721
 msgid "If you don't save, changes will be permanently lost."
 msgstr ""
 
-#: src/ui.vala:708
+#. Text in dialog warning when a document is about to be lost
+#: src/ui.vala:763
 msgid "Save current document?"
 msgstr ""
 
-#: src/ui.vala:710
+#. Button in dialog to create new document and discard unsaved document
+#: src/ui.vala:765
 msgid "Discard Changes"
 msgstr ""
 
-#: src/ui.vala:992
+#. Error message display when unable to save image for preview
+#: src/ui.vala:1056
 msgid "Unable to save image for preview"
 msgstr ""
 
-#: src/ui.vala:1004
+#. Error message display when unable to preview image
+#: src/ui.vala:1068
 msgid "Unable to open image preview application"
 msgstr ""
 
-#: src/ui.vala:1206
+#. Label on button for combining sides in reordering dialog
+#: src/ui.vala:1270
 msgid "Combine sides"
 msgstr ""
 
-#: src/ui.vala:1216
+#. Label on button for combining sides in reverse order in reordering dialog
+#: src/ui.vala:1280
 msgid "Combine sides (reverse)"
 msgstr ""
 
-#: src/ui.vala:1226
+#. Label on button for reversing in reordering dialog
+#: src/ui.vala:1290
 msgid "Reverse"
 msgstr ""
 
-#: src/ui.vala:1236
+#. Label on button for cancelling page reordering dialog
+#: src/ui.vala:1300
 msgid "Keep unchanged"
 msgstr ""
 
-#: src/ui.vala:1451
+#. Error message displayed when unable to launch help browser
+#: src/ui.vala:1504
 msgid "Unable to open help file"
 msgstr ""
 
-#: src/ui.vala:1472
+#. The license this software is under (GPL3+)
+#: src/ui.vala:1525
 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"
@@ -487,179 +544,204 @@ msgid ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
 
-#: src/ui.vala:1475
+#. Title of about dialog
+#: src/ui.vala:1528
 msgid "About Simple Scan"
 msgstr ""
 
-#: src/ui.vala:1478
+#. Description of program
+#: src/ui.vala:1531
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: src/ui.vala:1487
+#: src/ui.vala:1540
 msgid "translator-credits"
 msgstr ""
 
-#: src/ui.vala:1509
+#. Text in dialog warning when a document is about to be lost
+#: src/ui.vala:1562
 msgid "Save document before quitting?"
 msgstr ""
 
-#: src/ui.vala:1511
+#. Button in dialog to quit and discard unsaved document
+#: src/ui.vala:1564
 msgid "Quit without Saving"
 msgstr ""
 
-#: src/ui.vala:1579
+#. Message to indicate a Brother scanner has been detected
+#: src/ui.vala:1632
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
-#: src/ui.vala:1581
+#. Instructions on how to install Brother scanner drivers
+#: src/ui.vala:1634
 msgid ""
 "Drivers for this are available on the <a href=\"http://support.brother.com"
 "\">Brother website</a>."
 msgstr ""
 
-#: src/ui.vala:1585
+#. Message to indicate a Samsung scanner has been detected
+#: src/ui.vala:1638
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
-#: src/ui.vala:1587
+#. Instructions on how to install Samsung scanner drivers
+#: src/ui.vala:1640
 msgid ""
 "Drivers for this are available on the <a href=\"http://samsung.com/support"
 "\">Samsung website</a>."
 msgstr ""
 
-#: src/ui.vala:1591
+#. Message to indicate a HP scanner has been detected
+#: src/ui.vala:1644
 msgid "You appear to have an HP scanner."
 msgstr ""
 
-#: src/ui.vala:1596
+#. Message to indicate an Epson scanner has been detected
+#: src/ui.vala:1649
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
-#: src/ui.vala:1598
+#. Instructions on how to install Epson scanner drivers
+#: src/ui.vala:1651
 msgid ""
 "Drivers for this are available on the <a href=\"http://support.epson.com"
 "\">Epson website</a>."
 msgstr ""
 
-#: src/ui.vala:1602
+#. Title of dialog giving instructions on how to install drivers
+#: src/ui.vala:1655
 msgid "Install drivers"
 msgstr ""
 
-#: src/ui.vala:1633
+#. Message in driver install dialog
+#: src/ui.vala:1686
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
-#: src/ui.vala:1645
+#. Label shown while installing drivers
+#: src/ui.vala:1698
 msgid "Installing drivers..."
 msgstr ""
 
-#: src/ui.vala:1653
+#. Label shown once drivers successfully installed
+#: src/ui.vala:1706
 msgid "Drivers installed successfully!"
 msgstr ""
 
-#: src/ui.vala:1663
+#. Label shown if failed to install drivers
+#: src/ui.vala:1716
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
-#: src/ui.vala:1669
+#. Label shown if failed to install drivers
+#: src/ui.vala:1722
 msgid "Failed to install drivers."
 msgstr ""
 
-#: src/ui.vala:1676
+#. Label shown to prompt user to install packages (when PackageKit not available)
+#: src/ui.vala:1729
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr ""
 
-#: src/ui.vala:1784
+#. Preferences dialog: Label for default resolution in resolution list
+#: src/ui.vala:1833
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
-#: src/ui.vala:1787
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: src/ui.vala:1836
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
-#: src/ui.vala:1790
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: src/ui.vala:1839
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
-#: src/ui.vala:1793
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: src/ui.vala:1842
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: src/ui.vala:1835
+#: src/ui.vala:1885
 msgid "New Document"
 msgstr ""
 
-#: src/ui.vala:1840
+#: src/ui.vala:1890
 msgid "Document"
 msgstr ""
 
-#: src/ui.vala:1844
+#: src/ui.vala:1893
 msgid "Email..."
 msgstr ""
 
-#: src/ui.vala:1845
+#: src/ui.vala:1894
 msgid "Print..."
 msgstr ""
 
-#: src/ui.vala:1853
+#: src/ui.vala:1902
 msgid "Help"
 msgstr ""
 
-#: src/ui.vala:1854
+#: src/ui.vala:1903
 msgid "About"
 msgstr ""
 
-#: src/ui.vala:1855
+#: src/ui.vala:1904
 msgid "Quit"
 msgstr ""
 
-#: src/ui.vala:1889
+#. Button in error infobar to open preferences dialog and change scanner
+#: src/ui.vala:1937
 msgid "Change _Scanner"
 msgstr ""
 
-#: src/ui.vala:1891
+#. Button in error infobar to prompt user to install drivers
+#: src/ui.vala:1939
 msgid "_Install Drivers"
 msgstr ""
 
-#: src/ui.vala:1897
+#. Combo box value for automatic paper size
+#: src/ui.vala:1945
 msgid "Automatic"
 msgstr ""
 
-#: src/ui.vala:1947
+#: src/ui.vala:1995
 msgid "Darker"
 msgstr ""
 
-#: src/ui.vala:1949
+#: src/ui.vala:1997
 msgid "Lighter"
 msgstr ""
 
-#: src/ui.vala:1957
+#: src/ui.vala:2005
 msgid "Less"
 msgstr ""
 
-#: src/ui.vala:1959
+#: src/ui.vala:2007
 msgid "More"
 msgstr ""
 
-#: src/ui.vala:1967
+#: src/ui.vala:2015
 msgid "Minimum"
 msgstr ""
 
-#: src/ui.vala:1969
+#: src/ui.vala:2017
 msgid "Maximum"
 msgstr ""
 
-#: src/ui.vala:2008
+#: src/ui.vala:2068
 msgid "Saving document..."
 msgstr ""
 
-#: src/ui.vala:2173
+#: src/ui.vala:2242
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/sk.gmo b/po/sk.gmo
deleted file mode 100644
index 2b853f4..0000000
--- a/po/sk.gmo
+++ /dev/null
diff --git a/po/sk.po b/po/sk.po
index 41cb0eb..c135df4 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -8,290 +8,292 @@ 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"
+"POT-Creation-Date: 2017-03-27 22:33+1300\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-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:11+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
 "Language: sk\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "Ove_riť"
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "_Užívateľské meno pre zdroj:"
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Heslo:"
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/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:192
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr "Predná strana"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/simple-scan.ui:196
 msgid "Back"
 msgstr "Zadná strana"
 
 #. 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
+#: src/simple-scan.ui:225 src/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:241
+#: src/simple-scan.ui:241
 msgid "_Document"
 msgstr "_Dokument"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/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:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/simple-scan.ui:273 src/simple-scan.ui:1306 src/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:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/simple-scan.ui:283 src/simple-scan.ui:1315 src/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr "_Všetky stránky z podávača"
 
 #. Menu entry to stop current scan
-#: data/simple-scan.ui:294
+#: src/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "_Zastaviť skenovanie"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:310 src/simple-scan.ui:1330 src/simple-scan.ui:1380
 msgid "Text"
 msgstr "Text"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:320 src/simple-scan.ui:1340 src/simple-scan.ui:1390
 msgid "Photo"
 msgstr "Fotografia"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/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:367
+#: src/simple-scan.ui:367
 msgid "_Email"
 msgstr "_Email"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:430
 msgid "_Page"
 msgstr "_Stránka"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "Otočiť _doľava"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "Otočiť do_prava"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:460
 msgid "_Crop"
 msgstr "_Orezanie"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:470
 msgid "_None"
 msgstr "Žia_dne"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:514
 msgid "_Letter"
 msgstr "US _List"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:536
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:547
 msgid "_Custom"
 msgstr "_Vlastné"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/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:578
+#: src/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:587
+#: src/simple-scan.ui:587
 msgid "Move Right"
 msgstr "Presunúť doprava"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:624
 msgid "_Help"
 msgstr "_Pomocník"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:632
 msgid "_Contents"
 msgstr "_Obsah"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:674 src/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "Vytvorí nový dokument"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:675
 msgid "New"
 msgstr "Nový"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:689 src/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:691 data/simple-scan.ui:837
+#: src/simple-scan.ui:691 src/simple-scan.ui:837
 msgid "Scan"
 msgstr "Skenovať"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:707 src/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "Uloží dokument do súboru"
 
-#: ../src/ui.vala:1842
+#: src/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "Uložiť"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/simple-scan.ui:724 src/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "Zastaví aktuálne skenovanie"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:725 src/simple-scan.ui:825
 msgid "Stop"
 msgstr "Zastaviť"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:749 src/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:750
+#: src/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "Otočiť doľava"
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:764 src/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:765
+#: src/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "Otočiť doprava"
 
 # tooltip
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:779 src/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "Oreže vybratú stránku"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:781
 msgid "Crop"
 msgstr "Orezanie"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "Nastavenia"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "Zdroj s_kenovania:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "Rozlíšenie _textu:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "Rozlíšenie _fotografií:"
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "Skenovaná strana:"
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "Veľkosť stránky:"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "Jas:"
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "Kontrast:"
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "Kvalita:"
 
@@ -299,7 +301,7 @@ msgstr "Kvalita:"
 msgid "Document Scanner"
 msgstr "Skener dokumentov"
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr "Skenuje dokumenty"
 
@@ -311,7 +313,7 @@ msgstr "skenovanie;skenovať;skener;plochý;adf;"
 msgid "scanner"
 msgstr "skener"
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 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 "
@@ -323,7 +325,7 @@ msgstr ""
 "dokumenty môžete vytlačiť, exportovať ich do pdf, alebo ich uložiť v rôznych "
 "formátoch obrázkov."
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
@@ -331,194 +333,194 @@ msgstr ""
 "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:389
 msgid "Failed to scan"
 msgstr "Skenovanie zlyhalo"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 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:630
 #, 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"
@@ -548,16 +550,16 @@ msgstr ""
 "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"
@@ -570,22 +572,22 @@ msgstr ""
 "  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>."
@@ -595,12 +597,12 @@ msgstr ""
 "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>."
@@ -609,17 +611,17 @@ msgstr ""
 "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>."
@@ -629,139 +631,139 @@ msgstr ""
 "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:2182
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Ukladá sa %d. stránka z %d"
diff --git a/po/sl.gmo b/po/sl.gmo
deleted file mode 100644
index d0a23ee..0000000
--- a/po/sl.gmo
+++ /dev/null
diff --git a/po/sl.po b/po/sl.po
index 01af45d..5065a4a 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -7,288 +7,290 @@ 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: 2012-07-23 09:19+0000\n"
-"Last-Translator: Andrej Znidarsic <andrej.znidarsic@gmail.com>\n"
+"POT-Creation-Date: 2017-03-27 22:33+1300\n"
+"PO-Revision-Date: 2017-04-05 19:36+0000\n"
+"Last-Translator: Bernard Banko <Unknown>\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-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:11+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_Pooblasti"
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "_Uporabniško ime za vir:"
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Geslo:"
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/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:192
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr "Prednja stran"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/simple-scan.ui:196
 msgid "Back"
 msgstr "Hrbtna stran"
 
 #. 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
+#: src/simple-scan.ui:225 src/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:241
+#: src/simple-scan.ui:241
 msgid "_Document"
 msgstr "_Dokument"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/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:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/simple-scan.ui:273 src/simple-scan.ui:1306 src/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:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/simple-scan.ui:283 src/simple-scan.ui:1315 src/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr "Vse strani iz _podajalnika"
 
 #. Menu entry to stop current scan
-#: data/simple-scan.ui:294
+#: src/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "_Zaustavi optično branje"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:310 src/simple-scan.ui:1330 src/simple-scan.ui:1380
 msgid "Text"
 msgstr "Besedilo"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:320 src/simple-scan.ui:1340 src/simple-scan.ui:1390
 msgid "Photo"
 msgstr "Fotografija"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/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:367
+#: src/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:430
+#: src/simple-scan.ui:430
 msgid "_Page"
 msgstr "_Stran"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "Zavrti _levo"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "Zavrti _desno"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:460
 msgid "_Crop"
 msgstr "_Obreži"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:470
 msgid "_None"
 msgstr "_Brez"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:514
 msgid "_Letter"
 msgstr "_Pismo"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "Velikost ZDA Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:536
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:547
 msgid "_Custom"
 msgstr "_Po meri"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/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:578
+#: src/simple-scan.ui:578
 msgid "Move Left"
 msgstr "Premakni levo"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/simple-scan.ui:587
 msgid "Move Right"
 msgstr "Premakni desno"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:624
 msgid "_Help"
 msgstr "Pomo_č"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:632
 msgid "_Contents"
 msgstr "_Vsebina"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:674 src/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "Začni nov dokument"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:675
 msgid "New"
 msgstr "Novo"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:689 src/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:691 data/simple-scan.ui:837
+#: src/simple-scan.ui:691 src/simple-scan.ui:837
 msgid "Scan"
 msgstr "Optično branje"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:707 src/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "Shrani dokument v datoteko"
 
-#: ../src/ui.vala:1842
+#: src/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "Shrani"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/simple-scan.ui:724 src/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "Zaustavi trenutno optično branje"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:725 src/simple-scan.ui:825
 msgid "Stop"
 msgstr "Zaustavi"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:749 src/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:750
+#: src/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "Zavrti levo"
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:764 src/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:765
+#: src/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "Zavrti desno"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:779 src/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "Obreži izbrano stran"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:781
 msgid "Crop"
 msgstr "Obreži"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "Možnosti"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "_Vir optičnega branja:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "_Ločljivost besedila:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "_Ločljivost fotografij:"
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "Stran optičnega branja:"
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "Velikost strani:"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "Svetlost:"
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "Kontrast:"
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "Kakovost:"
 
@@ -296,7 +298,7 @@ msgstr "Kakovost:"
 msgid "Document Scanner"
 msgstr "Optični bralnik dokumentov"
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr "Optično preberite dokumente"
 
@@ -306,9 +308,9 @@ msgstr "optični bralnik;adf;"
 
 #: data/simple-scan.desktop.in:8
 msgid "scanner"
-msgstr ""
+msgstr "optični bralnik"
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 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 "
@@ -320,7 +322,7 @@ msgstr ""
 "Prebrane dokumente lahko natisnete, izvozite v pdf ali shranite v eno od "
 "mnogih oblik."
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
@@ -328,191 +330,191 @@ msgstr ""
 "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:389
 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:619
 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:630
 #, 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"
@@ -544,20 +546,21 @@ msgstr ""
 "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"
 "  Andrej Znidarsic https://launchpad.net/~andrej.znidarsic\n"
+"  Bernard Banko https://launchpad.net/~beernarrd\n"
 "  Damir Jerovšek https://launchpad.net/~jierro\n"
 "  Dražen Matešić https://launchpad.net/~crazylemon\n"
 "  Klemen Košir https://launchpad.net/~klemen.kosir\n"
@@ -568,22 +571,22 @@ msgstr ""
 "  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>."
@@ -592,12 +595,12 @@ msgstr ""
 "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>."
@@ -606,17 +609,17 @@ msgstr ""
 "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>."
@@ -625,140 +628,140 @@ msgstr ""
 "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:2182
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Shranjevanje strani %d od %d"
diff --git a/po/sq.gmo b/po/sq.gmo
deleted file mode 100644
index 215a9ff..0000000
--- a/po/sq.gmo
+++ /dev/null
diff --git a/po/sq.po b/po/sq.po
index 1674e47..9077d5a 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -7,288 +7,290 @@ 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"
+"POT-Creation-Date: 2017-03-27 22:33+1300\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-12-19 05:07+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:10+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_Autorizo"
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "_Emri i përdoruesit për resursin:"
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Fjalëkalimi:"
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/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:192
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr "Përball"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/simple-scan.ui:196
 msgid "Back"
 msgstr "Mbrapa"
 
 #. 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
+#: src/simple-scan.ui:225 src/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:241
+#: src/simple-scan.ui:241
 msgid "_Document"
 msgstr "_Dokumenti"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/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:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/simple-scan.ui:273 src/simple-scan.ui:1306 src/simple-scan.ui:1356
 msgid "Single _Page"
 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:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/simple-scan.ui:283 src/simple-scan.ui:1315 src/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:294
+#: src/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "_Ndalo Skanimin"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:310 src/simple-scan.ui:1330 src/simple-scan.ui:1380
 msgid "Text"
 msgstr "Tekst"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:320 src/simple-scan.ui:1340 src/simple-scan.ui:1390
 msgid "Photo"
 msgstr "Foto"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr "Riorganizo faqet"
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/simple-scan.ui:367
 msgid "_Email"
 msgstr "_Email"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:430
 msgid "_Page"
 msgstr "_Faqe"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "Rrotullo _Majtas"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "Rrotullo _Djathtas"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:460
 msgid "_Crop"
 msgstr "_Prije"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:470
 msgid "_None"
 msgstr "_Asnjë"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:514
 msgid "_Letter"
 msgstr "_Letër SHBA"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:536
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:547
 msgid "_Custom"
 msgstr "_Sipas përdoruesit"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/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:578
+#: src/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:587
+#: src/simple-scan.ui:587
 msgid "Move Right"
 msgstr "Lëvize Djathtas"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:624
 msgid "_Help"
 msgstr "_Ndihmë"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:632
 msgid "_Contents"
 msgstr "_Përmbajtje"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:674 src/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "Filloje një dokument të ri"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:675
 msgid "New"
 msgstr "I ri"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:689 src/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:691 data/simple-scan.ui:837
+#: src/simple-scan.ui:691 src/simple-scan.ui:837
 msgid "Scan"
 msgstr "Skanim"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:707 src/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "Ruaje dokumentin tek një fajll"
 
-#: ../src/ui.vala:1842
+#: src/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "Ruaj"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/simple-scan.ui:724 src/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "Ndaloje skanimin e tanishëm"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:725 src/simple-scan.ui:825
 msgid "Stop"
 msgstr "Ndalo"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:749 src/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:750
+#: src/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "Rrotullo Majtas"
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:764 src/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:765
+#: src/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "Rrotullo Djathtas"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:779 src/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "Preje faqen e përzgjedhur"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:781
 msgid "Crop"
 msgstr "Prej"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "Parapëlqimet"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "Skanoje b_urimin"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "_Rezolucioni i Tekstit:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "_Rezolucioni i Fotos:"
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "Skanoje anën"
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "Përmasa e Faqes:"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "Ndriçimi:"
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "Kontrasti:"
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "Cilësia:"
 
@@ -296,7 +298,7 @@ msgstr "Cilësia:"
 msgid "Document Scanner"
 msgstr ""
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr "Skanoj Dokumentet"
 
@@ -308,7 +310,7 @@ msgstr ""
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 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 "
@@ -316,201 +318,201 @@ msgid ""
 "formats."
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 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:389
 msgid "Failed to scan"
 msgstr "Skanimi dështoi"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 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:630
 #, 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 ""
+msgstr "Kërkohet program shtesë"
 
 #. 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 "Ju duhet të instaloni një program draiveri për skanerin tuaj."
 
 #. 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 "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 ""
+msgstr "Kombino anët"
 
 #. 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 "Kombino anët (mbrapsht)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1226
 msgid "Reverse"
 msgstr "Mbrapsht"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1236
 msgid "Keep unchanged"
 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"
@@ -539,16 +541,16 @@ msgstr ""
 "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"
@@ -558,189 +560,195 @@ msgstr ""
 "  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 ""
+msgstr "Duket se ju keni një skaner 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 ""
+"Draiverat për të janë të disponueshëm në <a "
+"href=\"http://support.brother.com\"> Faqen e internetit të 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 "Duket se ju keni një skaner 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 ""
+"Draiverat për të janë të disponueshëm në <a "
+"href=\"http://samsung.com/support\">Faqen e internetit të 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 "Duket se ju keni një skaner 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 "Duket se ju keni një skaner 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 ""
+"Draiverat për të janë të disponueshëm në <a "
+"href=\"http://support.epson.com\">Faqen e internetit të 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 "Instalo draiverat"
 
 #. 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 "Pas instalimit ju duhet të rinisni Simple Scan."
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1645
 msgid "Installing drivers..."
-msgstr ""
+msgstr "Instalim i draiverave..."
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1653
 msgid "Drivers installed successfully!"
-msgstr ""
+msgstr "Draiverat u instaluan me sukses!"
 
 #. 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 "Dështoi instalimi i draiverave (kodi i gabimit %d)."
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1669
 msgid "Failed to install drivers."
-msgstr ""
+msgstr "Dështoi instalimi i draiverave."
 
 #. 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 "Ju duhet të instaloni %s paketa."
 
 #. 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 "Dokument i ri"
 
-#: ../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 "Printo..."
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1853
 msgid "Help"
 msgstr "Ndihmë"
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1854
 msgid "About"
 msgstr "Rreth"
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1855
 msgid "Quit"
 msgstr "Dil"
 
 #. 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 "_Instalo Draiverat"
 
 #. 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:2182
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Ruajtja e faqes %d nga %d"
diff --git a/po/sr.gmo b/po/sr.gmo
deleted file mode 100644
index 9a2c205..0000000
--- a/po/sr.gmo
+++ /dev/null
diff --git a/po/sr.po b/po/sr.po
index 3bbd5ed..227f530 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,289 +6,291 @@ 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"
+"POT-Creation-Date: 2017-03-27 22:33+1300\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-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:11+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
 "Language: sr\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_Овласти"
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "_Корисничко име за извор:"
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Лозинка:"
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/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
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr "Лице"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/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
+#: src/simple-scan.ui:225 src/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
+#: src/simple-scan.ui:241
 msgid "_Document"
 msgstr "_Документ"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/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
+#: src/simple-scan.ui:273 src/simple-scan.ui:1306 src/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
+#: src/simple-scan.ui:283 src/simple-scan.ui:1315 src/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr "Све странице из _фиоке"
 
 #. Menu entry to stop current scan
-#: data/simple-scan.ui:294
+#: src/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "_Заустави скенирање"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:310 src/simple-scan.ui:1330 src/simple-scan.ui:1380
 msgid "Text"
 msgstr "Текст"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:320 src/simple-scan.ui:1340 src/simple-scan.ui:1390
 msgid "Photo"
 msgstr "Слика"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/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
+#: src/simple-scan.ui:367
 msgid "_Email"
 msgstr "_Ел. пошта"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:430
 msgid "_Page"
 msgstr "_Страница"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "Окрени на _лево"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "Окрени на _десно"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:460
 msgid "_Crop"
 msgstr "_Опсеци"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:470
 msgid "_None"
 msgstr "_Ништа"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:481
 msgid "A_4"
 msgstr "А_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:492
 msgid "A_5"
 msgstr "А_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:503
 msgid "A_6"
 msgstr "А_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:514
 msgid "_Letter"
 msgstr "_Америчко писмо"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "_Легал"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:536
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:547
 msgid "_Custom"
 msgstr "_Произвољно"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr "_Заокрени опсечено"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/simple-scan.ui:578
 msgid "Move Left"
 msgstr "Помери улево"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/simple-scan.ui:587
 msgid "Move Right"
 msgstr "Помери удесно"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:624
 msgid "_Help"
 msgstr "По_моћ"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:632
 msgid "_Contents"
 msgstr "_Садржај"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:674 src/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "Покрените нови документ"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:675
 msgid "New"
 msgstr "Ново"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:689 src/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
+#: src/simple-scan.ui:691 src/simple-scan.ui:837
 msgid "Scan"
 msgstr "Скенирај"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:707 src/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "Сачувајте документ у датотеку"
 
-#: ../src/ui.vala:1842
+#: src/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
+#: src/simple-scan.ui:724 src/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "Зауставите текуће скенирање"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:725 src/simple-scan.ui:825
 msgid "Stop"
 msgstr "Заустави"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:749 src/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
+#: src/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "Окрени на лево"
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:764 src/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
+#: src/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "Окрени на десно"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:779 src/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "Одрежите изабрану страницу"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:781
 msgid "Crop"
 msgstr "Одрежи"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "Поставке"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "_Извор скенирања:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "Резолуција _текста:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "Резолуција _слике:"
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "Странице за скенирање:"
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "Величина странице:"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "Осветљај:"
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "Контраст:"
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "Квалитет:"
 
@@ -296,7 +298,7 @@ msgstr "Квалитет:"
 msgid "Document Scanner"
 msgstr "Скенер докумената"
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr "Скенирајте документе"
 
@@ -308,7 +310,7 @@ msgstr "скенирај;скенер;flatbed;adf;"
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 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 "
@@ -319,7 +321,7 @@ msgstr ""
 "делове слика и окренути скенирано. Можете штампати скенирано, одрадити извоз "
 "у ПДФ или сачувати скенирано у један од мноштва подржаних формата слика."
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
@@ -327,192 +329,192 @@ 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:389
 msgid "Failed to scan"
 msgstr "Нисам успео да скенирам"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[УРЕЂАЈ...] — алатка за скенирање"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:630
 #, 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"
@@ -542,16 +544,16 @@ 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"
@@ -563,22 +565,22 @@ msgstr ""
 "  Мирослав Николић 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>."
@@ -587,12 +589,12 @@ msgstr ""
 "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>."
@@ -601,17 +603,17 @@ msgstr ""
 "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>."
@@ -620,139 +622,139 @@ msgstr ""
 "сајту Епсона</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:2182
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Чувам %d. страницу од укупно %d"
diff --git a/po/stamp-po b/po/stamp-po
deleted file mode 100644
index 9788f70..0000000
--- a/po/stamp-po
+++ /dev/null
@@ -1 +0,0 @@
-timestamp
diff --git a/po/sv.gmo b/po/sv.gmo
deleted file mode 100644
index cf84203..0000000
--- a/po/sv.gmo
+++ /dev/null
diff --git a/po/sv.po b/po/sv.po
index 67cd933..b20c652 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,288 +7,290 @@ 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"
+"POT-Creation-Date: 2017-03-27 22:33+1300\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-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:11+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "A_uktorisera"
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "_Användarnamn för källa:"
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Lösenord:"
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/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:192
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr "Framsida"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/simple-scan.ui:196
 msgid "Back"
 msgstr "Baksida"
 
 #. 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
+#: src/simple-scan.ui:225 src/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:241
+#: src/simple-scan.ui:241
 msgid "_Document"
 msgstr "_Dokument"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/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:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/simple-scan.ui:273 src/simple-scan.ui:1306 src/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:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/simple-scan.ui:283 src/simple-scan.ui:1315 src/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:294
+#: src/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "_Stoppa inläsning"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:310 src/simple-scan.ui:1330 src/simple-scan.ui:1380
 msgid "Text"
 msgstr "Text"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:320 src/simple-scan.ui:1340 src/simple-scan.ui:1390
 msgid "Photo"
 msgstr "Foto"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/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:367
+#: src/simple-scan.ui:367
 msgid "_Email"
 msgstr "_E-post"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:430
 msgid "_Page"
 msgstr "_Sida"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "Rotera åt _vänster"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "Rotera åt _höger"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:460
 msgid "_Crop"
 msgstr "_Beskär"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:470
 msgid "_None"
 msgstr "_Ingen"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:514
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:536
 msgid "4×6"
 msgstr "4x6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:547
 msgid "_Custom"
 msgstr "An_passad"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/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:578
+#: src/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:587
+#: src/simple-scan.ui:587
 msgid "Move Right"
 msgstr "Flytta åt höger"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:624
 msgid "_Help"
 msgstr "_Hjälp"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:632
 msgid "_Contents"
 msgstr "_Innehåll"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:674 src/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "Starta ett nytt dokument"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:675
 msgid "New"
 msgstr "Nytt"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:689 src/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:691 data/simple-scan.ui:837
+#: src/simple-scan.ui:691 src/simple-scan.ui:837
 msgid "Scan"
 msgstr "Läs in"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:707 src/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "Spara dokument till en fil"
 
-#: ../src/ui.vala:1842
+#: src/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "Spara"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/simple-scan.ui:724 src/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "Stoppa den aktuella bildinläsningen"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:725 src/simple-scan.ui:825
 msgid "Stop"
 msgstr "Stoppa"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:749 src/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:750
+#: src/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "Rotera åt vänster"
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:764 src/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:765
+#: src/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "Rotera åt höger"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:779 src/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "Beskär den valda sidan"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:781
 msgid "Crop"
 msgstr "Beskär"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "Inställningar"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "Inläsnings_källa:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "_Textupplösning:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "_Fotoupplösning:"
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "Inläsningssida:"
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "Sidstorlek:"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "Ljusstyrka:"
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "Kontrast:"
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "Kvalitet:"
 
@@ -296,7 +298,7 @@ msgstr "Kvalitet:"
 msgid "Document Scanner"
 msgstr "Dokumentskanner"
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr "Läs in dokument"
 
@@ -308,7 +310,7 @@ msgstr "scan;scanner;flatbädd;adf;skan;skanner;"
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 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 "
@@ -320,7 +322,7 @@ msgstr ""
 "skriva ut det du skannat in, exportera till pdf, eller spara dem i ett brett "
 "utbud av bildformat."
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
@@ -328,192 +330,192 @@ msgstr ""
 "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:389
 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:619
 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:630
 #, 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"
@@ -543,16 +545,16 @@ msgstr ""
 "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"
@@ -570,22 +572,22 @@ msgstr ""
 "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>."
@@ -594,12 +596,12 @@ msgstr ""
 "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>."
@@ -608,17 +610,17 @@ msgstr ""
 "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>."
@@ -627,138 +629,138 @@ msgstr ""
 "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:2182
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Sparar sida %d av %d"
diff --git a/po/ta.gmo b/po/ta.gmo
deleted file mode 100644
index 42ef5c6..0000000
--- a/po/ta.gmo
+++ /dev/null
diff --git a/po/ta.po b/po/ta.po
index 43553a6..ef79a86 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -7,288 +7,290 @@ 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"
+"POT-Creation-Date: 2017-03-27 22:33+1300\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-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:11+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_அனுமதியளி"
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr ""
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr ""
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/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
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr "முன்னால்"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/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
+#: src/simple-scan.ui:225 src/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
+#: src/simple-scan.ui:241
 msgid "_Document"
 msgstr ""
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/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
+#: src/simple-scan.ui:273 src/simple-scan.ui:1306 src/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
+#: src/simple-scan.ui:283 src/simple-scan.ui:1315 src/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr "அனைத்து பக்கங்களை பீடர் இருந்து உள்ளன"
 
 #. Menu entry to stop current scan
-#: data/simple-scan.ui:294
+#: src/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr ""
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:310 src/simple-scan.ui:1330 src/simple-scan.ui:1380
 msgid "Text"
 msgstr "உரை"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:320 src/simple-scan.ui:1340 src/simple-scan.ui:1390
 msgid "Photo"
 msgstr ""
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/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
+#: src/simple-scan.ui:367
 msgid "_Email"
 msgstr "_மின்னஞ்சல்"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:430
 msgid "_Page"
 msgstr ""
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "இடதுபுறமாக சுழற்று"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr ""
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:460
 msgid "_Crop"
 msgstr "_ வெட்டு"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:470
 msgid "_None"
 msgstr ""
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:481
 msgid "A_4"
 msgstr ""
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:492
 msgid "A_5"
 msgstr ""
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:503
 msgid "A_6"
 msgstr ""
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:514
 msgid "_Letter"
 msgstr ""
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:525
 msgid "Le_gal"
 msgstr ""
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:536
 msgid "4×6"
 msgstr ""
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:547
 msgid "_Custom"
 msgstr "(_C) தனிப்பயன்"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr ""
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/simple-scan.ui:578
 msgid "Move Left"
 msgstr ""
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/simple-scan.ui:587
 msgid "Move Right"
 msgstr "வலப்பக்கம் நகர்"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:624
 msgid "_Help"
 msgstr "_உதவி"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:632
 msgid "_Contents"
 msgstr "_உள்ளடக்கங்கள்"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:674 src/simple-scan.ui:885
 msgid "Start a new document"
 msgstr ""
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:675
 msgid "New"
 msgstr ""
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:689 src/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
+#: src/simple-scan.ui:691 src/simple-scan.ui:837
 msgid "Scan"
 msgstr ""
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:707 src/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr ""
 
-#: ../src/ui.vala:1842
+#: src/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
+#: src/simple-scan.ui:724 src/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr ""
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:725 src/simple-scan.ui:825
 msgid "Stop"
 msgstr ""
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:749 src/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
+#: src/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr ""
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:764 src/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
+#: src/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "வலப்பக்கம் சுழற்று"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:779 src/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "தேர்வு செய்த பக்கத்தை வெட்டு"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:781
 msgid "Crop"
 msgstr ""
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr ""
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr ""
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr ""
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "பக்க அளவு:"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1260
 msgid "Quality:"
 msgstr ""
 
@@ -296,7 +298,7 @@ msgstr ""
 msgid "Document Scanner"
 msgstr ""
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr ""
 
@@ -308,7 +310,7 @@ msgstr ""
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 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 "
@@ -316,196 +318,196 @@ msgid ""
 "formats."
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 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:389
 msgid "Failed to scan"
 msgstr ""
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:630
 #, 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"
@@ -522,16 +524,16 @@ msgid ""
 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"
@@ -541,189 +543,189 @@ msgstr ""
 "  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:2182
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/te.gmo b/po/te.gmo
deleted file mode 100644
index 1d53b35..0000000
--- a/po/te.gmo
+++ /dev/null
diff --git a/po/te.po b/po/te.po
index 15a57d1..8be255b 100644
--- a/po/te.po
+++ b/po/te.po
@@ -7,288 +7,290 @@ 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"
+"POT-Creation-Date: 2017-03-27 22:33+1300\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-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:11+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "అధికారమిచ్చు(_A)"
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "వనరుకు వాడుకరిపేరు(_U):"
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr "సంకేతపదం(_P):"
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/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
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr "ముందుభాగం"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/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
+#: src/simple-scan.ui:225 src/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
+#: src/simple-scan.ui:241
 msgid "_Document"
 msgstr "పత్రం (_D)"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/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
+#: src/simple-scan.ui:273 src/simple-scan.ui:1306 src/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
+#: src/simple-scan.ui:283 src/simple-scan.ui:1315 src/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr "ఫీడర్ నుండి అన్ని పేజీలు(_F)"
 
 #. Menu entry to stop current scan
-#: data/simple-scan.ui:294
+#: src/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "స్కాన్ ఆపు(_S)"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:310 src/simple-scan.ui:1330 src/simple-scan.ui:1380
 msgid "Text"
 msgstr "పాఠ్యం"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:320 src/simple-scan.ui:1340 src/simple-scan.ui:1390
 msgid "Photo"
 msgstr "ఫొటో"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/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
+#: src/simple-scan.ui:367
 msgid "_Email"
 msgstr "ఈమెయిల్(_E)"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:430
 msgid "_Page"
 msgstr "పేజీ(_P)"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "ఎడమవైపు తిప్పు (_L)"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "కుడివైపు తిప్పు(_R)"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:460
 msgid "_Crop"
 msgstr "క్రాప్ చేయి(_C)"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:470
 msgid "_None"
 msgstr "ఏదీకాదు(_N)"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:514
 msgid "_Letter"
 msgstr "లెటర్ (_L)"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "లీగల్ (_g)"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:536
 msgid "4×6"
 msgstr ""
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:547
 msgid "_Custom"
 msgstr "మలచుకొను(_C)"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr "క్రాప్‌చేసినదానిని తిప్పు(_R)"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/simple-scan.ui:578
 msgid "Move Left"
 msgstr "ఎడమకు జరుపు"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/simple-scan.ui:587
 msgid "Move Right"
 msgstr "కుడి వైపు జరుపు"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:624
 msgid "_Help"
 msgstr "సహాయం (_H)"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:632
 msgid "_Contents"
 msgstr "విషయసూచిక(_C)"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:674 src/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "ఒక కొత్త పత్రాన్ని ప్రాంరంభించు"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:675
 msgid "New"
 msgstr "కొత్త"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:689 src/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
+#: src/simple-scan.ui:691 src/simple-scan.ui:837
 msgid "Scan"
 msgstr "స్కాన్"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:707 src/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "పత్రాన్ని ఫైలులో దాచు"
 
-#: ../src/ui.vala:1842
+#: src/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
+#: src/simple-scan.ui:724 src/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "ప్రస్తుత స్కాన్ ఆపు"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:725 src/simple-scan.ui:825
 msgid "Stop"
 msgstr "ఆపు"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:749 src/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
+#: src/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "ఎడమవైపు తిప్పు"
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:764 src/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
+#: src/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "కుడివైపు తిప్పు"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:779 src/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "ఎంపికైన పెజీ అంచులుసవరించు"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:781
 msgid "Crop"
 msgstr "అంచులుసవరించు"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "ప్రాధాన్యతలు"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "స్కాన్ మూలం (_o):"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "పాఠ విభాజకత (_T)"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "ఫొటో విభాజకత(_P)"
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "స్కాన్ చేయు ప్రక్క:"
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "పేజీ పరిమాణం:"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1260
 msgid "Quality:"
 msgstr ""
 
@@ -296,7 +298,7 @@ msgstr ""
 msgid "Document Scanner"
 msgstr ""
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr "పత్రాలు స్కాన్ చేయు"
 
@@ -308,7 +310,7 @@ msgstr ""
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 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 "
@@ -316,197 +318,197 @@ msgid ""
 "formats."
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 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:389
 msgid "Failed to scan"
 msgstr "స్కాన్‌చేయుటలో విఫలమైంది"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:630
 #, 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"
@@ -534,16 +536,16 @@ 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"
@@ -553,189 +555,189 @@ msgstr ""
 "  వీవెన్ 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:2182
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/th.gmo b/po/th.gmo
deleted file mode 100644
index cf3d044..0000000
--- a/po/th.gmo
+++ /dev/null
diff --git a/po/th.po b/po/th.po
index 864fd5e..397b863 100644
--- a/po/th.po
+++ b/po/th.po
@@ -7,308 +7,310 @@ 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: 2012-07-23 09:09+0000\n"
-"Last-Translator: AnuchitChalothorn <anoochit@gmail.com>\n"
+"POT-Creation-Date: 2017-03-27 22:33+1300\n"
+"PO-Revision-Date: 2017-03-29 06:29+0000\n"
+"Last-Translator: Rockworld <sumoisrock@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-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:11+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_อนุญาต"
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "_ชื่อผู้ใช้ทรัพยากร :"
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr "รหัส_ผ่าน:"
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/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
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr "หน้า"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/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
+#: src/simple-scan.ui:225 src/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:241
+#: src/simple-scan.ui:241
 msgid "_Document"
 msgstr "เ_อกสาร"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/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
+#: src/simple-scan.ui:273 src/simple-scan.ui:1306 src/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
+#: src/simple-scan.ui:283 src/simple-scan.ui:1315 src/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr "ทุกหน้าจาก_ตัวป้อนกระดาษ"
 
 #. Menu entry to stop current scan
-#: data/simple-scan.ui:294
+#: src/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "_หยุดสแกน:"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:310 src/simple-scan.ui:1330 src/simple-scan.ui:1380
 msgid "Text"
 msgstr "ข้อความ"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:320 src/simple-scan.ui:1340 src/simple-scan.ui:1390
 msgid "Photo"
 msgstr "ภาพถ่าย"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
 msgid "Reorder Pages"
-msgstr ""
+msgstr "สั่งพิมพ์หน้าต่าง ๆ ใหม่"
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/simple-scan.ui:367
 msgid "_Email"
 msgstr "_อีเมล"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:430
 msgid "_Page"
 msgstr "_หน้า"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "หมุน_ซ้าย"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "หมุน_ขวา"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:460
 msgid "_Crop"
 msgstr "_ตัด"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:470
 msgid "_None"
 msgstr "ไ_ม่มี"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:514
 msgid "_Letter"
 msgstr "_จดหมาย"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:536
 msgid "4×6"
-msgstr ""
+msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:547
 msgid "_Custom"
 msgstr "_กำหนดเอง"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr "หมุ_นภาพตัด"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/simple-scan.ui:578
 msgid "Move Left"
 msgstr "ย้ายไปทางซ้าย"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/simple-scan.ui:587
 msgid "Move Right"
 msgstr "ย้ายไปทางขวา"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:624
 msgid "_Help"
 msgstr "_วิธีใช้"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:632
 msgid "_Contents"
 msgstr "เ_นื้อหา"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:674 src/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "เริ่มเอกสารใหม่"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:675
 msgid "New"
 msgstr "สร้าง"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:689 src/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
+#: src/simple-scan.ui:691 src/simple-scan.ui:837
 msgid "Scan"
 msgstr "สแกน"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:707 src/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "บันทึกเอกสารเป็นแฟ้ม"
 
-#: ../src/ui.vala:1842
+#: src/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
+#: src/simple-scan.ui:724 src/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "หยุดการสแกนขณะนี้"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:725 src/simple-scan.ui:825
 msgid "Stop"
 msgstr "หยุด"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:749 src/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
+#: src/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "หมุนซ้าย"
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:764 src/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
+#: src/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "หมุนขวา"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:779 src/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "ตัดหน้าที่เลือก"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:781
 msgid "Crop"
 msgstr "ตัด"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "คุณสมบัติ"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "แ_หล่งสแกน:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "ความละเอียด_ข้อความ:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "ความละเอียด_ภาพถ่าย:"
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "สแกนด้าน:"
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "ขนาดกระดาษ :"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1199
 msgid "Brightness:"
-msgstr ""
+msgstr "ความสว่าง:"
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1229
 msgid "Contrast:"
-msgstr ""
+msgstr "ความเปรียบต่าง:"
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1260
 msgid "Quality:"
-msgstr ""
+msgstr "คุณภาพ:"
 
 #: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
-msgstr ""
+msgstr "เครื่องสแกนเอกสาร"
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr "สแกนเอกสาร"
 
 #: data/simple-scan.desktop.in:6
 msgid "scan;scanner;flatbed;adf;"
-msgstr ""
+msgstr "สแกน;สแกนเนอร์;flatbed;adf"
 
 #: data/simple-scan.desktop.in:8
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 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 "
@@ -316,196 +318,196 @@ msgid ""
 "formats."
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 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:389
 msgid "Failed to scan"
 msgstr "การสแกนล้มเหลว"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 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:630
 #, 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 ""
+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 ""
+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 ""
+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 ""
+msgstr "_ยกเลิก"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:510 src/ui.vala:676
 msgid "_Save"
-msgstr ""
+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 ""
+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 ""
+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 ""
+msgstr "รวมด้านข้าง (ย้อนกลับ)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1226
 msgid "Reverse"
-msgstr ""
+msgstr "ย้อนกลับ"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1236
 msgid "Keep unchanged"
-msgstr ""
+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"
@@ -534,16 +536,16 @@ msgstr ""
 "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"
@@ -556,192 +558,198 @@ msgstr ""
 "  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 ""
+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 ""
+"ไดรเวอร์ของ Brother สามารถพบได้ใน<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 ""
+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 ""
+"ไดรเวอร์ของ Samsung สามารถพบได้ใน<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 ""
+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 ""
+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 ""
+"ไดรเวอร์ของ Epson สามารถพบได้ใน<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 ""
+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 ""
+msgstr "หลังจากที่คุณติดตั้งแล้ว คุณต้องเริ่มโปรแกรม Simple Scan ใหม่"
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1645
 msgid "Installing drivers..."
-msgstr ""
+msgstr "กำลังติดตั้งไดรเวอร์..."
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1653
 msgid "Drivers installed successfully!"
-msgstr ""
+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 ""
+msgstr "การติดตั้งไดรเวอร์ล้มเหลว (โค้ดผิดพลาด %d)"
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1669
 msgid "Failed to install drivers."
-msgstr ""
+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 ""
+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 ""
+msgstr "เอกสารใหม่"
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1840
 msgid "Document"
-msgstr ""
+msgstr "เอกสาร"
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1844
 msgid "Email..."
-msgstr ""
+msgstr "อีเมล..."
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1845
 msgid "Print..."
-msgstr ""
+msgstr "พิมพ์..."
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1853
 msgid "Help"
-msgstr ""
+msgstr "วิธีใช้"
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1854
 msgid "About"
-msgstr ""
+msgstr "เกี่ยวกับ"
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1855
 msgid "Quit"
-msgstr ""
+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 ""
+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 ""
+msgstr "มืดลงกว่าเดิม"
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1949
 msgid "Lighter"
-msgstr ""
+msgstr "สว่างขึ้นกว่าเดิม"
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:1957
 msgid "Less"
-msgstr ""
+msgstr "น้อยลง"
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:1959
 msgid "More"
-msgstr ""
+msgstr "มากขึ้น"
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:1967
 msgid "Minimum"
-msgstr ""
+msgstr "ขั้นต่ำ"
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:1969
 msgid "Maximum"
-msgstr ""
+msgstr "สูงสุด"
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2008
 msgid "Saving document..."
-msgstr ""
+msgstr "กำลังบันทึกเอกสาร..."
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2182
 #, c-format
 msgid "Saving page %d out of %d"
-msgstr ""
+msgstr "กำลังบันทึกหน้า %d จากทั้งหมด %d หน้า"
 
 #~ msgid "4&#xD7;6"
 #~ msgstr "4&#xD7;6"
diff --git a/po/tr.gmo b/po/tr.gmo
deleted file mode 100644
index 35f5a6e..0000000
--- a/po/tr.gmo
+++ /dev/null
diff --git a/po/tr.po b/po/tr.po
index f59fe71..eacde0a 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -7,288 +7,290 @@ 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"
+"POT-Creation-Date: 2017-03-27 22:33+1300\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-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:11+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_Yetkilendir"
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "Kaynak için _kullanıcı adı:"
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Parola:"
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/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:192
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr "Ön taraf"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/simple-scan.ui:196
 msgid "Back"
 msgstr "Arka taraf"
 
 #. 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
+#: src/simple-scan.ui:225 src/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:241
+#: src/simple-scan.ui:241
 msgid "_Document"
 msgstr "_Belge"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/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:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/simple-scan.ui:273 src/simple-scan.ui:1306 src/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:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/simple-scan.ui:283 src/simple-scan.ui:1315 src/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr "Kaynaktaki Tüm _Sayfalar"
 
 #. Menu entry to stop current scan
-#: data/simple-scan.ui:294
+#: src/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "_Taramayı Durdur"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:310 src/simple-scan.ui:1330 src/simple-scan.ui:1380
 msgid "Text"
 msgstr "Metin"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:320 src/simple-scan.ui:1340 src/simple-scan.ui:1390
 msgid "Photo"
 msgstr "Fotoğraf"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/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:367
+#: src/simple-scan.ui:367
 msgid "_Email"
 msgstr "_E-posta"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:430
 msgid "_Page"
 msgstr "_Sayfa"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "_Sola Döndür"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "Sa_ğa Çevir"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:460
 msgid "_Crop"
 msgstr "_Kırp"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:470
 msgid "_None"
 msgstr "_Hiçbiri"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:514
 msgid "_Letter"
 msgstr "_Harf"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "Ya_sal"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:536
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:547
 msgid "_Custom"
 msgstr "_Özel"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/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:578
+#: src/simple-scan.ui:578
 msgid "Move Left"
 msgstr "Sola Taşı"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/simple-scan.ui:587
 msgid "Move Right"
 msgstr "Sağa Taşı"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:624
 msgid "_Help"
 msgstr "_Yardım"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:632
 msgid "_Contents"
 msgstr "_İçindekiler"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:674 src/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "Yeni bir belge başlat"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:675
 msgid "New"
 msgstr "Yeni"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:689 src/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:691 data/simple-scan.ui:837
+#: src/simple-scan.ui:691 src/simple-scan.ui:837
 msgid "Scan"
 msgstr "Tara"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:707 src/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "Belgeyi bir dosyaya kaydet"
 
-#: ../src/ui.vala:1842
+#: src/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "Kaydet"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/simple-scan.ui:724 src/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "Geçerli taramayı durdur"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:725 src/simple-scan.ui:825
 msgid "Stop"
 msgstr "Durdur"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:749 src/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:750
+#: src/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "Sola Döndür"
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:764 src/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:765
+#: src/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "Sağa Döndür"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:779 src/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "Seçili sayfayı kırp"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:781
 msgid "Crop"
 msgstr "Kırp"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "Tercihler"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "Ta_rama Kaynağı:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "_Metin Çözünürlüğü:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "_Fotoğraf Çözünürlüğü:"
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "Taranacak taraf:"
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "Sayfa Boyutu:"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "Parlaklık:"
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "Karşıtlık:"
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "Kalite:"
 
@@ -296,7 +298,7 @@ msgstr "Kalite:"
 msgid "Document Scanner"
 msgstr "Belge Tarayıcı"
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr "Belgeleri Tara"
 
@@ -308,7 +310,7 @@ msgstr "tara;tarayıcı;flatbed;adf;"
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 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 "
@@ -316,7 +318,7 @@ msgid ""
 "formats."
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
@@ -324,192 +326,192 @@ msgstr ""
 "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:389
 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:619
 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:630
 #, 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 "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 "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 "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"
@@ -538,16 +540,16 @@ msgstr ""
 "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"
@@ -573,22 +575,22 @@ msgstr ""
 "  İ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 "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>."
@@ -597,12 +599,12 @@ msgstr ""
 "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 "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>."
@@ -611,17 +613,17 @@ msgstr ""
 "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 "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 "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>."
@@ -630,138 +632,138 @@ msgstr ""
 "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 "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 "Yükledikten sonra Basit Tarama'yı yeniden başlatmanız gerekiyor."
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1645
 msgid "Installing drivers..."
 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 "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 "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 "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 "%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 "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:2182
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Kaydedilen sayfa: %d / %d"
diff --git a/po/ug.gmo b/po/ug.gmo
deleted file mode 100644
index fdc9175..0000000
--- a/po/ug.gmo
+++ /dev/null
diff --git a/po/ug.po b/po/ug.po
index dc88f13..23d771c 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-07-29 12:47+1200\n"
+"POT-Creation-Date: 2017-03-27 22:33+1300\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,283 +15,285 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:11+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
 "X-Poedit-Language: Uighur\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "كىملىك دەلىللە(_A)"
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "مەنبەنىڭ ئىشلەتكۈچى ئاتى(_U):"
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr "ئىم(_P):"
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/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
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr "ئالدى"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/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
+#: src/simple-scan.ui:225 src/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
+#: src/simple-scan.ui:241
 msgid "_Document"
 msgstr "پۈتۈك(_D)"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/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
+#: src/simple-scan.ui:273 src/simple-scan.ui:1306 src/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
+#: src/simple-scan.ui:283 src/simple-scan.ui:1315 src/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr "كىرگۈزۈلگەن ھەممە بەتلەر(_F)"
 
 #. Menu entry to stop current scan
-#: data/simple-scan.ui:294
+#: src/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "شويلىلاشنى توختات(_S)"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:310 src/simple-scan.ui:1330 src/simple-scan.ui:1380
 msgid "Text"
 msgstr "تېكىست"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:320 src/simple-scan.ui:1340 src/simple-scan.ui:1390
 msgid "Photo"
 msgstr "سۈرەت"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/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
+#: src/simple-scan.ui:367
 msgid "_Email"
 msgstr "ئېلخەت(_E)"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:430
 msgid "_Page"
 msgstr "بەت(_P)"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "سولغا چۆرگىلەت(_L)"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "ئوڭغا چۆرگىلەت(_R)"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:460
 msgid "_Crop"
 msgstr "قىرقى(_C)"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:470
 msgid "_None"
 msgstr "يوق(_N)"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:514
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "US Legal(_G)"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:536
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:547
 msgid "_Custom"
 msgstr "ئىختىيارى(_C)"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr "قىرقىغاننى چۆرگىلەت(_R)"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/simple-scan.ui:578
 msgid "Move Left"
 msgstr ""
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/simple-scan.ui:587
 msgid "Move Right"
 msgstr "ئوڭغا يۆتكە"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:624
 msgid "_Help"
 msgstr "ياردەم(_H)"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:632
 msgid "_Contents"
 msgstr "مەزمۇنلار(_C)"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:674 src/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "يېڭى ھۆججەت قۇرىدۇ"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:675
 msgid "New"
 msgstr "يېڭى"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:689 src/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
+#: src/simple-scan.ui:691 src/simple-scan.ui:837
 msgid "Scan"
 msgstr "شويلىلاش"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:707 src/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "پۈتۈكنى ھۆججەتكە ساقلايدۇ"
 
-#: ../src/ui.vala:1842
+#: src/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
+#: src/simple-scan.ui:724 src/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "نۆۋەتتىكى شويلىلاش باسقۇچىنى توختىتىدۇ"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:725 src/simple-scan.ui:825
 msgid "Stop"
 msgstr "توختا"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:749 src/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
+#: src/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "سولغا چۆرگىلەت"
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:764 src/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
+#: src/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "ئوڭغا چۆرگىلەت"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:779 src/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "تاللانغان بەتنى قىرقىيدۇ"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:781
 msgid "Crop"
 msgstr "قىرقى"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "مايىللىق"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "شويلىلاش مەنبەسى(_O):"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "تېكىست ئېنىقلىقى(_T):"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "سۈرەت ئېنىقلىقى(_P):"
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "شويلىلايدىغان يۈزى:"
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "قەغەز چوڭلۇقى:"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "يورۇقلۇقى:"
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "سېلىشتۇرما دەرىجىسى:"
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "سۈپىتى:"
 
@@ -299,7 +301,7 @@ msgstr "سۈپىتى:"
 msgid "Document Scanner"
 msgstr ""
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr "پۈتۈك شويلىلاش"
 
@@ -311,7 +313,7 @@ msgstr ""
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 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 "
@@ -319,198 +321,198 @@ msgid ""
 "formats."
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 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:389
 msgid "Failed to scan"
 msgstr "شويلىلاش مەغلۇپ بولدى"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[ئۈسكۈنە...] - شويلىلاش قورالى."
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:630
 #, 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"
@@ -541,16 +543,16 @@ 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"
@@ -564,189 +566,189 @@ msgstr ""
 "  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 "ئورنىتىلغاندىن كېيىن 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 ""
 
 #. 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 "قوزغاتقۇلارنى ئورنات(_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:2182
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "ساقلاۋاتقىنى %d/%d - بەت"
diff --git a/po/uk.gmo b/po/uk.gmo
deleted file mode 100644
index 48b4f62..0000000
--- a/po/uk.gmo
+++ /dev/null
diff --git a/po/uk.po b/po/uk.po
index fd5b721..2bc45dd 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,288 +7,290 @@ 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"
+"POT-Creation-Date: 2017-03-27 22:33+1300\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-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:11+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_Уповноваження"
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "_Користувач ресурсу:"
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Пароль:"
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/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
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr "Передній бік"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/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
+#: src/simple-scan.ui:225 src/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
+#: src/simple-scan.ui:241
 msgid "_Document"
 msgstr "Д_окумент"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/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
+#: src/simple-scan.ui:273 src/simple-scan.ui:1306 src/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
+#: src/simple-scan.ui:283 src/simple-scan.ui:1315 src/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr "Всі сторінки з _лотка"
 
 #. Menu entry to stop current scan
-#: data/simple-scan.ui:294
+#: src/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "П_рипинити сканування"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:310 src/simple-scan.ui:1330 src/simple-scan.ui:1380
 msgid "Text"
 msgstr "Текстовий"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:320 src/simple-scan.ui:1340 src/simple-scan.ui:1390
 msgid "Photo"
 msgstr "Фотографія"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/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
+#: src/simple-scan.ui:367
 msgid "_Email"
 msgstr "_Надіслати ел. поштою"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:430
 msgid "_Page"
 msgstr "С_торінка"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "Обернути _ліворуч"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "Обернути п_раворуч"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:460
 msgid "_Crop"
 msgstr "_Обрізати"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:470
 msgid "_None"
 msgstr "_Без обрізання"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:514
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:536
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:547
 msgid "_Custom"
 msgstr "_Нетипові"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr "_Обернути область обрізання"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/simple-scan.ui:578
 msgid "Move Left"
 msgstr "Пересунути ліворуч"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/simple-scan.ui:587
 msgid "Move Right"
 msgstr "Пересунути праворуч"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:624
 msgid "_Help"
 msgstr "_Довідка"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:632
 msgid "_Contents"
 msgstr "_Вміст"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:674 src/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "Почати новий документ"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:675
 msgid "New"
 msgstr "Створити"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:689 src/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
+#: src/simple-scan.ui:691 src/simple-scan.ui:837
 msgid "Scan"
 msgstr "Сканувати"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:707 src/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "Зберегти документ до файла"
 
-#: ../src/ui.vala:1842
+#: src/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
+#: src/simple-scan.ui:724 src/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "Припинити поточне сканування"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:725 src/simple-scan.ui:825
 msgid "Stop"
 msgstr "Зупинити"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:749 src/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
+#: src/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "Обернути ліворуч"
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:764 src/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
+#: src/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "Обернути праворуч"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:779 src/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "Обрізати позначену сторінку"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:781
 msgid "Crop"
 msgstr "Обрізати"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "Налаштування"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "_Джерело даних сканування:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "Роздільна здатність _тексту:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "Роздільна здатність _фотографій:"
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "Бік сканування:"
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "Розмір сторінки:"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "Яскравість:"
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "Контрастність:"
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "Якість:"
 
@@ -296,7 +298,7 @@ msgstr "Якість:"
 msgid "Document Scanner"
 msgstr "Засіб для сканування документів"
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr "Сканувати документи"
 
@@ -309,7 +311,7 @@ msgstr ""
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 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 "
@@ -322,7 +324,7 @@ msgstr ""
 "експортування даних до PDF та зберігання даних у файлах зображень "
 "різноманітних форматів."
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
@@ -330,195 +332,195 @@ 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:389
 msgid "Failed to scan"
 msgstr "Помилка сканування"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[ПРИСТРІЙ...] — програма для сканування"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:630
 #, 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"
@@ -547,16 +549,16 @@ 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"
@@ -567,22 +569,22 @@ msgstr ""
 "  Микола Ткач 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>."
@@ -591,12 +593,12 @@ msgstr ""
 "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>."
@@ -605,17 +607,17 @@ msgstr ""
 "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>."
@@ -624,138 +626,138 @@ msgstr ""
 "сайті 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:2182
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Зберігаємо сторінку %d з %d"
diff --git a/po/ur.gmo b/po/ur.gmo
deleted file mode 100644
index 01bd49b..0000000
--- a/po/ur.gmo
+++ /dev/null
diff --git a/po/ur.po b/po/ur.po
index dee9770..20405f7 100644
--- a/po/ur.po
+++ b/po/ur.po
@@ -7,288 +7,290 @@ 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"
+"POT-Creation-Date: 2017-03-27 22:33+1300\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-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:11+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr ""
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr ""
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr ""
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/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
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr ""
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/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
+#: src/simple-scan.ui:225 src/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
+#: src/simple-scan.ui:241
 msgid "_Document"
 msgstr ""
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/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
+#: src/simple-scan.ui:273 src/simple-scan.ui:1306 src/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
+#: src/simple-scan.ui:283 src/simple-scan.ui:1315 src/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr ""
 
 #. Menu entry to stop current scan
-#: data/simple-scan.ui:294
+#: src/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr ""
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:310 src/simple-scan.ui:1330 src/simple-scan.ui:1380
 msgid "Text"
 msgstr "عبارت"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:320 src/simple-scan.ui:1340 src/simple-scan.ui:1390
 msgid "Photo"
 msgstr "تصویر"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/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
+#: src/simple-scan.ui:367
 msgid "_Email"
 msgstr ""
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:430
 msgid "_Page"
 msgstr ""
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr ""
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr ""
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:460
 msgid "_Crop"
 msgstr ""
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:470
 msgid "_None"
 msgstr ""
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:514
 msgid "_Letter"
 msgstr ""
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:525
 msgid "Le_gal"
 msgstr ""
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:536
 msgid "4×6"
 msgstr ""
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:547
 msgid "_Custom"
 msgstr ""
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr ""
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/simple-scan.ui:578
 msgid "Move Left"
 msgstr ""
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/simple-scan.ui:587
 msgid "Move Right"
 msgstr ""
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:624
 msgid "_Help"
 msgstr ""
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:632
 msgid "_Contents"
 msgstr ""
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:674 src/simple-scan.ui:885
 msgid "Start a new document"
 msgstr ""
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:675
 msgid "New"
 msgstr "نیا"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:689 src/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
+#: src/simple-scan.ui:691 src/simple-scan.ui:837
 msgid "Scan"
 msgstr ""
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:707 src/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr ""
 
-#: ../src/ui.vala:1842
+#: src/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
+#: src/simple-scan.ui:724 src/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr ""
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:725 src/simple-scan.ui:825
 msgid "Stop"
 msgstr "رکیۓ"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:749 src/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
+#: src/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr ""
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:764 src/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
+#: src/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr ""
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:779 src/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr ""
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:781
 msgid "Crop"
 msgstr ""
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "ترجیحات"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr ""
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr ""
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr ""
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1260
 msgid "Quality:"
 msgstr ""
 
@@ -296,7 +298,7 @@ msgstr ""
 msgid "Document Scanner"
 msgstr ""
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr ""
 
@@ -308,7 +310,7 @@ msgstr ""
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 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 "
@@ -316,196 +318,196 @@ msgid ""
 "formats."
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 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:389
 msgid "Failed to scan"
 msgstr ""
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:630
 #, 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"
@@ -522,16 +524,16 @@ msgid ""
 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"
@@ -540,189 +542,189 @@ msgstr ""
 "  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:2182
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/uz.gmo b/po/uz.gmo
deleted file mode 100644
index 28dc6dd..0000000
--- a/po/uz.gmo
+++ /dev/null
diff --git a/po/uz.po b/po/uz.po
index cd69683..07e9dc4 100644
--- a/po/uz.po
+++ b/po/uz.po
@@ -7,288 +7,290 @@ 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"
+"POT-Creation-Date: 2017-03-27 22:33+1300\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-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:11+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr ""
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr ""
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr "_Maxfiy soʻz:"
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/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:192
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr "Oldingi"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/simple-scan.ui:196
 msgid "Back"
 msgstr "Orqaga"
 
 #. 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
+#: src/simple-scan.ui:225 src/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:241
+#: src/simple-scan.ui:241
 msgid "_Document"
 msgstr "_Dokument"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/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:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/simple-scan.ui:273 src/simple-scan.ui:1306 src/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
+#: src/simple-scan.ui:283 src/simple-scan.ui:1315 src/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr ""
 
 #. Menu entry to stop current scan
-#: data/simple-scan.ui:294
+#: src/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr ""
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:310 src/simple-scan.ui:1330 src/simple-scan.ui:1380
 msgid "Text"
 msgstr "Matn"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:320 src/simple-scan.ui:1340 src/simple-scan.ui:1390
 msgid "Photo"
 msgstr "Rasm"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/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
+#: src/simple-scan.ui:367
 msgid "_Email"
 msgstr "_Email"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:430
 msgid "_Page"
 msgstr ""
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "Chapga burish"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "_O'nga burish"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:460
 msgid "_Crop"
 msgstr "_Kesish"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:470
 msgid "_None"
 msgstr "_Yoʻq"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:514
 msgid "_Letter"
 msgstr "_Xat"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:525
 msgid "Le_gal"
 msgstr ""
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:536
 msgid "4×6"
 msgstr ""
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:547
 msgid "_Custom"
 msgstr ""
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr ""
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/simple-scan.ui:578
 msgid "Move Left"
 msgstr ""
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/simple-scan.ui:587
 msgid "Move Right"
 msgstr ""
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:624
 msgid "_Help"
 msgstr "_Yordam"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:632
 msgid "_Contents"
 msgstr "_Tarkibi"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:674 src/simple-scan.ui:885
 msgid "Start a new document"
 msgstr ""
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:675
 msgid "New"
 msgstr "Yangi"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:689 src/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
+#: src/simple-scan.ui:691 src/simple-scan.ui:837
 msgid "Scan"
 msgstr "Skan qilish"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:707 src/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr ""
 
-#: ../src/ui.vala:1842
+#: src/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "Saqlash"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/simple-scan.ui:724 src/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr ""
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:725 src/simple-scan.ui:825
 msgid "Stop"
 msgstr "Toʻxtatish"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:749 src/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
+#: src/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "Chapga burish"
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:764 src/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
+#: src/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "O'nga burish"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:779 src/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr ""
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:781
 msgid "Crop"
 msgstr "Kesish"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "Мослашлар"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr ""
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr ""
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr ""
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1260
 msgid "Quality:"
 msgstr ""
 
@@ -296,7 +298,7 @@ msgstr ""
 msgid "Document Scanner"
 msgstr ""
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr ""
 
@@ -308,7 +310,7 @@ msgstr ""
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 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 "
@@ -316,198 +318,198 @@ msgid ""
 "formats."
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 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:389
 msgid "Failed to scan"
 msgstr ""
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:630
 #, 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"
@@ -524,205 +526,205 @@ msgid ""
 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:2182
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/vi.gmo b/po/vi.gmo
deleted file mode 100644
index e1bedaa..0000000
--- a/po/vi.gmo
+++ /dev/null
diff --git a/po/vi.po b/po/vi.po
index f215d14..91601d1 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,288 +7,290 @@ 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: 2012-07-23 09:09+0000\n"
-"Last-Translator: Robert Ancell <robert.ancell@canonical.com>\n"
+"POT-Creation-Date: 2017-03-27 22:33+1300\n"
+"PO-Revision-Date: 2017-03-29 06:42+0000\n"
+"Last-Translator: Vu Do Quynh <vdquynh@gmail.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-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:11+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "_Xác thực"
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
-msgstr ""
+msgstr "_Username cho tài nguyên:"
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/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:188
+#: src/simple-scan.ui:188
 msgid "Front and Back"
-msgstr ""
+msgstr "Hai mặt trang"
 
 #. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
+#: src/simple-scan.ui:192
 msgid "Front"
-msgstr ""
+msgstr "Mặt trước"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/simple-scan.ui:196
 msgid "Back"
-msgstr ""
+msgstr "Mặt sau"
 
 #. 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
+#: src/simple-scan.ui:225 src/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:241
+#: src/simple-scan.ui:241
 msgid "_Document"
 msgstr "_Tài liệu"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/simple-scan.ui:260
 msgid "Sc_an"
-msgstr ""
+msgstr "Q_ué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:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
+#: src/simple-scan.ui:273 src/simple-scan.ui:1306 src/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:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
+#: src/simple-scan.ui:283 src/simple-scan.ui:1315 src/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:294
+#: src/simple-scan.ui:294
 msgid "_Stop Scan"
-msgstr ""
+msgstr "_Dừng Quét hình"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:310 src/simple-scan.ui:1330 src/simple-scan.ui:1380
 msgid "Text"
 msgstr "Văn bản"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:320 src/simple-scan.ui:1340 src/simple-scan.ui:1390
 msgid "Photo"
 msgstr "Ảnh chụp"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/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
+#: src/simple-scan.ui:367
 msgid "_Email"
-msgstr ""
+msgstr "_Thư điện tử"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:430
 msgid "_Page"
 msgstr "_Trang"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "Xoay _trái"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "Xoay _Phải"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:460
 msgid "_Crop"
 msgstr "_Xén"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:470
 msgid "_None"
 msgstr "_Không có"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:514
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:536
 msgid "4×6"
 msgstr ""
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:547
 msgid "_Custom"
 msgstr "Tự _chọn"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/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:578
+#: src/simple-scan.ui:578
 msgid "Move Left"
-msgstr ""
+msgstr "Sang trái"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/simple-scan.ui:587
 msgid "Move Right"
-msgstr ""
+msgstr "Sang phải"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:624
 msgid "_Help"
 msgstr "_Trợ giúp"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:632
 msgid "_Contents"
-msgstr ""
+msgstr "_Nội dung"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:674 src/simple-scan.ui:885
 msgid "Start a new document"
-msgstr ""
+msgstr "Bắt đầu tài liệu mới"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:675
 msgid "New"
-msgstr ""
+msgstr "Mới"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:689 src/simple-scan.ui:836
 msgid "Scan a single page from the scanner"
-msgstr ""
+msgstr "Quét một trang đơn từ máy quét hình"
 
 #. Label on scan toolbar item
-#: data/simple-scan.ui:691 data/simple-scan.ui:837
+#: src/simple-scan.ui:691 src/simple-scan.ui:837
 msgid "Scan"
-msgstr ""
+msgstr "Quét"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:707 src/simple-scan.ui:864
 msgid "Save document to a file"
-msgstr ""
+msgstr "Ghi tài liệu ra tệp"
 
-#: ../src/ui.vala:1842
+#: src/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
-msgstr ""
+msgstr "Lưu"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/simple-scan.ui:724 src/simple-scan.ui:824
 msgid "Stop the current scan"
-msgstr ""
+msgstr "Dừng quét hình"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:725 src/simple-scan.ui:825
 msgid "Stop"
-msgstr ""
+msgstr "Dừng"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:749 src/simple-scan.ui:936
 msgid "Rotate the page to the left (counter-clockwise)"
-msgstr ""
+msgstr "Xoay trang hướng bên trái (đi ngược kim đồng hồ)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: data/simple-scan.ui:750
+#: src/simple-scan.ui:750
 msgid "Rotate Left"
-msgstr ""
+msgstr "Xoay trái"
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:764 src/simple-scan.ui:914
 msgid "Rotate the page to the right (clockwise)"
-msgstr ""
+msgstr "Xoay trang hướng bên phải (đi theo kim đồng hồ)"
 
 #. Label on rotate page right (clockwise) item
-#: data/simple-scan.ui:765
+#: src/simple-scan.ui:765
 msgid "Rotate Right"
-msgstr ""
+msgstr "Xoay phải"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:779 src/simple-scan.ui:963
 msgid "Crop the selected page"
-msgstr ""
+msgstr "Xén trang đã chọn"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:781
 msgid "Crop"
-msgstr ""
+msgstr "Xén"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/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:1048
+#: src/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "Quét _Nguồn:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1079
 msgid "_Text Resolution:"
-msgstr ""
+msgstr "Độ Phân giải _Văn bản"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1095
 msgid "_Photo Resolution:"
-msgstr ""
+msgstr "Độ _Phân giải Ảnh"
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1139
 msgid "Scan Side:"
-msgstr ""
+msgstr "Quét mặt:"
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1169
 msgid "Page Size:"
-msgstr ""
+msgstr "Cỡ trang:"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "Độ sáng:"
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "Độ tương phản:"
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "Chất lượng:"
 
@@ -296,9 +298,9 @@ msgstr "Chất lượng:"
 msgid "Document Scanner"
 msgstr ""
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
-msgstr ""
+msgstr "Quét tài liệu"
 
 #: data/simple-scan.desktop.in:6
 msgid "scan;scanner;flatbed;adf;"
@@ -308,7 +310,7 @@ msgstr ""
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 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 "
@@ -316,198 +318,198 @@ msgid ""
 "formats."
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 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 ""
+msgstr "Không có máy quét hình. Vui lòng nối máy quét hình."
 
 #. 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:389
 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:619
 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:630
 #, 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 ""
+msgstr "Tệp Hình ảnh"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:527
 msgid "All Files"
-msgstr ""
+msgstr "Tất cả Tệp"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:536
 msgid "PDF (multi-page document)"
-msgstr ""
+msgstr "PDF (tài liệu nhiều trang)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:542
 msgid "JPEG (compressed)"
-msgstr ""
+msgstr "JPEG (nén)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:548
 msgid "PNG (lossless)"
-msgstr ""
+msgstr "PNG (giữ chất lượng)"
 
 #. 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 ""
+msgstr "Nếu không lưu, các thay đổi sẽ bị mất hoàn toàn."
 
 #. 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 ""
+msgstr "Lưu tài liệu hiện tại?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:710
 msgid "Discard Changes"
-msgstr ""
+msgstr "Bỏ qua Thay đổi"
 
 #. 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 ""
+msgstr "Không mở được ứng dụng xem thử hình trước"
 
 #. 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 ""
+msgstr "Không thể mở tập tin trợ giúp"
 
 #. 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"
@@ -536,16 +538,16 @@ msgstr ""
 "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"
@@ -554,189 +556,189 @@ msgstr ""
 "  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 ""
+msgstr "Lưu tài liệu trước khi thoát?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1511
 msgid "Quit without Saving"
-msgstr ""
+msgstr "Thoát không Lưu"
 
 #. 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 ""
+msgstr "%d dpi (mặc định)"
 
 #. 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 dpi (nháp)"
 
 #. 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 dpi (độ phân giải cao)"
 
 #. 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 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 ""
+msgstr "Thay đổi thiết bị _Quét hình"
 
 #. 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 ""
+msgstr "Tự động"
 
-#: ../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:2182
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo
deleted file mode 100644
index c7ff543..0000000
--- a/po/zh_CN.gmo
+++ /dev/null
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 897a632..9a1e7f3 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,289 +7,291 @@ 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"
+"POT-Creation-Date: 2017-03-27 22:33+1300\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-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:11+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
 "Language: zh_CN\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "认证(_A)"
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "资源用户名(_U)："
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr "密码(_P)："
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/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
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr "正面"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/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
+#: src/simple-scan.ui:225 src/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
+#: src/simple-scan.ui:241
 msgid "_Document"
 msgstr "文档(_D)"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/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
+#: src/simple-scan.ui:273 src/simple-scan.ui:1306 src/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
+#: src/simple-scan.ui:283 src/simple-scan.ui:1315 src/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr "传送来的所有页面(_F)"
 
 #. Menu entry to stop current scan
-#: data/simple-scan.ui:294
+#: src/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "停止扫描(_S)"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:310 src/simple-scan.ui:1330 src/simple-scan.ui:1380
 msgid "Text"
 msgstr "文本"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:320 src/simple-scan.ui:1340 src/simple-scan.ui:1390
 msgid "Photo"
 msgstr "照片"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/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
+#: src/simple-scan.ui:367
 msgid "_Email"
 msgstr "电子邮件(_E)"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:430
 msgid "_Page"
 msgstr "页面(_P)"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "向左旋转(_L)"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "向右旋转(_R)"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:460
 msgid "_Crop"
 msgstr "剪裁(_C)"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:470
 msgid "_None"
 msgstr "无(_N)"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:514
 msgid "_Letter"
 msgstr "信件(_L)"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "法定(_G)"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:536
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:547
 msgid "_Custom"
 msgstr "自定义(_C)"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr "旋转剪裁(_R)"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/simple-scan.ui:578
 msgid "Move Left"
 msgstr "左移"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/simple-scan.ui:587
 msgid "Move Right"
 msgstr "右移"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:624
 msgid "_Help"
 msgstr "帮助(_H)"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:632
 msgid "_Contents"
 msgstr "内容(_C)"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:674 src/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "开始一个新的文档"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:675
 msgid "New"
 msgstr "新建"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:689 src/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
+#: src/simple-scan.ui:691 src/simple-scan.ui:837
 msgid "Scan"
 msgstr "扫描"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:707 src/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "将文档保存为文件"
 
-#: ../src/ui.vala:1842
+#: src/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
+#: src/simple-scan.ui:724 src/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "停止当前扫描"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:725 src/simple-scan.ui:825
 msgid "Stop"
 msgstr "停止"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:749 src/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
+#: src/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "逆时针旋转"
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:764 src/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
+#: src/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "顺时针旋转"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:779 src/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "裁剪选中的页面"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:781
 msgid "Crop"
 msgstr "剪裁"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "首选项"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "扫描来源(_O)："
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "文字分辨率(_T)："
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "图像分辨率(_P)："
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "扫描页面："
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "页面大小："
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "亮度："
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "对比度："
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "质量："
 
@@ -297,7 +299,7 @@ msgstr "质量："
 msgid "Document Scanner"
 msgstr "文档扫描仪"
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr "扫描文档"
 
@@ -309,7 +311,7 @@ msgstr "scan;scanner;flatbed;adf;扫描;扫描仪;"
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 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 "
@@ -319,196 +321,196 @@ msgstr ""
 "一个非常简单的方法来同时扫描文档和照片。如果图片显示有误，您可以根据需要通过裁剪、旋转等方式调整照片。您也可以打印扫描件、导出 PDF "
 "格式、或者保存为图片。"
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 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:389
 msgid "Failed to scan"
 msgstr "扫描失败"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[设备...] - 扫描工具"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:630
 #, 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"
@@ -534,16 +536,16 @@ 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"
@@ -565,189 +567,189 @@ msgstr ""
 "  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:2182
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "正在保存 %d/%d 页"
diff --git a/po/zh_HK.gmo b/po/zh_HK.gmo
deleted file mode 100644
index 24726a6..0000000
--- a/po/zh_HK.gmo
+++ /dev/null
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 4239257..f307dbc 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -7,288 +7,290 @@ 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"
+"POT-Creation-Date: 2017-03-27 22:33+1300\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-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:11+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "授權(_A)"
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "資源的使用者名稱(_U)："
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr "密碼(_P)："
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/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
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr "正面"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/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
+#: src/simple-scan.ui:225 src/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
+#: src/simple-scan.ui:241
 msgid "_Document"
 msgstr "文件(_D)"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/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
+#: src/simple-scan.ui:273 src/simple-scan.ui:1306 src/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
+#: src/simple-scan.ui:283 src/simple-scan.ui:1315 src/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr "來自進紙匣的所有頁面(_F)"
 
 #. Menu entry to stop current scan
-#: data/simple-scan.ui:294
+#: src/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "停止掃描(_S)"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:310 src/simple-scan.ui:1330 src/simple-scan.ui:1380
 msgid "Text"
 msgstr "文字"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:320 src/simple-scan.ui:1340 src/simple-scan.ui:1390
 msgid "Photo"
 msgstr "相片"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/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
+#: src/simple-scan.ui:367
 msgid "_Email"
 msgstr "電子郵件(_E)"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:430
 msgid "_Page"
 msgstr "頁面(_P)"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "向左旋轉(_L)"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "向右旋轉(_R)"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:460
 msgid "_Crop"
 msgstr "裁切(_C)"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:470
 msgid "_None"
 msgstr "無(_N)"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:514
 msgid "_Letter"
 msgstr "美規信紙(_Letter)"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "美規長信紙(Le_gal)"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:536
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:547
 msgid "_Custom"
 msgstr "自訂(_C)"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr "旋轉裁切區域(_R)"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/simple-scan.ui:578
 msgid "Move Left"
 msgstr "左移"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/simple-scan.ui:587
 msgid "Move Right"
 msgstr "右移"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:624
 msgid "_Help"
 msgstr "求助(_H)"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:632
 msgid "_Contents"
 msgstr "內容(_C)"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:674 src/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "起始一份新文件"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:675
 msgid "New"
 msgstr "新增"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:689 src/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
+#: src/simple-scan.ui:691 src/simple-scan.ui:837
 msgid "Scan"
 msgstr "掃描"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:707 src/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "將文件儲存到檔案"
 
-#: ../src/ui.vala:1842
+#: src/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
+#: src/simple-scan.ui:724 src/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "停止目前的掃描"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:725 src/simple-scan.ui:825
 msgid "Stop"
 msgstr "停止"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:749 src/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
+#: src/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "向左旋轉"
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:764 src/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
+#: src/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "向右旋轉"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:779 src/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "裁切所選的頁面"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:781
 msgid "Crop"
 msgstr "裁切"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "偏好設定"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "掃描來源(_O)："
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "文字解像度(_T)："
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "相片解像度(_P)："
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "掃描面："
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "頁面大小："
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "亮度："
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "對比度："
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "品質："
 
@@ -296,7 +298,7 @@ msgstr "品質："
 msgid "Document Scanner"
 msgstr "文件掃描器"
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr "掃描文件"
 
@@ -308,7 +310,7 @@ msgstr "scan;scanner;flatbed;adf;"
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 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 "
@@ -317,196 +319,196 @@ msgid ""
 msgstr ""
 "你能輕易地掃描文件和相片。你可以裁剪相片的不良部分並將之旋轉至正確角度。你可以列印你的掃描檔，將掃描檔匯出成 pdf，或儲存為多種圖像檔案格式。"
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 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:389
 msgid "Failed to scan"
 msgstr "掃描失敗"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[裝置...] - 掃描公用程式"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:630
 #, 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"
@@ -529,16 +531,16 @@ msgstr ""
 "你應已收到附隨於本程式的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"
@@ -548,22 +550,22 @@ msgstr ""
 "  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>."
@@ -571,12 +573,12 @@ 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>."
@@ -584,155 +586,155 @@ 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:2182
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "正在儲存 %d / %d"
diff --git a/po/zh_TW.gmo b/po/zh_TW.gmo
deleted file mode 100644
index 26da286..0000000
--- a/po/zh_TW.gmo
+++ /dev/null
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 2525b90..b09a252 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,288 +7,290 @@ 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"
+"POT-Creation-Date: 2017-03-27 22:33+1300\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-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
+"X-Launchpad-Export-Date: 2017-04-19 06:11+0000\n"
+"X-Generator: Launchpad (build 18354)\n"
 
 #. Button to submit authorization dialog
-#: data/simple-scan.ui:24
+#: src/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "授權(_A)"
 
 #. Label beside username entry
-#: data/simple-scan.ui:102
+#: src/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "資源的使用者名稱(_U)："
 
 #. Label beside password entry
-#: data/simple-scan.ui:117
+#: src/simple-scan.ui:117
 msgid "_Password:"
 msgstr "密碼(_P)："
 
 #. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
+#: src/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
+#: src/simple-scan.ui:192
 msgid "Front"
 msgstr "正面"
 
 #. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
+#: src/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
+#: src/simple-scan.ui:225 src/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
+#: src/simple-scan.ui:241
 msgid "_Document"
 msgstr "文件(_D)"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/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
+#: src/simple-scan.ui:273 src/simple-scan.ui:1306 src/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
+#: src/simple-scan.ui:283 src/simple-scan.ui:1315 src/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr "來自進紙匣的所有頁面(_F)"
 
 #. Menu entry to stop current scan
-#: data/simple-scan.ui:294
+#: src/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "停止掃描(_S)"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/simple-scan.ui:310 src/simple-scan.ui:1330 src/simple-scan.ui:1380
 msgid "Text"
 msgstr "文字"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/simple-scan.ui:320 src/simple-scan.ui:1340 src/simple-scan.ui:1390
 msgid "Photo"
 msgstr "相片"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/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
+#: src/simple-scan.ui:367
 msgid "_Email"
 msgstr "電子郵件(_E)"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:430
 msgid "_Page"
 msgstr "頁面(_P)"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "向左旋轉(_L)"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "向右旋轉(_R)"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:460
 msgid "_Crop"
 msgstr "裁切(_C)"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:470
 msgid "_None"
 msgstr "無(_N)"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:514
 msgid "_Letter"
 msgstr "美規信紙(_Letter)"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "美規長信紙(Le_gal)"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:536
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:547
 msgid "_Custom"
 msgstr "自訂(_C)"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr "旋轉裁切區域(_R)"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/simple-scan.ui:578
 msgid "Move Left"
 msgstr "左移"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/simple-scan.ui:587
 msgid "Move Right"
 msgstr "右移"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:624
 msgid "_Help"
 msgstr "幫助(_H)"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:632
 msgid "_Contents"
 msgstr "內容(_C)"
 
 #. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
+#: src/simple-scan.ui:674 src/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "起始一份新文件"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:675
 msgid "New"
 msgstr "新增"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/simple-scan.ui:689 src/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
+#: src/simple-scan.ui:691 src/simple-scan.ui:837
 msgid "Scan"
 msgstr "掃描"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/simple-scan.ui:707 src/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "將文件儲存至檔案"
 
-#: ../src/ui.vala:1842
+#: src/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
+#: src/simple-scan.ui:724 src/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "停止目前的掃描"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:725 src/simple-scan.ui:825
 msgid "Stop"
 msgstr "停止"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
+#: src/simple-scan.ui:749 src/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
+#: src/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "向左旋轉"
 
 #. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
+#: src/simple-scan.ui:764 src/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
+#: src/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "向右旋轉"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
+#: src/simple-scan.ui:779 src/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "裁切所選的頁面"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:781
 msgid "Crop"
 msgstr "裁切"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "偏好設定"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "掃描來源(_O)："
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "文字解析度(_T)："
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "相片解析度(_P)："
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "掃描面："
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "頁面大小："
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "亮度："
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "反差："
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "品質："
 
@@ -296,7 +298,7 @@ msgstr "品質："
 msgid "Document Scanner"
 msgstr "文件掃描"
 
-#: data/simple-scan.desktop.in:5
+#: data/simple-scan.desktop.in:5 data/simple-scan.appdata.xml.in:7
 msgid "Scan Documents"
 msgstr "掃描文件"
 
@@ -308,7 +310,7 @@ msgstr "scan;scanner;flatbed;adf;"
 msgid "scanner"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
+#: data/simple-scan.appdata.xml.in:9
 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 "
@@ -317,196 +319,196 @@ msgid ""
 msgstr ""
 "您能輕易地掃描文件和相片。您可以裁剪相片的不良部分並將之旋轉至正確角度。您可以列印您的掃描檔，將掃描檔匯出成 pdf，或儲存為多種圖像檔案格式。"
 
-#: data/simple-scan.appdata.xml.in:13
+#: data/simple-scan.appdata.xml.in:14
 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:389
 msgid "Failed to scan"
 msgstr "掃描失敗"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:619
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[裝置...] - 掃描公用程式"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:630
 #, 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"
@@ -529,16 +531,16 @@ msgstr ""
 "您應已收到附隨於本程式的 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"
@@ -552,22 +554,22 @@ msgstr ""
 "  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>."
@@ -575,12 +577,12 @@ 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>."
@@ -588,155 +590,155 @@ 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:2182
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "正在儲存 %2$d 頁中的第 %1$d 頁"