Merge branch 'feature/upstream' into develop

159 files changed, 33531 insertions, 24261 deletions

diff --git a/po/LINGUAS b/po/LINGUAS
index 8dd4768..4a555bf 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -17,9 +17,10 @@ eo
 es
 et
 eu
+fa
 fi
-fr_CA
 fr
+fur
 gd
 gl
 he
@@ -40,6 +41,7 @@ mhr
 ms
 my
 nb
+ne
 nl
 oc
 pa
@@ -55,6 +57,7 @@ sk
 sl
 sq
 sr
+sr@latin
 sv
 ta
 te
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
index 21db722..79d6710 100644
--- a/po/Makevars
+++ b/po/Makevars
@@ -8,7 +8,7 @@ subdir = po
 top_builddir = ..
 
 # These options get passed to xgettext.
-XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ --from-code=UTF-8
+XGETTEXT_OPTIONS = --from-code=UTF-8 --keyword=_ --keyword=N_ --keyword=C_:1c,2 --keyword=NC_:1c,2 --keyword=g_dngettext:2,3 --add-comments
 
 # 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
@@ -18,14 +18,14 @@ XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ --from-code=UTF-8
 # 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>
+COPYRIGHT_HOLDER = Simple Scan contributors
 
 # 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 =
+PACKAGE_GNU = no
 
 # This is the email address or URL to which the translators shall report
 # bugs in the untranslated strings:
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 5963914..b99bb37 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,12 +1,15 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
-data/simple-scan.ui
-data/simple-scan.desktop.in
+data/org.gnome.SimpleScan.gschema.xml
 data/simple-scan.appdata.xml.in
+data/simple-scan.desktop.in
+src/app-window.ui
+src/app-window.vala
+src/authorize-dialog.ui
 src/book.vala
-src/book-view.vala
+src/help-overlay.ui
 src/page.vala
-src/page-view.vala
+src/preferences-dialog.ui
+src/preferences-dialog.vala
 src/scanner.vala
 src/simple-scan.vala
-src/ui.vala
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
new file mode 100644
index 0000000..ab5237f
--- /dev/null
+++ b/po/POTFILES.skip
@@ -0,0 +1,8 @@
+# List of source files that should *not* be translated.
+# Please keep this file sorted alphabetically.
+src/app-window.c
+src/book.c
+src/page.c
+src/preferences-dialog.c
+src/scanner.c
+src/simple-scan.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..74e8ef9 100644
--- a/po/af.po
+++ b/po/af.po
@@ -7,296 +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"
+"POT-Creation-Date: 2017-04-16 08:54-0400\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"
+"Language: af\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-25 06:09+0000\n"
+"X-Generator: Launchpad (build 18361)\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:231 src/simple-scan.ui:815 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:247
 msgid "_Document"
 msgstr "_Dokument"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/simple-scan.ui:266
 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:279 src/simple-scan.ui:1343 src/simple-scan.ui:1402
 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:289 src/simple-scan.ui:1352 src/simple-scan.ui:1411
 msgid "All Pages From _Feeder"
 msgstr "Alle Bladsye Vanaf _Voerder"
 
+#. 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 "_Staak skandering"
 
-#: 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 "Teks"
 
-#: 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 "Foto"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: 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 "_E-pos"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:436
 msgid "_Page"
 msgstr "_Bladsy"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:446
 msgid "Rotate _Left"
 msgstr "Roteer _linksom"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:456
 msgid "Rotate _Right"
 msgstr "Roteer _regsom"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:466
 msgid "_Crop"
 msgstr "_Insny"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:476
 msgid "_None"
 msgstr "_Geen"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:487
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:498
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:509
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:520
 msgid "_Letter"
 msgstr "_Letter (VSA)"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:531
 msgid "Le_gal"
 msgstr "Le_gal (VSA)"
 
 #. 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 "_Pasmaak"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:571
 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: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 "Beweeg na regs"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:630
 msgid "_Help"
 msgstr "_Hulp"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:638
 msgid "_Contents"
 msgstr "_Inhoud"
 
 #. 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 "Begin 'n nuwe dokument"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:681
 msgid "New"
 msgstr "Nuwe"
 
 #. 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 "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:697 src/simple-scan.ui:843
 msgid "Scan"
 msgstr "Skandeer"
 
 #. 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 "Stoor dokument na 'n lêer"
 
-#: ../src/ui.vala:1842
+#: src/simple-scan.ui:715 src/ui.vala:1892
 msgid "Save"
 msgstr "Stoor"
 
 #. 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 "Staak huidige skandering"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:731 src/simple-scan.ui:831
 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:755 src/simple-scan.ui:942
 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:756
 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:770 src/simple-scan.ui:920
 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:771
 msgid "Rotate Right"
 msgstr "Roteer regsom"
 
-#: 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 "Snoei die gekose bladsy"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:787
 msgid "Crop"
 msgstr "Insny"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:1003 src/ui.vala:1898
 msgid "Preferences"
 msgstr "Voorkeure"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1054
 msgid "Scan S_ource:"
 msgstr "Skandeer B_ron"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1085
 msgid "_Text Resolution:"
 msgstr "_Teks resolusie"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1101
 msgid "_Photo Resolution:"
 msgstr "_Foto resolusie:"
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1145
 msgid "Scan Side:"
 msgstr "Skandeer Kant:"
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1175
 msgid "Page Size:"
 msgstr "Bladsy grootte:"
 
 #. 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 "Skandeer dokumente"
 
@@ -308,7 +322,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 +330,207 @@ 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:844
 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:874
 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:1227
 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:1240 src/scanner.vala:1340
 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:332 src/ui.vala:1655 src/ui.vala:1935
 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:341
 #, 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:389
 msgid "No scanners detected"
 msgstr ""
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:391
 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:396
 msgid "Additional software needed"
 msgstr ""
 
 #. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:398
 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:510
 msgid "Save As..."
 msgstr "Stoor as..."
 
-#: ../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 ""
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:522
 msgid "Scanned Document.pdf"
 msgstr "Geskandeerde dokument.pdf"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:528
 msgid "Image Files"
 msgstr "Beeldlêers"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:534
 msgid "All Files"
 msgstr "Alle lêers"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:543
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:549
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:555
 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: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:650
+#: src/ui.vala:698
 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:721
 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:763
 msgid "Save current document?"
 msgstr ""
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:765
 msgid "Discard Changes"
 msgstr ""
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:1056
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1068
 msgid "Unable to open image preview application"
 msgstr ""
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1270
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1280
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1290
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1300
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1504
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: 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"
@@ -522,16 +547,16 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1528
 msgid "About Simple Scan"
 msgstr "Aangaande Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1531
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1540
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -544,189 +569,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:1562
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1564
 msgid "Quit without Saving"
 msgstr ""
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1632
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1634
 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:1638
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1640
 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:1644
 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:1649
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1651
 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:1655
 msgid "Install drivers"
 msgstr ""
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1686
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1698
 msgid "Installing drivers..."
 msgstr ""
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1706
 msgid "Drivers installed successfully!"
 msgstr ""
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1716
 #, 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:1722
 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:1729
 #, 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:1833
 #, 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:1836
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1839
 #, 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:1842
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../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 ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1937
 msgid "Change _Scanner"
 msgstr "Verander _skandeerder"
 
 #. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1939
 msgid "_Install Drivers"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: 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/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..3583525 100644
--- a/po/am.po
+++ b/po/am.po
@@ -7,296 +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"
+"POT-Creation-Date: 2017-04-16 08:54-0400\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"
+"Language: am\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-25 06:09+0000\n"
+"X-Generator: Launchpad (build 18361)\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
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: 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 "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:498
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:509
 msgid "A_6"
 msgstr "A_6"
 
 #. 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 "4×6"
 
 #. 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 "ሰነድ ወደ ፋይል ማስቀመጫ"
 
-#: ../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 "መከርከሚያ"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: 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 "ሰነድ ማሰሻ"
 
@@ -308,7 +322,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 +330,207 @@ 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:844
 msgid "No scanners available.  Please connect a scanner."
-msgstr ""
+msgstr "ዝግጁ ማሰሻ አልተገኘም: እባክዎን ማሰሻ ያገናኙ"
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:874
 msgid "Unable to connect to scanner"
-msgstr ""
+msgstr "ከ ማሰሻ ጋር መገናኘት አልተቻለም"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1227
 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:1240 src/scanner.vala:1340
 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:332 src/ui.vala:1655 src/ui.vala:1935
 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:341
 #, 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:389
 msgid "No scanners detected"
 msgstr "ምንም ማሰሻ አልተገኘም"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:391
 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:396
 msgid "Additional software needed"
-msgstr ""
+msgstr "ተጨማሪ ሶፍትዌር ያስፈልጋል"
 
 #. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:398
 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: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 "_ማሰቀመጫ"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:522
 msgid "Scanned Document.pdf"
-msgstr ""
+msgstr "የ ታሰሱ ሰነዶች.pdf"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:528
 msgid "Image Files"
 msgstr "የምስል ፋይሎች"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:534
 msgid "All Files"
 msgstr "ሁሉንም ፋይሎች"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:543
 msgid "PDF (multi-page document)"
 msgstr "PDF (በርካት-ገጽ ሰነድ)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:549
 msgid "JPEG (compressed)"
 msgstr "JPEG (የታመቀ)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:555
 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: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:650
+#: src/ui.vala:698
 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:721
 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:763
 msgid "Save current document?"
 msgstr "የ አሁኑን ሰነድ ላስቀምጠው?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:765
 msgid "Discard Changes"
 msgstr "ለውጦቹን ማስወገጃ"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:1056
 msgid "Unable to save image for preview"
-msgstr ""
+msgstr "ምስል ለ ቅድመ እይታ ማስቀመጥ አልተቻለም"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1068
 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:1270
 msgid "Combine sides"
-msgstr ""
+msgstr "ጎኖች መቀላቀያ"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1280
 msgid "Combine sides (reverse)"
-msgstr ""
+msgstr "ጎኖች መቀላቀያ (በ ግልባጭ)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1290
 msgid "Reverse"
-msgstr ""
+msgstr "በ ግልባጭ"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1300
 msgid "Keep unchanged"
-msgstr ""
+msgstr "ሳይቀየር ማስቀመጫ"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1504
 msgid "Unable to open help file"
-msgstr ""
+msgstr "የ እርዳታ ፋይል መክፈት አልተቻለም"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: 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"
@@ -520,210 +545,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:1528
 msgid "About Simple Scan"
 msgstr "ሰለ ቀላል ማሰሻ"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1531
 msgid "Simple document scanning tool"
 msgstr "የ ቀላል ሰነድ ማሰሻ መሳሪያ"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1540
 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:1562
 msgid "Save document before quitting?"
-msgstr ""
+msgstr "ሰነዱን ላስቀምጥ ከ መጥፋቱ በፊት?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1564
 msgid "Quit without Saving"
-msgstr ""
+msgstr "ሳይቀምጥ ላጥፋው?"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1632
 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:1634
 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:1638
 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:1640
 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:1644
 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:1649
 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:1651
 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:1655
 msgid "Install drivers"
-msgstr ""
+msgstr "Drivers መግጠሚያ"
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1686
 msgid "Once installed you will need to restart Simple Scan."
-msgstr ""
+msgstr "እርስዎ ከ ገጠሙ በኋላ ቀላል ማሰሻን እንደገና ማስነሳት ያስፈልጋል"
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1698
 msgid "Installing drivers..."
-msgstr ""
+msgstr "በ መግጠም ላይ drivers..."
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1706
 msgid "Drivers installed successfully!"
-msgstr ""
+msgstr "Drivers ተሳክቶ ተገጥሟል!"
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1716
 #, 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:1722
 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:1729
 #, 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:1833
 #, 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:1836
 #, 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:1839
 #, 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:1842
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../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 "ማጥፊያ"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1937
 msgid "Change _Scanner"
 msgstr "_ማሰሻ መቀየሪያ"
 
 #. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1939
 msgid "_Install Drivers"
-msgstr ""
+msgstr "Drivers መግጠሚያ"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1945
 msgid "Automatic"
 msgstr "ራሱ በራሱ"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1995
 msgid "Darker"
-msgstr ""
+msgstr "ማጥቆሪያ"
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1997
 msgid "Lighter"
-msgstr ""
+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 ""
+msgstr "ከፍተኛ"
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2068
 msgid "Saving document..."
-msgstr ""
+msgstr "ሰነድ በማስቀመጥ ላይ..."
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2242
 #, 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..6d80901 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -7,296 +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 08:56+0000\n"
-"Last-Translator: Khaled Hosny <khaledhosny@eglug.org>\n"
+"POT-Creation-Date: 2017-04-16 08:54-0400\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"
+"Language: ar\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-25 06:09+0000\n"
+"X-Generator: Launchpad (build 18361)\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
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: 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 "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:498
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:509
 msgid "A_6"
 msgstr "A_6"
 
 #. 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 ""
+msgstr "4×6"
 
 #. 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 "احفظ المستند في ملف"
 
-#: ../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 "اقتصاص"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: 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 ""
+msgstr "السطوع:"
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1235
 msgid "Contrast:"
-msgstr ""
+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 "امسح المستندات"
 
@@ -308,7 +322,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 +330,207 @@ 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:844
 msgid "No scanners available.  Please connect a scanner."
 msgstr "لا توجد أي ماسحات. من فضلك وصّل ماسحة."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:874
 msgid "Unable to connect to scanner"
 msgstr "تعذّر الاتصال بالماسحة"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1227
 msgid "Unable to start scan"
 msgstr "تعذّر بدء المسح"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: 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
+#: 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:332 src/ui.vala:1655 src/ui.vala:1935
 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:341
 #, 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:389
 msgid "No scanners detected"
 msgstr "لم يُعثر على أي ماسحة"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:391
 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:396
 msgid "Additional software needed"
 msgstr ""
 
 #. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:398
 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: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 ""
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:522
 msgid "Scanned Document.pdf"
 msgstr "مستند ممسوح.pdf"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:528
 msgid "Image Files"
 msgstr "ملفات الصور"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:534
 msgid "All Files"
 msgstr "كل الملفات"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:543
 msgid "PDF (multi-page document)"
 msgstr "PDF‏ (مستند متعدد الصفحات)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:549
 msgid "JPEG (compressed)"
 msgstr "‏JPEG (مضغوط)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:555
 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: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:650
+#: src/ui.vala:698
 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:721
 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:763
 msgid "Save current document?"
 msgstr "أأحفظ المستند الحالي؟"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:765
 msgid "Discard Changes"
 msgstr "ارفض التغيرات"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:1056
 msgid "Unable to save image for preview"
 msgstr "تعذّر حفظ الصورة للمعاينة"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1068
 msgid "Unable to open image preview application"
 msgstr "تعذر فتح معاين الصور"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1270
 msgid "Combine sides"
-msgstr ""
+msgstr "مزج الجهتين"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1280
 msgid "Combine sides (reverse)"
-msgstr ""
+msgstr "مزج الجهتين (عكسي)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1290
 msgid "Reverse"
-msgstr ""
+msgstr "عكس"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1300
 msgid "Keep unchanged"
-msgstr ""
+msgstr "أبق بدون تعديل"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1504
 msgid "Unable to open help file"
 msgstr "تعذّر فتح ملف المساعدة"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: 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"
@@ -532,16 +557,16 @@ msgstr ""
 "إذا لم يحدث هذا فانظر <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1528
 msgid "About Simple Scan"
 msgstr "عن \"الماسحة الضوئية\""
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1531
 msgid "Simple document scanning tool"
 msgstr "أداة بسيطة لمسح المستندات"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1540
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -558,189 +583,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:1562
 msgid "Save document before quitting?"
 msgstr "هل ترغب بحفظ المستند قبل الخروج؟"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1564
 msgid "Quit without Saving"
 msgstr "أُخرج دون حفظ"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1632
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1634
 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:1638
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1640
 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:1644
 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:1649
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1651
 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:1655
 msgid "Install drivers"
 msgstr ""
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1686
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1698
 msgid "Installing drivers..."
 msgstr ""
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1706
 msgid "Drivers installed successfully!"
 msgstr ""
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1716
 #, 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:1722
 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:1729
 #, 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:1833
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d نقطة\\بوصة (مبدئي)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1836
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d نقطة\\بوصة (مسودة)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1839
 #, 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:1842
 #, c-format
 msgid "%d dpi"
 msgstr "%d نقطة\\بوصة"
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1885
 msgid "New Document"
-msgstr ""
+msgstr "مستند جديد"
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1890
 msgid "Document"
-msgstr ""
+msgstr "مستند"
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1893
 msgid "Email..."
-msgstr ""
+msgstr "إيميل..."
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1894
 msgid "Print..."
-msgstr ""
+msgstr "طباعة..."
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1902
 msgid "Help"
-msgstr ""
+msgstr "مساعدة"
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1903
 msgid "About"
-msgstr ""
+msgstr "حول"
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1904
 msgid "Quit"
-msgstr ""
+msgstr "خروج"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1937
 msgid "Change _Scanner"
 msgstr "غيّر _الماسحة"
 
 #. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1939
 msgid "_Install Drivers"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1945
 msgid "Automatic"
 msgstr "آلي"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1995
 msgid "Darker"
-msgstr ""
+msgstr "أغمق"
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1997
 msgid "Lighter"
-msgstr ""
+msgstr "اقتح"
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:2005
 msgid "Less"
-msgstr ""
+msgstr "أقل"
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:2007
 msgid "More"
-msgstr ""
+msgstr "أكثر"
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:2015
 msgid "Minimum"
-msgstr ""
+msgstr "الأدنى"
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:2017
 msgid "Maximum"
-msgstr ""
+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 "يحفظ الصفحة %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..2c14603 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -7,298 +7,312 @@ 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-04-16 08:54-0400\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"
+"Language: ast\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-25 06:09+0000\n"
+"X-Generator: Launchpad (build 18361)\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:231 src/simple-scan.ui:815 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:247
 msgid "_Document"
 msgstr "_Documentu"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/simple-scan.ui:266
 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:279 src/simple-scan.ui:1343 src/simple-scan.ui:1402
 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:289 src/simple-scan.ui:1352 src/simple-scan.ui:1411
 msgid "All Pages From _Feeder"
 msgstr "Tol_es páxines dende l'alimentador"
 
+#. 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 ""
+msgstr "_Parar d'escanear"
 
-#: 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 "Testu"
 
-#: 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 "Semeya"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/simple-scan.ui:352 src/ui.vala:1247 src/ui.vala:1891
 msgid "Reorder Pages"
 msgstr "Reordenar les páxines"
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/simple-scan.ui:371
 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:436
 msgid "_Page"
 msgstr "_Páxina"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:446
 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:456
 msgid "Rotate _Right"
 msgstr "Voltiar a la _Drecha"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:466
 msgid "_Crop"
 msgstr "_Recortar"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:476
 msgid "_None"
 msgstr "_Dengún"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:487
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:498
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:509
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:520
 msgid "_Letter"
 msgstr "_Carta"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:531
 msgid "Le_gal"
 msgstr "Lle_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:542
 msgid "4×6"
 msgstr "4 × 6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:553
 msgid "_Custom"
 msgstr "_Personalizáu"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:571
 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:584
 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:593
 msgid "Move Right"
-msgstr ""
+msgstr "Mover a la drecha"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:630
 msgid "_Help"
 msgstr "_Ayuda"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:638
 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:680 src/simple-scan.ui:891
 msgid "Start a new document"
-msgstr ""
+msgstr "Crear un documentu nuevu"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:681
 msgid "New"
-msgstr ""
+msgstr "Nuevu"
 
 #. 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 ""
+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:697 src/simple-scan.ui:843
 msgid "Scan"
-msgstr ""
+msgstr "Escanear"
 
 #. 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 ""
+msgstr "Guardar documentu nun ficheru"
 
-#: ../src/ui.vala:1842
+#: src/simple-scan.ui:715 src/ui.vala:1892
 msgid "Save"
-msgstr ""
+msgstr "Guardar"
 
 #. 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 ""
+msgstr "Para l'escaneáu actual"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:731 src/simple-scan.ui:831
 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:755 src/simple-scan.ui:942
 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:756
 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:770 src/simple-scan.ui:920
 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:771
 msgid "Rotate Right"
-msgstr ""
+msgstr "Voltiar a la drecha"
 
-#: 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 ""
+msgstr "Recortar la páxina esbillada"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:787
 msgid "Crop"
-msgstr ""
+msgstr "Recortar"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:1003 src/ui.vala:1898
 msgid "Preferences"
 msgstr "Preferencies"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1054
 msgid "Scan S_ource:"
 msgstr "Escan_ear:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1085
 msgid "_Text Resolution:"
-msgstr ""
+msgstr "Resolución de _testu:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1101
 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:1145
 msgid "Scan Side:"
-msgstr ""
+msgstr "Escanear la cara:"
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1175
 msgid "Page Size:"
-msgstr ""
+msgstr "Tamañu de páxina:"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1205
 msgid "Brightness:"
 msgstr "Brillu:"
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1235
 msgid "Contrast:"
 msgstr "Contraste:"
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1266
 msgid "Quality:"
 msgstr "Calidá:"
 
+#. 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 "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 +322,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 +330,209 @@ 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:844
 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:874
 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:1227
 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:1240 src/scanner.vala:1340
 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:332 src/ui.vala:1655 src/ui.vala:1935
 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:341
 #, 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:389
 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:391
 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:396
 msgid "Additional software needed"
 msgstr ""
 
 #. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:398
 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:510
 msgid "Save As..."
 msgstr "Guardar como..."
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:513 src/ui.vala:648 src/ui.vala:723
 msgid "_Cancel"
 msgstr "_Encaboxar"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:514 src/ui.vala:724
 msgid "_Save"
 msgstr "_Guardar"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:522
 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:528
 msgid "Image Files"
-msgstr ""
+msgstr "Ficheros d'imaxe"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:534
 msgid "All Files"
-msgstr ""
+msgstr "Tolos Ficheros"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:543
 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:549
 msgid "JPEG (compressed)"
-msgstr ""
+msgstr "JPEG (comprimíu)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:555
 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: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:650
+#: src/ui.vala:698
 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:721
 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:763
 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:765
 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:1056
 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:1068
 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:1270
 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:1280
 msgid "Combine sides (reverse)"
 msgstr "Combinar llaos (inversu)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1290
 msgid "Reverse"
 msgstr "Inversu"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1300
 msgid "Keep unchanged"
 msgstr "Caltener ensin cambeos"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1504
 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: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"
@@ -536,16 +561,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:1528
 msgid "About Simple Scan"
 msgstr "Tocante a Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1531
 msgid "Simple document scanning tool"
 msgstr "Una cenciella ferramienta pa escanear documentos"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1540
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -555,189 +580,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:1562
 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:1564
 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:1632
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1634
 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:1638
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1640
 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:1644
 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:1649
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1651
 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:1655
 msgid "Install drivers"
 msgstr ""
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1686
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1698
 msgid "Installing drivers..."
 msgstr ""
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1706
 msgid "Drivers installed successfully!"
 msgstr ""
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1716
 #, 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:1722
 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:1729
 #, 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:1833
 #, 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:1836
 #, 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:1839
 #, 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:1842
 #, c-format
 msgid "%d dpi"
-msgstr ""
+msgstr "%d ppp"
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1885
 msgid "New Document"
 msgstr "Documentu nuevu"
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1890
 msgid "Document"
 msgstr "Documentu"
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1893
 msgid "Email..."
 msgstr "Corréu-e..."
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1894
 msgid "Print..."
 msgstr "Imprentar..."
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1902
 msgid "Help"
 msgstr "Ayuda"
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1903
 msgid "About"
 msgstr "Tocante a"
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1904
 msgid "Quit"
 msgstr "Quitar"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1937
 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:1939
 msgid "_Install Drivers"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1945
 msgid "Automatic"
-msgstr ""
+msgstr "Automáticu"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1995
 msgid "Darker"
 msgstr "Más escuru"
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1997
 msgid "Lighter"
 msgstr "Más claru"
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:2005
 msgid "Less"
 msgstr "Menos"
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:2007
 msgid "More"
 msgstr "Más"
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:2015
 msgid "Minimum"
 msgstr "Mínimu"
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:2017
 msgid "Maximum"
 msgstr "Máximu"
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2068
 msgid "Saving document..."
 msgstr "Guardando documentu..."
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2242
 #, 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..d2b0e83 100644
--- a/po/az.po
+++ b/po/az.po
@@ -7,296 +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"
+"POT-Creation-Date: 2017-04-16 08:54-0400\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"
+"Language: az\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-25 06:09+0000\n"
+"X-Generator: Launchpad (build 18361)\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: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 "_Sәnәd"
 
 #. 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 "_AvtoYükləmədəki bütün səhifələr"
 
+#. 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 "Mətn"
 
-#: 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
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: 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 "_Epoçt"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:436
 msgid "_Page"
 msgstr "_Səhifə"
 
 #. 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 "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:498
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:509
 msgid "A_6"
 msgstr "A_6"
 
 #. 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 ""
 
-#: ../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 "Seçilmiş səhifəni kəs"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:787
 msgid "Crop"
 msgstr "Kəs"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: 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 ""
 
@@ -308,7 +322,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 +330,207 @@ 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:844
 msgid "No scanners available.  Please connect a scanner."
 msgstr ""
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:874
 msgid "Unable to connect to scanner"
 msgstr ""
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1227
 msgid "Unable to start scan"
 msgstr ""
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: 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
+#: 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:332 src/ui.vala:1655 src/ui.vala:1935
 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:341
 #, 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:389
 msgid "No scanners detected"
 msgstr ""
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:391
 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:396
 msgid "Additional software needed"
 msgstr ""
 
 #. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:398
 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: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 ""
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:522
 msgid "Scanned Document.pdf"
 msgstr ""
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:528
 msgid "Image Files"
 msgstr ""
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:534
 msgid "All Files"
 msgstr ""
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:543
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:549
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:555
 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: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:650
+#: src/ui.vala:698
 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:721
 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:763
 msgid "Save current document?"
 msgstr ""
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:765
 msgid "Discard Changes"
 msgstr ""
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:1056
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1068
 msgid "Unable to open image preview application"
 msgstr ""
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1270
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1280
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1290
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1300
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1504
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: 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"
@@ -522,16 +547,16 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1528
 msgid "About Simple Scan"
 msgstr ""
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1531
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1540
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -539,189 +564,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:1562
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1564
 msgid "Quit without Saving"
 msgstr ""
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1632
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1634
 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:1638
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1640
 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:1644
 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:1649
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1651
 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:1655
 msgid "Install drivers"
 msgstr ""
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1686
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1698
 msgid "Installing drivers..."
 msgstr ""
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1706
 msgid "Drivers installed successfully!"
 msgstr ""
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1716
 #, 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:1722
 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:1729
 #, 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:1833
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1836
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1839
 #, 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: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 ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1937
 msgid "Change _Scanner"
 msgstr ""
 
 #. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1939
 msgid "_Install Drivers"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: 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/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..35ef68e 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -7,296 +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"
+"POT-Creation-Date: 2017-04-16 08:54-0400\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"
+"Language: bg\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-25 06:09+0000\n"
+"X-Generator: Launchpad (build 18361)\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
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: 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 "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:498
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:509
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:520
 msgid "_Letter"
 msgstr "US _Letter"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:531
 msgid "Le_gal"
 msgstr "US Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:542
 msgid "4×6"
 msgstr "4×6"
 
 #. 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 "Съхрани документа като файл"
 
-#: ../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 "Изрежи"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: 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 "Сканиране на документи"
 
@@ -308,7 +322,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 +330,208 @@ 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:844
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Няма налични скенери. Моля свържете скенер."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:874
 msgid "Unable to connect to scanner"
 msgstr "Не може да се осъществи връзка със скенера"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1227
 msgid "Unable to start scan"
 msgstr "Сканирането не може да бъде стартирано"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: 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
+#: 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:332 src/ui.vala:1655 src/ui.vala:1935
 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:341
 #, 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:389
 msgid "No scanners detected"
 msgstr "Не са открити скенери"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:391
 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:396
 msgid "Additional software needed"
 msgstr ""
 
 #. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:398
 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: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 "_Съхрани"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:522
 msgid "Scanned Document.pdf"
 msgstr "Сканиран документ.pdf"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:528
 msgid "Image Files"
 msgstr "Файлове с изображения"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:534
 msgid "All Files"
 msgstr "Всички файлове"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:543
 msgid "PDF (multi-page document)"
 msgstr "PDF (документ с много страници)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:549
 msgid "JPEG (compressed)"
 msgstr "JPEG (компресирани)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:555
 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: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:650
+#: src/ui.vala:698
 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:721
 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:763
 msgid "Save current document?"
 msgstr "Да съхраним ли текущия документ?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:765
 msgid "Discard Changes"
 msgstr "Откажи промените"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:1056
 msgid "Unable to save image for preview"
 msgstr "Изображението не може да бъде запазено за предварителен преглед"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1068
 msgid "Unable to open image preview application"
 msgstr "Невъзможно е отварянето на приложение за преглед на изображението"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1270
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1280
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1290
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1300
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1504
 msgid "Unable to open help file"
 msgstr "Помощния файл не може да бъде отворен"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: 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"
@@ -537,16 +562,16 @@ msgstr ""
 "<http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1528
 msgid "About Simple Scan"
 msgstr "За програмата"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1531
 msgid "Simple document scanning tool"
 msgstr "Инструмент за опростено сканиране на документи"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1540
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -559,189 +584,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:1562
 msgid "Save document before quitting?"
 msgstr "Да съхраня ли документа, преди да затворите програмата?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1564
 msgid "Quit without Saving"
 msgstr "Излез без запазване"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1632
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1634
 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:1638
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1640
 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:1644
 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:1649
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1651
 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:1655
 msgid "Install drivers"
 msgstr ""
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1686
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1698
 msgid "Installing drivers..."
 msgstr ""
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1706
 msgid "Drivers installed successfully!"
 msgstr ""
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1716
 #, 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:1722
 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:1729
 #, 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:1833
 #, 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:1836
 #, 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:1839
 #, 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:1842
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../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 ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1937
 msgid "Change _Scanner"
 msgstr "Смени _скенера"
 
 #. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1939
 msgid "_Install Drivers"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: 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 "Съхраняване на страница %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..fa457eb 100644
--- a/po/bo.po
+++ b/po/bo.po
@@ -7,296 +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"
+"POT-Creation-Date: 2017-04-16 08:54-0400\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"
+"Language: bo\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-25 06:10+0000\n"
+"X-Generator: Launchpad (build 18361)\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: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 "ཡི་གེ_D"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/simple-scan.ui:266
 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:279 src/simple-scan.ui:1343 src/simple-scan.ui:1402
 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:289 src/simple-scan.ui:1352 src/simple-scan.ui:1411
 msgid "All Pages From _Feeder"
 msgstr "སྤྲོད་མཁན་ནས་བྱུང་བའི་ཤོག་ལེབ་ཡོངས་རྫོགས _F"
 
+#. 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 "པར་ལེན་མཚམས་བཞག_S"
 
-#: 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
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: 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 "གློག་འཕྲིན_E"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:436
 msgid "_Page"
 msgstr "ཤོག་ལེབ_P"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:446
 msgid "Rotate _Left"
 msgstr "གཡོན་སྐོར _L"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:456
 msgid "Rotate _Right"
 msgstr "གཡས་སྐོར་ _R"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:466
 msgid "_Crop"
 msgstr "གཅོད_C"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:476
 msgid "_None"
 msgstr "ཅི་མེད་པ_N"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:487
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:498
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:509
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:520
 msgid "_Letter"
 msgstr "འཕྲིན་ཡིག_L"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:531
 msgid "Le_gal"
 msgstr "ཁྲིམས་མཐུན_g"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:542
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:553
 msgid "_Custom"
 msgstr "སྲོལ་རྒྱུན_C"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:571
 msgid "_Rotate Crop"
 msgstr "དྲས་གཅོད་སྐོར་བ_R"
 
 #. 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 "རོགས་རམ_H"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:638
 msgid "_Contents"
 msgstr "ནང་གསེས_C"
 
 #. 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 "ཡི་གེ་ཡིག་ཆའི་ནང་གསོག་ཉར"
 
-#: ../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 "གཅད"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: 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 "པར་བཤུ་གཏེར་མཛོད_o:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1085
 msgid "_Text Resolution:"
 msgstr "ཡི་གེའི་སྤུས་ཚད_T"
 
 #. 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 "ཡིག་གེ་པར་བཤུ"
 
@@ -308,7 +322,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 +330,207 @@ 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:844
 msgid "No scanners available.  Please connect a scanner."
 msgstr "པར་བཤུ་ཆས་བསྒྲིགས་མི་འདུག པར་བཤུ་ཆས་ཞིག་སྒྲིགས་རོགས"
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:874
 msgid "Unable to connect to scanner"
 msgstr "པར་བཤུ་ཆས་དང་སྦྲེལ་མ་ཐུབ"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1227
 msgid "Unable to start scan"
 msgstr "པར་བཤུ་འགོ་འཛུགས་མ་ཐུབ"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: 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
+#: 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:332 src/ui.vala:1655 src/ui.vala:1935
 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:341
 #, 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:389
 msgid "No scanners detected"
 msgstr "པར་བཤུ་ཆས་རྙེད་མ་བྱུང་"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:391
 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:396
 msgid "Additional software needed"
 msgstr ""
 
 #. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:398
 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: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 ""
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:522
 msgid "Scanned Document.pdf"
 msgstr "པར་བཤུས་ཡིག་ཆ.pdf"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:528
 msgid "Image Files"
 msgstr "གཟུགས་བརྙན་ཡིག་ཆ"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:534
 msgid "All Files"
 msgstr "ཡིག་ཆ་ཡོངས་རྫོགས"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:543
 msgid "PDF (multi-page document)"
 msgstr "PDF(ཤོག་ལེབ་མང་པོའི་ཡིག་ཆ)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:549
 msgid "JPEG (compressed)"
 msgstr "JPEG (བསྡུ་འཇུག)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:555
 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: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:650
+#: src/ui.vala:698
 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:721
 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:763
 msgid "Save current document?"
 msgstr "དང་ཐོག་གི་ཡིག་ཆ་ཉར་ཚགས"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:765
 msgid "Discard Changes"
 msgstr "བཟོ་བཅོས་རྣམས་འདོར་བ"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:1056
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1068
 msgid "Unable to open image preview application"
 msgstr "སྔོན་ལྟ་ཉེར་སྤྱོད་ཁ་ཕྱེ་མ་ཐུབ་པ"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1270
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1280
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1290
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1300
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1504
 msgid "Unable to open help file"
 msgstr "རོགས་འདེགས་ཡིག་ཆ་ཁ་ཕྱེ་མ་ཐུབ"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: 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"
@@ -534,16 +559,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:1528
 msgid "About Simple Scan"
 msgstr "པར་བཤུ་བ་དཀྱུས་མའི་སྐོར"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1531
 msgid "Simple document scanning tool"
 msgstr "ཡིག་ཆ་པར་བཤུ་ཆས་དཀྱུས་མ"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1540
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -551,189 +576,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:1562
 msgid "Save document before quitting?"
 msgstr "ཕྱིར་འཐེན་མ་བྱས་གོང་གསོག་འཇོག་བྱེད་པ"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1564
 msgid "Quit without Saving"
 msgstr "གསོག་འཇོག་མ་བྱས་པར་ཕྱིར་འཐེན"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1632
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1634
 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:1638
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1640
 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:1644
 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:1649
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1651
 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:1655
 msgid "Install drivers"
 msgstr ""
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1686
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1698
 msgid "Installing drivers..."
 msgstr ""
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1706
 msgid "Drivers installed successfully!"
 msgstr ""
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1716
 #, 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:1722
 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:1729
 #, 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:1833
 #, 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:1836
 #, 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:1839
 #, 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: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 ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1937
 msgid "Change _Scanner"
 msgstr "པར་བཤུ་ཆས་བརྗེ་བ_S"
 
 #. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1939
 msgid "_Install Drivers"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: 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/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..14706cb 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -2,519 +2,537 @@
 # Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
 # This file is distributed under the same license as the simple-scan package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
-#
+# Jordi Serratosa <jordis@softcatala.cat>, 2017.
+#  Adolfo Jayme https://launchpad.net/~fitojb\n"
+#  David Planella https://launchpad.net/~dpm\n"
+#  J. https://launchpad.net/~jose-manuel-rodriguez-moreno\n"
+#  J. Gregpori Raya https://launchpad.net/~gregori\n"
+#  Joan Duran https://launchpad.net/~jodufi\n"
+#  Sergi https://launchpad.net/~scaparrosj\n"
+#  Siegfried Gevatter https://launchpad.net/~rainct\n"
+#  SiscoGarcia https://launchpad.net/~sisco\n"
+#  Walter Garcia-Fontes https://launchpad.net/~walter-garcia\n"
+#  pancake https://launchpad.net/~pancake"
 msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-07-29 12:47+1200\n"
-"PO-Revision-Date: 2016-12-24 18:03+0000\n"
-"Last-Translator: Walter Garcia-Fontes <walter.garcia@upf.edu>\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
+"product=simple-scan&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-09-08 11:00+0000\n"
+"PO-Revision-Date: 2017-09-01 14:42+0200\n"
+"Last-Translator: Jordi Mas <jmas@softcatala.org>\n"
 "Language-Team: Catalan <ca@li.org>\n"
+"Language: ca\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-25 06:10+0000\n"
+"X-Generator: Poedit 1.8.11\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. Button to submit authorization dialog
-#: data/simple-scan.ui:24
-msgid "_Authorize"
-msgstr "_Autoritza"
+#: data/org.gnome.SimpleScan.gschema.xml:11
+msgid "Device to scan from"
+msgstr "Dispositiu d'escaneig"
 
-#. Label beside username entry
-#: data/simple-scan.ui:102
-msgid "_Username for resource:"
-msgstr "_Nom d'usuari del recurs:"
+#: data/org.gnome.SimpleScan.gschema.xml:12
+msgid "SANE device to acquire images from."
+msgstr "Dispositiu SANE per a l'adquisició d'imatges."
 
-#. Label beside password entry
-#: data/simple-scan.ui:117
-msgid "_Password:"
-msgstr "_Contrasenya:"
+#: data/org.gnome.SimpleScan.gschema.xml:20
+msgid "Type of document being scanned"
+msgstr "Tipus de document a escanejar"
 
-#. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
-msgid "Front and Back"
-msgstr "Ambdues cares"
+#: data/org.gnome.SimpleScan.gschema.xml:21
+msgid ""
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+msgstr ""
+"El tipus de document que s'està escanejant. Aquest paràmetre decideix la "
+"resolució d'escaneig, els colors i el processament posterior."
 
-#. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
-msgid "Front"
-msgstr "Anvers de la pàgina"
+#: data/org.gnome.SimpleScan.gschema.xml:25
+msgid "Width of paper in tenths of a mm"
+msgstr "Amplada del paper en dècimes de mm"
 
-#. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
-msgid "Back"
-msgstr "Revers de la pàgina"
+#: data/org.gnome.SimpleScan.gschema.xml:26
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"L'amplada del paper en dècimes de mm (o 0 per la detecció automàtica del "
+"paper)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:30
+msgid "Height of paper in tenths of a mm"
+msgstr "Alçada del paper en dècimes parts d'un mm"
+
+#: data/org.gnome.SimpleScan.gschema.xml:31
+msgid ""
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"L'alçada del paper en dècimes de mm (o 0 per la detecció automàtica del "
+"paper)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:35
+msgid "Brightness of scan"
+msgstr "Brillantor de l'escaneig"
+
+#: data/org.gnome.SimpleScan.gschema.xml:36
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr "L'ajustament de la brillantor, de -100 a 100 (on 0 significa cap)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:40
+msgid "Contrast of scan"
+msgstr "Contrast de l'escaneig"
+
+#: data/org.gnome.SimpleScan.gschema.xml:41
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr "L'ajustament del contrast, de -100 a 100 (on 0 indica cap)."
 
+#: data/org.gnome.SimpleScan.gschema.xml:45
+msgid "Resolution for text scans"
+msgstr "Resolució per l'escaneig de text"
+
+#: data/org.gnome.SimpleScan.gschema.xml:46
+msgid "The resolution in dots-per-inch to use when scanning text."
+msgstr "La resolució en punts per polzada quan s'escanegi text."
+
+#: data/org.gnome.SimpleScan.gschema.xml:50
+msgid "Resolution for photo scans"
+msgstr "Resolució per l'escaneig de fotos"
+
+#: data/org.gnome.SimpleScan.gschema.xml:51
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr "La resolució en punts per polzada quan s'escanegin fotos."
+
+#: data/org.gnome.SimpleScan.gschema.xml:55
+msgid "Page side to scan"
+msgstr "Cara de la pàgina a escanejar"
+
+#: data/org.gnome.SimpleScan.gschema.xml:56
+msgid "The page side to scan."
+msgstr "La cara de la pàgina a escanejar."
+
+#: data/org.gnome.SimpleScan.gschema.xml:60
+msgid "Directory to save files to"
+msgstr "Directori on desar els fitxers"
+
+#: data/org.gnome.SimpleScan.gschema.xml:61
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+"El directori on desar els fitxers. Per defecte serà el directori de "
+"documents si no es defineix."
+
+#: data/org.gnome.SimpleScan.gschema.xml:66
+msgid "Quality value to use for JPEG compression"
+msgstr "Valor de la qualitat a utilitzar per la compressió JPEG"
+
+#: data/org.gnome.SimpleScan.gschema.xml:67
+msgid "Quality value to use for JPEG compression."
+msgstr "Valor de la qualitat a utilitzar per la compressió JPEG."
+
+#: data/org.gnome.SimpleScan.gschema.xml:72
+msgid "Delay in millisecond between pages"
+msgstr "Retard en mil·lisegons entre pàgines"
+
+#: data/org.gnome.SimpleScan.gschema.xml:73
+msgid "Delay in millisecond between pages."
+msgstr "Retard en mil·lisegons entre pàgines."
+
+#. Title of scan window
+#. Set HeaderBar title here because Glade doesn't keep it translated
+#. https://bugzilla.gnome.org/show_bug.cgi?id=782753
 #. 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
+#: data/simple-scan.appdata.xml.in:6 data/simple-scan.desktop.in:3
+#: src/app-window.ui:76 src/app-window.vala:1560
 msgid "Simple Scan"
 msgstr "Escaneig senzill"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
-msgid "_Document"
-msgstr "_Document"
+#: data/simple-scan.appdata.xml.in:7 data/simple-scan.desktop.in:5
+msgid "Scan Documents"
+msgstr "Escanegeu documents"
 
-#. Scan menu item
-#: data/simple-scan.ui:260
-msgid "Sc_an"
-msgstr "Esc_aneja"
+#: 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 "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+"Una manera realment senzilla d'escanejar tant documents com fotos. Podeu "
+"retallar les parts dolentes d'una foto o girar-la si està en la posició "
+"incorrecta.  Podeu imprimir els vostres escanejos, exportar-los a pdf, o "
+"desar-los en diversos formats d'imatge."
+
+#: data/simple-scan.appdata.xml.in:14
+msgid "Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+"L'Escaneig senzill fa servir l'entorn SANE per donar suport a la major part "
+"dels escàners existents."
+
+#: data/simple-scan.desktop.in:4
+msgid "Document Scanner"
+msgstr "Escàner de documents"
 
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: data/simple-scan.desktop.in:7
+msgid "scan;scanner;flatbed;adf;"
+msgstr "escanejar;escàner;pla;adf;"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: data/simple-scan.desktop.in:10
+msgid "scanner"
+msgstr "scanner"
+
+#. Toolbar scan menu item to scan a single page from the scanner
 #. 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/app-window.ui:22 src/app-window.ui:123 src/app-window.ui:820
 msgid "Single _Page"
 msgstr "Pàgina _individual"
 
+#. Toolbar scan menu item to scan all pages from a document feeder
 #. 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/app-window.ui:31 src/app-window.ui:133 src/app-window.ui:829
 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
-msgid "_Stop Scan"
-msgstr "_Atura l'escaneig"
+#. Toolbar scan menu item to scan continuously from the flatbed
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/app-window.ui:40 src/app-window.ui:143 src/app-window.ui:838
+msgid "_Multiple Pages From Flatbed"
+msgstr "_Múltiples pàgines des d'un escàner pla"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:853
 msgid "Text"
 msgstr "Text"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:863
 msgid "Photo"
 msgstr "Foto"
 
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: src/app-window.ui:91
+msgid "_Document"
+msgstr "_Document"
+
+#. Scan menu item
+#: src/app-window.ui:110
+msgid "Sc_an"
+msgstr "Esc_aneja"
+
+#. Menu entry to stop current scan
+#: src/app-window.ui:154
+msgid "_Stop Scan"
+msgstr "_Atura l'escaneig"
+
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/app-window.ui:196 src/app-window.vala:967 src/app-window.vala:1590
 msgid "Reorder Pages"
 msgstr "Reordena les pàgines"
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/app-window.ui:215
 msgid "_Email"
 msgstr "_Envia per correu"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/app-window.ui:280
 msgid "_Page"
 msgstr "_Pàgina"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/app-window.ui:290
 msgid "Rotate _Left"
 msgstr "Gira a l'_esquerra"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/app-window.ui:300
 msgid "Rotate _Right"
 msgstr "Gira a la _dreta"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/app-window.ui:310
 msgid "_Crop"
 msgstr "_Escapçament"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/app-window.ui:320
 msgid "_None"
 msgstr "_Cap"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/app-window.ui:331
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/app-window.ui:342
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/app-window.ui:353
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/app-window.ui:364
 msgid "_Letter"
 msgstr "_Carta EUA"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/app-window.ui:375
 msgid "Le_gal"
 msgstr "Le_gal EUA"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/app-window.ui:386
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/app-window.ui:397
 msgid "_Custom"
 msgstr "_Personalitzat"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/app-window.ui:415
 msgid "_Rotate Crop"
 msgstr "_Gira l'escapçament"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/app-window.ui:428
 msgid "Move Left"
 msgstr "Mou a l'esquerra"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/app-window.ui:437
 msgid "Move Right"
 msgstr "Mou a la dreta"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/app-window.ui:474
 msgid "_Help"
 msgstr "A_juda"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/app-window.ui:482
 msgid "_Contents"
 msgstr "C_ontingut"
 
-#. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
-msgid "Start a new document"
-msgstr "Comença un document nou"
-
-#: data/simple-scan.ui:675
-msgid "New"
-msgstr "Nou"
-
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/app-window.ui:520 src/app-window.ui:720
 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/app-window.ui:522 src/app-window.ui:716
 msgid "Scan"
 msgstr "Escaneja"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/app-window.ui:538 src/app-window.ui:787
 msgid "Save document to a file"
 msgstr "Desa el document en un fitxer"
 
-#: ../src/ui.vala:1842
+#: src/app-window.ui:540
 msgid "Save"
 msgstr "Desa"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/app-window.ui:555 src/app-window.ui:700
 msgid "Stop the current scan"
 msgstr "Atura l'escaneig actual"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/app-window.ui:556 src/app-window.ui:697
 msgid "Stop"
 msgstr "Atura"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "Gireu la pàgina cap a l'esquerra (en sentit antihorari)"
-
-#. Label on rotate page left (anti-clockwise) item
-#: data/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
-msgid "Rotate the page to the right (clockwise)"
-msgstr "Gireu la pàgina cap a la dreta (en sentit horari)"
+#. Label shown when searching for scanners
+#: src/app-window.ui:611
+msgid "Searching for Scanners…"
+msgstr "S'estan cercant escànners…"
 
-#. Label on rotate page right (clockwise) item
-#: data/simple-scan.ui:765
-msgid "Rotate Right"
-msgstr "Gira a la dreta"
-
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
-msgid "Crop the selected page"
-msgstr "Escapça la pàgina seleccionada"
-
-#: data/simple-scan.ui:781
-msgid "Crop"
-msgstr "Escapça"
-
-#: ../src/ui.vala:1849
-msgid "Preferences"
-msgstr "Preferències"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1048
-msgid "Scan S_ource:"
-msgstr "Font d'_escaneig:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1079
-msgid "_Text Resolution:"
-msgstr "_Resolució de text:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1095
-msgid "_Photo Resolution:"
-msgstr "_Resolució fotogràfica:"
-
-#. Label beside scan side combo box
-#: data/simple-scan.ui:1139
-msgid "Scan Side:"
-msgstr "Cara a escanejar:"
-
-#. Label beside page size combo box
-#: data/simple-scan.ui:1169
-msgid "Page Size:"
-msgstr "Mida de la pàgina:"
-
-#. Label beside brightness scale
-#: data/simple-scan.ui:1199
-msgid "Brightness:"
-msgstr "Brillantor:"
-
-#. Label beside contrast scale
-#: data/simple-scan.ui:1229
-msgid "Contrast:"
-msgstr "Contrast:"
-
-#. Label beside quality scale
-#: data/simple-scan.ui:1260
-msgid "Quality:"
-msgstr "Qualitat:"
-
-#: data/simple-scan.desktop.in:4
-msgid "Document Scanner"
-msgstr "Escanejador de documents"
-
-#: data/simple-scan.desktop.in:5
-msgid "Scan Documents"
-msgstr "Escanegeu documents"
+#: src/app-window.vala:237 src/app-window.vala:1380
+msgid "_Close"
+msgstr "_Tanca"
 
-#: data/simple-scan.desktop.in:6
-msgid "scan;scanner;flatbed;adf;"
-msgstr "escanejar;escàner;pla;adf;"
+#. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
+#: src/app-window.vala:246
+#, c-format
+msgid "Username and password required to access “%s”"
+msgstr "Cal un usuari i contrasenya per a accedir a «%s»"
 
-#: data/simple-scan.desktop.in:8
-msgid "scanner"
-msgstr "escàner"
+#. Label shown when detected a scanner
+#: src/app-window.vala:266 src/app-window.vala:584
+msgid "Ready to Scan"
+msgstr "A punt per escanejar"
 
-#: data/simple-scan.appdata.xml.in:8
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-"Una manera realment senzilla d'escanejar tant documents com fotos. Podeu "
-"retallar les parts dolentes d'una foto o rotar-la si està en la posició "
-"incorrecta.  Podeu imprimir els vostres escanejos, exportar-los a pdf, o "
-"desar-los en diversos formats d'imatge."
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: src/app-window.vala:273
+msgid "Additional software needed"
+msgstr "Cal un programari addicional"
 
-#: data/simple-scan.appdata.xml.in:13
+#. Instructions to install driver software
+#: src/app-window.vala:275
 msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
+"You need to <a href=\"install-firmware\">install driver software</a> for "
+"your scanner."
 msgstr ""
-"El Simple Scan fa servir l'entorn SANE per donar suport a la major part dels "
-"escàners existents."
-
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
-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
-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
-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
-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
-msgid "Show release version"
-msgstr "Mostra la versió de llançament"
-
-#. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
-msgid "Print debugging messages"
-msgstr "Mostra els missatges de depuració"
-
-#: ../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
-msgid "Failed to scan"
-msgstr "Ha fallat l'escaneig"
-
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
-msgid "[DEVICE...] - Scanning utility"
-msgstr "[DISPOSITIU...] - Utilitat d'escaneig"
-
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
-#, 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
-msgid "_Close"
-msgstr "_Tanca"
-
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../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»"
+"Heu <a href=\"install-firmware\">d'instal·lar un programari controlador</a> "
+"per al vostre escàner."
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/app-window.vala:281
 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/app-window.vala:283
 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
-msgid "Additional software needed"
-msgstr "Cal un programari addicional"
-
-#. Instructions to install driver software
-#: ../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
-msgid "Save As..."
-msgstr "Anomena i desa..."
+#: src/app-window.vala:298
+msgid "Save As…"
+msgstr "Anomena i desa…"
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/app-window.vala:301 src/app-window.vala:471 src/app-window.vala:552
 msgid "_Cancel"
 msgstr "_Cancel·la"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/app-window.vala:302 src/app-window.vala:553
 msgid "_Save"
 msgstr "De_sa"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/app-window.vala:310
 msgid "Scanned Document.pdf"
 msgstr "Document escanejat.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#. Save dialog: Filter name to show only supported image files
+#: src/app-window.vala:316
 msgid "Image Files"
 msgstr "Fitxers d'imatge"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/app-window.vala:326
 msgid "All Files"
 msgstr "Tots els fitxers"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/app-window.vala:335
 msgid "PDF (multi-page document)"
 msgstr "PDF (document multipàgina)."
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/app-window.vala:341
 msgid "JPEG (compressed)"
 msgstr "JPEG (comprimit)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/app-window.vala:347
 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
+#. Save dialog: Label for sabing in WEBP format
+#: src/app-window.vala:354
+msgid "WebP (compressed)"
+msgstr "WebP (comprimit)"
+
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
+#: src/app-window.vala:364
 msgid "File format:"
 msgstr "Format del fitxer:"
 
+#. Label in save dialog beside compression slider
+#: src/app-window.vala:376
+msgid "Compression:"
+msgstr "Compressió:"
+
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/app-window.vala:470
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr "Ja existeix un fitxer amb el nom «%s». Voleu reemplaçar-lo?"
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/app-window.vala:473
+msgid "_Replace"
+msgstr "_Reemplaça"
+
+#: src/app-window.vala:512
+msgid "Saving"
+msgstr "Desament"
+
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/app-window.vala:527
 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
-msgid "If you don't save, changes will be permanently lost."
+#: src/app-window.vala:550
+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/app-window.vala:591
 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/app-window.vala:593
 msgid "Discard Changes"
 msgstr "Descarta els canvis"
 
+#. Label shown when scan started
+#: src/app-window.vala:692
+msgid "Contacting scanner…"
+msgstr "S'està contactant l'e_scàner…"
+
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/app-window.vala:800
 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/app-window.vala:812
 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/app-window.vala:990
 msgid "Combine sides"
 msgstr "Combina els costats"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/app-window.vala:1000
 msgid "Combine sides (reverse)"
-msgstr "Combina els costats (inrevès)"
+msgstr "Combina els costats (invers)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/app-window.vala:1010
 msgid "Reverse"
 msgstr "Reverteix"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/app-window.vala:1020
 msgid "Keep unchanged"
 msgstr "Mantingues sense canvi"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/app-window.vala:1250
 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/app-window.vala:1271
 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,7 +547,7 @@ 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 ""
-"Aquest programa és programari lliure: podeu redistribuir-lo l'i/o modificar-"
+"Aquest programa és programari lliure: podeu redistribuir-lo i/o modificar-"
 "lo\n"
 "sota els termes de la Llicència Pública General GNU (GNU GPL) segons publica "
 "la \n"
@@ -546,225 +564,528 @@ msgstr ""
 "juntament amb aquest programa. Si no, mireu <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/app-window.vala:1274
 msgid "About Simple Scan"
-msgstr "Quant a l'escaneig senzill"
+msgstr "Quant a l'Escaneig senzill"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/app-window.vala:1277
 msgid "Simple document scanning tool"
 msgstr "Eina senzilla d'escaneig de documents"
 
-#: ../src/ui.vala:1487
+#: src/app-window.vala:1286
 msgid "translator-credits"
 msgstr ""
-"Launchpad Contributions:\n"
-"  Adolfo Jayme https://launchpad.net/~fitojb\n"
-"  David Planella https://launchpad.net/~dpm\n"
-"  J. https://launchpad.net/~jose-manuel-rodriguez-moreno\n"
-"  J. Gregpori Raya https://launchpad.net/~gregori\n"
-"  Joan Duran https://launchpad.net/~jodufi\n"
-"  Sergi https://launchpad.net/~scaparrosj\n"
-"  Siegfried Gevatter https://launchpad.net/~rainct\n"
-"  SiscoGarcia https://launchpad.net/~sisco\n"
-"  Walter Garcia-Fontes https://launchpad.net/~walter-garcia\n"
-"  pancake https://launchpad.net/~pancake"
+"Jordi Mas i Hernàndez (2017)\n"
+"Launchpad contributors (2010-2016)"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/app-window.vala:1308
 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
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:1310
 msgid "Quit without Saving"
 msgstr "Surt sense desar"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/app-window.vala:1357
 msgid "You appear to have a Brother scanner."
-msgstr "Sembla que teniu un escàner Brother"
+msgstr "Sembla que teniu un escàner Brother."
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/app-window.vala:1359
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.brother.com\">Brother website</a>."
+"Drivers for this are available on the <a href=\"http://support.brother.com"
+"\">Brother website</a>."
 msgstr ""
-"Hi ha controladors disponibles a la <a "
-"href=\"http://support.brother.com\">pàgina web de Brother</a>."
+"Hi ha controladors disponibles a la <a href=\"http://support.brother.com"
+"\">pàgina web de Brother</a>."
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/app-window.vala:1363
 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/app-window.vala:1365
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://samsung.com/support\">Samsung website</a>."
+"Drivers for this are available on the <a href=\"http://samsung.com/support"
+"\">Samsung website</a>."
 msgstr ""
-"Hi ha controladors disponibles a la <a "
-"href=\"http://samsung.com/support\">pàgina web de Samsung</a>."
+"Hi ha controladors disponibles a la <a href=\"http://samsung.com/support"
+"\">pàgina web de Samsung</a>."
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/app-window.vala:1369
 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/app-window.vala:1374
 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/app-window.vala:1376
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.epson.com\">Epson website</a>."
+"Drivers for this are available on the <a href=\"http://support.epson.com"
+"\">Epson website</a>."
 msgstr ""
-"Hi ha controladors disponibles a la <a "
-"href=\"http://samsung.com/support\">pàgina web d'Epson</a>."
+"Hi ha controladors disponibles a la <a href=\"http://samsung.com/support"
+"\">pàgina web d'Epson</a>."
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/app-window.vala:1380
 msgid "Install drivers"
 msgstr "Instal·la els controladors"
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/app-window.vala:1411
 msgid "Once installed you will need to restart Simple Scan."
-msgstr "Un cop instal·lat haureu de reiniciar el Simple Scan."
+msgstr "Un cop instal·lat haureu de reiniciar l'Escaneig senzill."
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
-msgid "Installing drivers..."
-msgstr "S'estan instal·lant els controladors..."
+#: src/app-window.vala:1423
+msgid "Installing drivers…"
+msgstr "S'estan instal·lant els controladors…"
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/app-window.vala:1431
 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/app-window.vala:1441
 #, c-format
 msgid "Failed to install drivers (error code %d)."
-msgstr "Ha fallat la instal·lació dels controladorse (codi d'error %d)."
+msgstr "Ha fallat la instal·lació dels controladors (codi d'error %d)."
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/app-window.vala:1447
 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/app-window.vala:1454
 #, c-format
-msgid "You need to install the %s package(s)."
-msgstr "Heu d'instal·lar el(s) paquet(s) %s."
+msgid "You need to install the %s package."
+msgid_plural "You need to install the %s packages."
+msgstr[0] "Heu d'instal·lar el paquet %s."
+msgstr[1] "Heu d'instal·lar els paquets %s."
+
+#. Title of preferences dialog
+#: src/app-window.vala:1568 src/app-window.vala:1591
+#: src/preferences-dialog.ui:53
+msgid "Preferences"
+msgstr "Preferències"
+
+#: src/app-window.vala:1572
+msgid "Keyboard Shortcuts"
+msgstr "Dreceres de teclat"
+
+#: src/app-window.vala:1573
+msgid "Help"
+msgstr "Ajuda"
+
+#: src/app-window.vala:1574
+msgid "About"
+msgstr "Quant a"
+
+#: src/app-window.vala:1575
+msgid "Quit"
+msgstr "Surt"
+
+#: src/app-window.vala:1589
+msgid "Email"
+msgstr "Correu electrònic"
+
+#. Populate ActionBar (not supported in Glade)
+#. https://bugzilla.gnome.org/show_bug.cgi?id=769966
+#. Label on new document button
+#: src/app-window.vala:1599
+msgid "Start Again…"
+msgstr "Comença de nou…"
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: src/app-window.vala:1616
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Gireu la pàgina cap a l'esquerra (en sentit antihorari)"
+
+#. Tooltip for rotate right (clockwise) button
+#: src/app-window.vala:1623
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Gireu la pàgina cap a la dreta (en sentit horari)"
+
+#. Tooltip for crop button
+#: src/app-window.vala:1633
+msgid "Crop the selected page"
+msgstr "Escapça la pàgina seleccionada"
+
+#. Tooltip for delete button
+#: src/app-window.vala:1649
+msgid "Delete the selected page"
+msgstr "Suprimeix la pàgina seleccionada"
+
+#. Text of button for cancelling save
+#: src/app-window.vala:1814
+msgid "Cancel"
+msgstr "Cancel·la"
+
+#. Button to submit authorization dialog
+#: src/authorize-dialog.ui:25
+msgid "_Authorize"
+msgstr "_Autoritza"
+
+#. Label beside username entry
+#: src/authorize-dialog.ui:99
+msgid "_Username for resource:"
+msgstr "_Nom d'usuari del recurs:"
+
+#. Label beside password entry
+#: src/authorize-dialog.ui:112
+msgid "_Password:"
+msgstr "_Contrasenya:"
+
+#: src/book.vala:331 src/book.vala:337
+#, c-format
+msgid "Unable to encode page %i"
+msgstr "No s'ha pogut codificar la pàgina %i"
+
+#: src/help-overlay.ui:12
+msgctxt "shortcut window"
+msgid "Scanning"
+msgstr "Escaneig"
+
+#: src/help-overlay.ui:17
+msgctxt "shortcut window"
+msgid "Scan a single page"
+msgstr "Escaneja una sola pàgina"
+
+#: src/help-overlay.ui:24
+msgctxt "shortcut window"
+msgid "Scan all pages from document feeder"
+msgstr "Escaneja totes les pàgines des de l'alimentador"
+
+#: src/help-overlay.ui:31
+msgctxt "shortcut window"
+msgid "Scan continuously from a flatbed scanner"
+msgstr "Escaneja contínuament des d'un escàner pla"
+
+#: src/help-overlay.ui:38
+msgctxt "shortcut window"
+msgid "Stop scan in progress"
+msgstr "Atura l'escaneig en curs"
+
+#: src/help-overlay.ui:46
+msgctxt "shortcut window"
+msgid "Document Modification"
+msgstr "Modificació del document"
+
+#: src/help-overlay.ui:51
+msgctxt "shortcut window"
+msgid "Move page left"
+msgstr "Mou a l'esquerra"
+
+#: src/help-overlay.ui:58
+msgctxt "shortcut window"
+msgid "Move page right"
+msgstr "Mou a la dreta"
+
+#: src/help-overlay.ui:65
+msgctxt "shortcut window"
+msgid "Rotate page to the left (anti-clockwise)"
+msgstr "Gireu la pàgina cap a l'esquerra (en sentit antihorari)"
+
+#: src/help-overlay.ui:72
+msgctxt "shortcut window"
+msgid "Rotate page to the right (clockwise)"
+msgstr "Gireu la pàgina cap a la dreta (en sentit horari)"
+
+#: src/help-overlay.ui:79
+msgctxt "shortcut window"
+msgid "Delete page"
+msgstr "Suprimeix la pàgina"
+
+#: src/help-overlay.ui:87
+msgctxt "shortcut window"
+msgid "Document Management"
+msgstr "Gestió de documents"
+
+#: src/help-overlay.ui:92
+msgctxt "shortcut window"
+msgid "Start new document"
+msgstr "Comença un document nou"
+
+#: src/help-overlay.ui:99
+msgctxt "shortcut window"
+msgid "Save scanned document"
+msgstr "Desa el document escanejat"
+
+#: src/help-overlay.ui:106
+msgctxt "shortcut window"
+msgid "Email scanned document"
+msgstr "Envia per correu el document escanejat"
+
+#: src/help-overlay.ui:113
+msgctxt "shortcut window"
+msgid "Print scanned document"
+msgstr "Imprimeix el document escanejat"
+
+#: src/help-overlay.ui:120
+msgctxt "shortcut window"
+msgid "Copy current page to clipboard"
+msgstr "Copia la pàgina actual al porta-retalls"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:113
+msgid "_Scanner"
+msgstr "_Escàner"
+
+#. Label beside scan side combo box
+#: src/preferences-dialog.ui:143
+msgid "Scan Sides"
+msgstr "Cares a escanejar"
+
+#. Label beside page size combo box
+#: src/preferences-dialog.ui:160
+msgid "Page Size"
+msgstr "Mida de la pàgina"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:191
+msgid "Front"
+msgstr "Anvers de la pàgina"
+
+#. Preferences Dialog: Toggle button to select scanning on the back side of a page
+#: src/preferences-dialog.ui:206
+msgid "Back"
+msgstr "Revers de la pàgina"
+
+#. Preferences Dialog: Toggle button to select scanning on both sides of a page
+#: src/preferences-dialog.ui:221
+msgid "Both"
+msgstr "Ambdues"
+
+#. Label beside page delay scale
+#: src/preferences-dialog.ui:260
+msgid "Delay"
+msgstr "Espera"
+
+#. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
+#: src/preferences-dialog.ui:276
+msgid "Multiple pages from flatbed"
+msgstr "Múltiples pàgines des d'un escàner pla"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:295
+msgid "3"
+msgstr "3"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:310
+msgid "5"
+msgstr "5"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:326
+msgid "7"
+msgstr "7"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:342
+msgid "10"
+msgstr "10"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:358
+msgid "15"
+msgstr "15"
+
+#. Label after page delay radio buttons
+#: src/preferences-dialog.ui:385
+msgid "Seconds"
+msgstr "Segons"
+
+#. Preferences Dialog: Tab label for scanning settings
+#: src/preferences-dialog.ui:413
+msgid "Scanning"
+msgstr "S'està escanejant"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:436
+msgid "_Text Resolution"
+msgstr "_Resolució de text"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:452
+msgid "_Photo Resolution"
+msgstr "_Resolució fotogràfica"
+
+#. Label beside brightness scale
+#: src/preferences-dialog.ui:505
+msgid "Brightness"
+msgstr "Brillantor"
+
+#. Label beside contrast scale
+#: src/preferences-dialog.ui:521
+msgid "Contrast"
+msgstr "Contrast"
+
+#. Preferences Dialog: Tab for quality settings
+#: src/preferences-dialog.ui:576
+msgid "Quality"
+msgstr "Qualitat"
+
+#. Combo box value for automatic paper size
+#: src/preferences-dialog.vala:77
+msgid "Automatic"
+msgstr "Automàtic"
+
+#: src/preferences-dialog.vala:116
+msgid "Darker"
+msgstr "Més fosc"
+
+#: src/preferences-dialog.vala:118
+msgid "Lighter"
+msgstr "Més clar"
+
+#: src/preferences-dialog.vala:126
+msgid "Less"
+msgstr "Menys"
+
+#: src/preferences-dialog.vala:128
+msgid "More"
+msgstr "Més"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/preferences-dialog.vala:440
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d ppp (predeterminat)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/preferences-dialog.vala:443
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d ppp (esborrany)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/preferences-dialog.vala:446
 #, 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/preferences-dialog.vala:449
 #, c-format
 msgid "%d dpi"
 msgstr "%d ppp"
 
-#: ../src/ui.vala:1835
-msgid "New Document"
-msgstr "Document nou"
+#. Error displayed when no scanners to scan with
+#: src/scanner.vala:844
+msgid "No scanners available.  Please connect a scanner."
+msgstr "No hi ha cap escàner disponible. Connecteu-ne un."
 
-#: ../src/ui.vala:1840
-msgid "Document"
-msgstr "Document"
+#. Error displayed when cannot connect to scanner
+#: src/scanner.vala:874
+msgid "Unable to connect to scanner"
+msgstr "No s'ha pogut connectar a l'escàner"
 
-#: ../src/ui.vala:1844
-msgid "Email..."
-msgstr "Envia per correu electrònic..."
+#. Error display when unable to start scan
+#: src/scanner.vala:1227
+msgid "Unable to start scan"
+msgstr "No s'ha pogut iniciar l'escaneig"
 
-#: ../src/ui.vala:1845
-msgid "Print..."
-msgstr "Imprimeix..."
+#. Error displayed when communication with scanner broken
+#: src/scanner.vala:1240 src/scanner.vala:1340
+msgid "Error communicating with scanner"
+msgstr "S'ha produït un error en comunicar-se amb l'escàner"
 
-#: ../src/ui.vala:1853
-msgid "Help"
-msgstr "Ajuda"
+#. Help string for command line --version flag
+#: src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "Mostra la versió de llançament"
 
-#: ../src/ui.vala:1854
-msgid "About"
-msgstr "Quant a"
+#. Help string for command line --debug flag
+#: src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Mostra els missatges de depuració"
 
-#: ../src/ui.vala:1855
-msgid "Quit"
-msgstr "Surt"
+#: 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"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
-msgid "Change _Scanner"
-msgstr "Canvia l'e_scàner"
+#. Title of error dialog when scan failed
+#: src/simple-scan.vala:392
+msgid "Failed to scan"
+msgstr "Ha fallat l'escaneig"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
-msgid "_Install Drivers"
-msgstr "_Instal·la els controladors"
+#. Attempt to inhibit the screensaver when scanning
+#: src/simple-scan.vala:407
+msgid "Scan in progress"
+msgstr "S'està escanejant"
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
-msgid "Automatic"
-msgstr "Automàtic"
+#. Arguments and description for --help text
+#: src/simple-scan.vala:584
+msgid "[DEVICE…] — Scanning utility"
+msgstr "[DISPOSITIU…] - Utilitat d'escaneig"
 
-#: ../src/ui.vala:1947
-msgid "Darker"
-msgstr "Més fosc"
+#. Text printed out when an unknown command-line argument provided
+#: src/simple-scan.vala:595
+#, 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:1949
-msgid "Lighter"
-msgstr "Més clar"
+#~ msgid "Front and Back"
+#~ msgstr "Ambdues cares"
 
-#: ../src/ui.vala:1957
-msgid "Less"
-msgstr "Menys"
+#~ msgid "New"
+#~ msgstr "Nou"
 
-#: ../src/ui.vala:1959
-msgid "More"
-msgstr "Més"
+#~ msgid "Rotate Left"
+#~ msgstr "Gira a l'esquerra"
 
-#: ../src/ui.vala:1967
-msgid "Minimum"
-msgstr "Mínim"
+#~ msgid "Rotate Right"
+#~ msgstr "Gira a la dreta"
 
-#: ../src/ui.vala:1969
-msgid "Maximum"
-msgstr "Màxim"
+#~ msgid "Crop"
+#~ msgstr "Escapça"
 
-#: ../src/ui.vala:2008
-msgid "Saving document..."
-msgstr "S'està desant el document..."
+#~ msgid "Scan S_ource:"
+#~ msgstr "Font d'_escaneig:"
 
-#: ../src/ui.vala:2173
-#, c-format
-msgid "Saving page %d out of %d"
-msgstr "S'està desant la pàgina %d de %d"
+#~ msgid "New Document"
+#~ msgstr "Document nou"
+
+#~ msgid "Document"
+#~ msgstr "Document"
+
+#~ msgid "Email..."
+#~ msgstr "Envia per correu electrònic..."
+
+#~ msgid "Print..."
+#~ msgstr "Imprimeix..."
+
+#~ msgid "_Install Drivers"
+#~ msgstr "_Instal·la els controladors"
+
+#~ msgid "Minimum"
+#~ msgstr "Mínim"
+
+#~ msgid "Maximum"
+#~ msgstr "Màxim"
+
+#~ msgid "Saving document..."
+#~ msgstr "S'està desant el document..."
+
+#~ msgid "Saving page %d out of %d"
+#~ msgstr "S'està desant la pàgina %d de %d"
 
-#, c-format
 #~ msgid ""
 #~ "Usage:\n"
 #~ "  %s [DEVICE...] - Scanning utility"
@@ -772,7 +1093,6 @@ msgstr "S'està desant la pàgina %d de %d"
 #~ "Forma d'ús:\n"
 #~ "  %s [DISPOSITIU...] - Utilitat d'escaneig"
 
-#, c-format
 #~ msgid ""
 #~ "GTK+ Options:\n"
 #~ "  --class=CLASS                   Program class as used by the window "
@@ -785,8 +1105,8 @@ msgstr "S'està desant la pàgina %d de %d"
 #~ "  --g-fatal-warnings              Make all warnings fatal"
 #~ msgstr ""
 #~ "Opcions de la GTK+:\n"
-#~ "  --class=CLASSE                  Classe del programa tal com l'utilitza el "
-#~ "gestor de finestres\n"
+#~ "  --class=CLASSE                  Classe del programa tal com l'utilitza "
+#~ "el gestor de finestres\n"
 #~ "  --name=NOM                      Nom del programa tal com l'utilitza el "
 #~ "gestor de finestres\n"
 #~ "  --screen=PANTALLA               Pantalla X a utilitzar\n"
@@ -803,48 +1123,28 @@ msgstr "S'està desant la pàgina %d de %d"
 #~ msgid "Files missing"
 #~ msgstr "Manquen fitxers"
 
-#~ msgid "Height of paper in tenths of a mm"
-#~ msgstr "Alçada del paper en dècimes parts d'un mm"
-
 #~ msgid "Height of scanned image in pixels"
 #~ msgstr "Alçada de la imatge escanejada en píxels"
 
-#~ msgid "Resolution for photo scans"
-#~ msgstr "Resolució per l'escaneig de fotos"
-
-#~ msgid "Device to scan from"
-#~ msgstr "Dispositiu d'escaneig"
-
 #~ msgid "Direction of scan"
 #~ msgstr "Direcció de l'escaneig"
 
-#~ msgid "Page side to scan"
-#~ msgstr "Cara de la pàgina a escanejar"
-
-#~ msgid "Directory to save files to"
-#~ msgstr "Directori on desar els fitxers"
-
 #~ msgid ""
-#~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+#~ "The page side to scan. It can be one of the following: 'both' 'front' "
+#~ "'back'"
 #~ msgstr ""
-#~ "El costat de la pàgina a escanejar. Pot ser un dels següents: «both» "
-#~ "(ambdós), «front» (frontal) o «back» (dorsal)"
+#~ "El costat de la pàgina a escanejar. Pot ser un dels següents: "
+#~ "«both» (ambdós), «front» (frontal) o «back» (dorsal)"
 
 #~ msgid ""
-#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
+#~ "The direction of the scanner across the scanned page. It can be one of "
+#~ "the following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-"
+#~ "left'"
 #~ msgstr ""
-#~ "L'alçada del paper en dècimes de mm (o 0 per la detecció automàtica del "
-#~ "paper)."
-
-#~ msgid ""
-#~ "The direction of the scanner across the scanned page. It can be one of the "
-#~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
-#~ msgstr ""
-#~ "La direcció de l'escaneig a través de la pàgina escanejada. Pot ser una de "
-#~ "les següents: «top-to-bottom» (de dalt a baix), «bottom-to-top» (de baix a "
-#~ "dalt), «left-to-right» (d'esquerra a dreta) o «right-to-left» (de dreta a "
-#~ "esquerra)."
+#~ "La direcció de l'escaneig a través de la pàgina escanejada. Pot ser una "
+#~ "de les següents: «top-to-bottom» (de dalt a baix), «bottom-to-top» (de "
+#~ "baix a dalt), «left-to-right» (d'esquerra a dreta) o «right-to-left» (de "
+#~ "dreta a esquerra)."
 
 #~ msgid "TRUE if the application window is maximized"
 #~ msgstr "TRUE (cert) si la finestra de l'aplicació està maximitzada"
@@ -853,14 +1153,8 @@ msgstr "S'està desant la pàgina %d de %d"
 #~ "The height of scanned image in pixels. This value is updated to what the "
 #~ "last scanned page was."
 #~ msgstr ""
-#~ "L'alçada de la imatge escanejada en píxels. Aquest valor s'ha actualitzat al "
-#~ "que tenia l'última pàgina escanejada."
-
-#~ msgid "SANE device to acquire images from."
-#~ msgstr "Dispositiu SANE per a l'adquisició d'imatges."
-
-#~ msgid "Resolution for text scans"
-#~ msgstr "Resolució per l'escaneig de text"
+#~ "L'alçada de la imatge escanejada en píxels. Aquest valor s'ha actualitzat "
+#~ "al que tenia l'última pàgina escanejada."
 
 #~ msgid "The resolution in dots-per-inch of the previously scanned image."
 #~ msgstr ""
@@ -870,29 +1164,13 @@ msgstr "S'està desant la pàgina %d de %d"
 #~ msgstr "Resolució de l'última imatge escanejada"
 
 #~ msgid ""
-#~ "The directory to save files to. Defaults to the documents directory if unset."
-#~ msgstr ""
-#~ "El directori on desar els fitxers. Per defecte serà el directori de "
-#~ "documents si no es defineix."
-
-#~ msgid ""
-#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
-#~ msgstr ""
-#~ "L'amplada del paper en dècimes de mm (o 0 per la detecció automàtica del "
-#~ "paper)"
-
-#~ msgid "Type of document being scanned"
-#~ msgstr "Tipus de document a escanejar"
-
-#~ msgid ""
 #~ "Type of document being scanned. 'text' for text documents, 'photo' for "
 #~ "photos. This setting decides on the scan resolution, colors and post-"
 #~ "processing."
 #~ msgstr ""
 #~ "Tipus de document a escanejar. «text» per documents de text o «photo» per "
-#~ "fotos. Aquest paràmetre decideix la resolució de l'escaneig, els colors i el "
-#~ "postprocessament."
+#~ "fotos. Aquest paràmetre decideix la resolució de l'escaneig, els colors i "
+#~ "el postprocessament."
 
 #~ msgid "Window height in pixels"
 #~ msgstr "Alçada de la finestra en píxels"
@@ -901,28 +1179,18 @@ msgstr "S'està desant la pàgina %d de %d"
 #~ msgstr "Amplada de la finestra en píxels"
 
 #~ msgid ""
-#~ "The width of scanned image in pixels. This value is updated to what the last "
-#~ "scanned page was."
+#~ "The width of scanned image in pixels. This value is updated to what the "
+#~ "last scanned page was."
 #~ msgstr ""
-#~ "L'amplada de la imatge escanejada en píxels. Aquest valor s'ha actualitzat "
-#~ "al que tenia l'última pàgina escanejada."
-
-#~ msgid "The resolution in dots-per-inch to use when scanning text."
-#~ msgstr "La resolució en punts per polzada quan s'escanegi text."
-
-#~ msgid "The resolution in dots-per-inch to use when scanning photos."
-#~ msgstr "La resolució en punts per polzada quan s'escanegin fotos."
+#~ "L'amplada de la imatge escanejada en píxels. Aquest valor s'ha "
+#~ "actualitzat al que tenia l'última pàgina escanejada."
 
 #~ msgid "Width of scanned image in pixels"
 #~ msgstr "Amplada de la imatge escanejada en píxels"
 
-#~ msgid "Width of paper in tenths of a mm"
-#~ msgstr "Amplada del paper en dècimes de mm"
-
 #~ msgid "Select File _Type"
 #~ msgstr "Seleccioneu el _tipus de fitxer"
 
-#, c-format
 #~ msgid ""
 #~ "Help Options:\n"
 #~ "  -d, --debug                     Print debugging messages\n"
@@ -938,36 +1206,5 @@ msgstr "S'està desant la pàgina %d de %d"
 #~ "  --help-all                      Mostra l'ajuda de totes les opcions\n"
 #~ "  --help-gtk                      Mostra l'ajuda de les opcions de la GTK+"
 
-#~ msgid "Scanned Document"
-#~ msgstr "Document escanejat"
-
-#~ msgid "The page side to scan."
-#~ msgstr "La cara de la pàgina a escanejar."
-
-#~ msgid ""
-#~ "Type of document being scanned. This setting decides on the scan resolution, "
-#~ "colors and post-processing."
-#~ msgstr ""
-#~ "El tipus de document que s'està escanejant. Aquest paràmetre decideix la "
-#~ "resolució d'escaneig, els colors i el processament posterior."
-
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "La direcció de l'escànner a través de la pàgina escanejada."
-
-#~ msgid "Quality value to use for JPEG compression."
-#~ msgstr "Valor de la qualitat a utilitzar per la compressió JPEG."
-
-#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
-#~ msgstr "L'ajustament del contrast, de -100 a 100 (on 0 significa cap)"
-
-#~ msgid "Contrast of scan"
-#~ msgstr "Contrast de l'escaneig"
-
-#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
-#~ msgstr "L'ajustament de la brillantor, de -100 a 100 (on 0 significa cap)"
-
-#~ msgid "Brightness of scan"
-#~ msgstr "Brillantor de l'escaneig"
-
-#~ msgid "Quality value to use for JPEG compression"
-#~ msgstr "Valor de la qualitat a utilitzar per la compressió JPEG"
diff --git a/po/ca@valencia.gmo b/po/ca@valencia.gmo
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..d8a8def 100644
--- a/po/ca@valencia.po
+++ b/po/ca@valencia.po
@@ -1,514 +1,538 @@
-# Catalan (Valencian) translation for simple-scan
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# Catalan translation for simple-scan
+# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
 # This file is distributed under the same license as the simple-scan package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
+# Jordi Serratosa <jordis@softcatala.cat>, 2017.
+#  Adolfo Jayme https://launchpad.net/~fitojb\n"
+#  David Planella https://launchpad.net/~dpm\n"
+#  J. https://launchpad.net/~jose-manuel-rodriguez-moreno\n"
+#  J. Gregpori Raya https://launchpad.net/~gregori\n"
+#  Joan Duran https://launchpad.net/~jodufi\n"
+#  Sergi https://launchpad.net/~scaparrosj\n"
+#  Siegfried Gevatter https://launchpad.net/~rainct\n"
+#  SiscoGarcia https://launchpad.net/~sisco\n"
+#  Walter Garcia-Fontes https://launchpad.net/~walter-garcia\n"
+#  pancake https://launchpad.net/~pancake"
 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"
-"Language-Team: Catalan (Valencian) <ca@valencia@li.org>\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
+"product=simple-scan&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-09-18 22:10+0000\n"
+"PO-Revision-Date: 2017-09-01 14:42+0200\n"
+"Last-Translator: Xavi Ivars <xavi.ivars@gmail.com>\n"
+"Language-Team: Catalan <ca@li.org>\n"
+"Language: ca-valencia\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-25 06:10+0000\n"
+"X-Generator: Poedit 1.8.11\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. Button to submit authorization dialog
-#: data/simple-scan.ui:24
-msgid "_Authorize"
-msgstr "_Autoritza"
+#: data/org.gnome.SimpleScan.gschema.xml:11
+msgid "Device to scan from"
+msgstr "Dispositiu d'escaneig"
 
-#. Label beside username entry
-#: data/simple-scan.ui:102
-msgid "_Username for resource:"
-msgstr "_Nom d'usuari del recurs:"
+#: data/org.gnome.SimpleScan.gschema.xml:12
+msgid "SANE device to acquire images from."
+msgstr "Dispositiu SANE per a l'adquisició d'imatges."
 
-#. Label beside password entry
-#: data/simple-scan.ui:117
-msgid "_Password:"
-msgstr "_Contrasenya:"
+#: data/org.gnome.SimpleScan.gschema.xml:20
+msgid "Type of document being scanned"
+msgstr "Tipus de document a escanejar"
 
-#. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
-msgid "Front and Back"
-msgstr "Ambdues cares"
+#: data/org.gnome.SimpleScan.gschema.xml:21
+msgid ""
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+msgstr ""
+"El tipus de document que s'està escanejant. Este paràmetre decideix la "
+"resolució d'escaneig, els colors i el processament posterior."
 
-#. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
-msgid "Front"
-msgstr "Anvers de la pàgina"
+#: data/org.gnome.SimpleScan.gschema.xml:25
+msgid "Width of paper in tenths of a mm"
+msgstr "Amplària del paper en dècimes de mm"
 
-#. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
-msgid "Back"
-msgstr "Revers de la pàgina"
+#: data/org.gnome.SimpleScan.gschema.xml:26
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"L'amplària del paper en dècimes de mm (o 0 per la detecció automàtica del "
+"paper)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:30
+msgid "Height of paper in tenths of a mm"
+msgstr "Alçària del paper en dècimes parts d'un mm"
+
+#: data/org.gnome.SimpleScan.gschema.xml:31
+msgid ""
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"L'alçària del paper en dècimes de mm (o 0 per la detecció automàtica del "
+"paper)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:35
+msgid "Brightness of scan"
+msgstr "Brillantor de l'escaneig"
+
+#: data/org.gnome.SimpleScan.gschema.xml:36
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr "L'ajustament de la brillantor, de -100 a 100 (on 0 significa cap)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:40
+msgid "Contrast of scan"
+msgstr "Contrast de l'escaneig"
+
+#: data/org.gnome.SimpleScan.gschema.xml:41
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr "L'ajustament del contrast, de -100 a 100 (on 0 indica cap)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:45
+msgid "Resolution for text scans"
+msgstr "Resolució per l'escaneig de text"
+
+#: data/org.gnome.SimpleScan.gschema.xml:46
+msgid "The resolution in dots-per-inch to use when scanning text."
+msgstr "La resolució en punts per polzada quan s'escanegi text."
+
+#: data/org.gnome.SimpleScan.gschema.xml:50
+msgid "Resolution for photo scans"
+msgstr "Resolució per l'escaneig de fotos"
+
+#: data/org.gnome.SimpleScan.gschema.xml:51
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr "La resolució en punts per polzada quan s'escanegin fotos."
+
+#: data/org.gnome.SimpleScan.gschema.xml:55
+msgid "Page side to scan"
+msgstr "Cara de la pàgina a escanejar"
 
+#: data/org.gnome.SimpleScan.gschema.xml:56
+msgid "The page side to scan."
+msgstr "La cara de la pàgina a escanejar."
+
+#: data/org.gnome.SimpleScan.gschema.xml:60
+msgid "Directory to save files to"
+msgstr "Directori on guardar els fitxers"
+
+#: data/org.gnome.SimpleScan.gschema.xml:61
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+"El directori on guardar els fitxers. Per defecte serà el directori de "
+"documents si no es defineix."
+
+#: data/org.gnome.SimpleScan.gschema.xml:66
+msgid "Quality value to use for JPEG compression"
+msgstr "Valor de la qualitat a utilitzar per la compressió JPEG"
+
+#: data/org.gnome.SimpleScan.gschema.xml:67
+msgid "Quality value to use for JPEG compression."
+msgstr "Valor de la qualitat a utilitzar per la compressió JPEG."
+
+#: data/org.gnome.SimpleScan.gschema.xml:72
+msgid "Delay in millisecond between pages"
+msgstr "Retard en mil·lisegons entre pàgines"
+
+#: data/org.gnome.SimpleScan.gschema.xml:73
+msgid "Delay in millisecond between pages."
+msgstr "Retard en mil·lisegons entre pàgines."
+
+#. Title of scan window
+#. Set HeaderBar title here because Glade doesn't keep it translated
+#. https://bugzilla.gnome.org/show_bug.cgi?id=782753
 #. 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
+#: data/simple-scan.appdata.xml.in:6 data/simple-scan.desktop.in:3
+#: src/app-window.ui:76 src/app-window.vala:1560
 msgid "Simple Scan"
 msgstr "Escaneig senzill"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
-msgid "_Document"
-msgstr "_Document"
+#: data/simple-scan.appdata.xml.in:7 data/simple-scan.desktop.in:5
+msgid "Scan Documents"
+msgstr "Escanegeu documents"
 
-#. Scan menu item
-#: data/simple-scan.ui:260
-msgid "Sc_an"
-msgstr "Esc_aneja"
+#: 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 "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+"Una manera realment senzilla d'escanejar tant documents com fotos. Podeu "
+"retallar les parts dolentes d'una foto o girar-la si està en la posició "
+"incorrecta.  Podeu imprimir els vostres escanejos, exportar-los a pdf, o "
+"guardar-los en diversos formats d'imatge."
+
+#: data/simple-scan.appdata.xml.in:14
+msgid "Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+"L'Escaneig senzill fa servir l'entorn SANE per donar suport a la major part "
+"dels escàners existents."
 
+#: data/simple-scan.desktop.in:4
+msgid "Document Scanner"
+msgstr "Escàner de documents"
+
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: data/simple-scan.desktop.in:7
+msgid "scan;scanner;flatbed;adf;"
+msgstr "escanejar;escàner;pla;adf;"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: data/simple-scan.desktop.in:10
+msgid "scanner"
+msgstr "scanner"
+
+#. Toolbar scan menu item to scan a single page from the scanner
 #. 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/app-window.ui:22 src/app-window.ui:123 src/app-window.ui:820
 msgid "Single _Page"
 msgstr "Pàgina _individual"
 
+#. Toolbar scan menu item to scan all pages from a document feeder
 #. 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/app-window.ui:31 src/app-window.ui:133 src/app-window.ui:829
 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
-msgid "_Stop Scan"
-msgstr "_Atura l'escaneig"
+#. Toolbar scan menu item to scan continuously from the flatbed
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/app-window.ui:40 src/app-window.ui:143 src/app-window.ui:838
+msgid "_Multiple Pages From Flatbed"
+msgstr "_Múltiples pàgines des d'un escàner pla"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:853
 msgid "Text"
 msgstr "Text"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:863
 msgid "Photo"
 msgstr "Foto"
 
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: src/app-window.ui:91
+msgid "_Document"
+msgstr "_Document"
+
+#. Scan menu item
+#: src/app-window.ui:110
+msgid "Sc_an"
+msgstr "Esc_aneja"
+
+#. Menu entry to stop current scan
+#: src/app-window.ui:154
+msgid "_Stop Scan"
+msgstr "_Atura l'escaneig"
+
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/app-window.ui:196 src/app-window.vala:967 src/app-window.vala:1590
 msgid "Reorder Pages"
-msgstr ""
+msgstr "Reordena les pàgines"
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/app-window.ui:215
 msgid "_Email"
 msgstr "_Envia per correu"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/app-window.ui:280
 msgid "_Page"
 msgstr "_Pàgina"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/app-window.ui:290
 msgid "Rotate _Left"
 msgstr "Gira a l'_esquerra"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/app-window.ui:300
 msgid "Rotate _Right"
 msgstr "Gira a la _dreta"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/app-window.ui:310
 msgid "_Crop"
 msgstr "_Escapçament"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/app-window.ui:320
 msgid "_None"
 msgstr "_Cap"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/app-window.ui:331
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/app-window.ui:342
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/app-window.ui:353
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/app-window.ui:364
 msgid "_Letter"
 msgstr "_Carta EUA"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/app-window.ui:375
 msgid "Le_gal"
 msgstr "Le_gal EUA"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/app-window.ui:386
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/app-window.ui:397
 msgid "_Custom"
 msgstr "_Personalitzat"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/app-window.ui:415
 msgid "_Rotate Crop"
 msgstr "_Gira l'escapçament"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/app-window.ui:428
 msgid "Move Left"
 msgstr "Mou a l'esquerra"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/app-window.ui:437
 msgid "Move Right"
 msgstr "Mou a la dreta"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/app-window.ui:474
 msgid "_Help"
 msgstr "A_juda"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/app-window.ui:482
 msgid "_Contents"
 msgstr "C_ontingut"
 
-#. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
-msgid "Start a new document"
-msgstr "Comença un document nou"
-
-#: data/simple-scan.ui:675
-msgid "New"
-msgstr "Nou"
-
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/app-window.ui:520 src/app-window.ui:720
 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/app-window.ui:522 src/app-window.ui:716
 msgid "Scan"
 msgstr "Escaneja"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/app-window.ui:538 src/app-window.ui:787
 msgid "Save document to a file"
 msgstr "Guarda el document en un fitxer"
 
-#: ../src/ui.vala:1842
+#: src/app-window.ui:540
 msgid "Save"
 msgstr "Guarda"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/app-window.ui:555 src/app-window.ui:700
 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/app-window.ui:556 src/app-window.ui:697
 msgid "Stop"
-msgstr "Para"
+msgstr "Atura"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "Gireu la pàgina cap a l'esquerra (en sentit antihorari)"
-
-#. Label on rotate page left (anti-clockwise) item
-#: data/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
-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
-msgid "Rotate Right"
-msgstr "Gira a la dreta"
-
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
-msgid "Crop the selected page"
-msgstr "Escapça la pàgina seleccionada"
-
-#: data/simple-scan.ui:781
-msgid "Crop"
-msgstr "Escapça"
-
-#: ../src/ui.vala:1849
-msgid "Preferences"
-msgstr "Preferències"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1048
-msgid "Scan S_ource:"
-msgstr "Font d'_escaneig:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1079
-msgid "_Text Resolution:"
-msgstr "_Resolució de text:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1095
-msgid "_Photo Resolution:"
-msgstr "_Resolució fotogràfica:"
-
-#. Label beside scan side combo box
-#: data/simple-scan.ui:1139
-msgid "Scan Side:"
-msgstr "Cara a escanejar:"
-
-#. Label beside page size combo box
-#: data/simple-scan.ui:1169
-msgid "Page Size:"
-msgstr "Mida de la pàgina:"
-
-#. Label beside brightness scale
-#: data/simple-scan.ui:1199
-msgid "Brightness:"
-msgstr "Brillantor:"
-
-#. Label beside contrast scale
-#: data/simple-scan.ui:1229
-msgid "Contrast:"
-msgstr "Contrast:"
-
-#. Label beside quality scale
-#: data/simple-scan.ui:1260
-msgid "Quality:"
-msgstr "Qualitat:"
-
-#: data/simple-scan.desktop.in:4
-msgid "Document Scanner"
-msgstr ""
+#. Label shown when searching for scanners
+#: src/app-window.ui:611
+msgid "Searching for Scanners…"
+msgstr "S'estan cercant escànners…"
 
-#: data/simple-scan.desktop.in:5
-msgid "Scan Documents"
-msgstr "Escanegeu documents"
+#: src/app-window.vala:237 src/app-window.vala:1380
+msgid "_Close"
+msgstr "_Tanca"
 
-#: data/simple-scan.desktop.in:6
-msgid "scan;scanner;flatbed;adf;"
-msgstr ""
+#. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
+#: src/app-window.vala:246
+#, c-format
+msgid "Username and password required to access “%s”"
+msgstr "Cal un usuari i contrasenya per a accedir a «%s»"
 
-#: data/simple-scan.desktop.in:8
-msgid "scanner"
-msgstr ""
+#. Label shown when detected a scanner
+#: src/app-window.vala:266 src/app-window.vala:584
+msgid "Ready to Scan"
+msgstr "A punt per escanejar"
 
-#: data/simple-scan.appdata.xml.in:8
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: src/app-window.vala:273
+msgid "Additional software needed"
+msgstr "Cal un programari addicional"
 
-#: data/simple-scan.appdata.xml.in:13
+#. Instructions to install driver software
+#: src/app-window.vala:275
 msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
+"You need to <a href=\"install-firmware\">install driver software</a> for "
+"your scanner."
 msgstr ""
-
-#. Error displayed when no scanners to scan with
-#: ../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
-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
-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
-msgid "Error communicating with scanner"
-msgstr "S'ha produït un error en comunicar-s'amb l'escàner"
-
-#. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
-msgid "Show release version"
-msgstr "Mostra la versió de llançament"
-
-#. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
-msgid "Print debugging messages"
-msgstr "Mostra els missatges de depuració"
-
-#: ../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
-msgid "Failed to scan"
-msgstr "Ha fallat l'escaneig"
-
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
-msgid "[DEVICE...] - Scanning utility"
-msgstr "[DISPOSITIU...] - Utilitat d'escaneig"
-
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
-#, 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
-msgid "_Close"
-msgstr "_Tanca"
-
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../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»"
+"Heu <a href=\"install-firmware\">d'instal·lar un programari controlador</a> "
+"per al vostre escàner."
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/app-window.vala:281
 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/app-window.vala:283
 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
-msgid "Additional software needed"
-msgstr ""
-
-#. Instructions to install driver software
-#: ../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
-msgid "Save As..."
-msgstr "Anomena i guarda..."
+#: src/app-window.vala:298
+msgid "Save As…"
+msgstr "Anomena i guarda…"
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/app-window.vala:301 src/app-window.vala:471 src/app-window.vala:552
 msgid "_Cancel"
 msgstr "_Cancel·la"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/app-window.vala:302 src/app-window.vala:553
 msgid "_Save"
 msgstr "Al_ça"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/app-window.vala:310
 msgid "Scanned Document.pdf"
 msgstr "Document escanejat.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#. Save dialog: Filter name to show only supported image files
+#: src/app-window.vala:316
 msgid "Image Files"
 msgstr "Fitxers d'imatge"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/app-window.vala:326
 msgid "All Files"
 msgstr "Tots els fitxers"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/app-window.vala:335
 msgid "PDF (multi-page document)"
 msgstr "PDF (document multipàgina)."
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/app-window.vala:341
 msgid "JPEG (compressed)"
 msgstr "JPEG (comprimit)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/app-window.vala:347
 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
+#. Save dialog: Label for sabing in WEBP format
+#: src/app-window.vala:354
+msgid "WebP (compressed)"
+msgstr "WebP (comprimit)"
+
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
+#: src/app-window.vala:364
 msgid "File format:"
-msgstr ""
+msgstr "Format del fitxer:"
+
+#. Label in save dialog beside compression slider
+#: src/app-window.vala:376
+msgid "Compression:"
+msgstr "Compressió:"
+
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/app-window.vala:470
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr "Ja existeix un fitxer amb el nom «%s». Voleu reemplaçar-lo?"
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/app-window.vala:473
+msgid "_Replace"
+msgstr "_Reemplaça"
+
+#: src/app-window.vala:512
+msgid "Saving"
+msgstr "Desament"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/app-window.vala:527
 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
-msgid "If you don't save, changes will be permanently lost."
+#: src/app-window.vala:550
+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/app-window.vala:591
 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/app-window.vala:593
 msgid "Discard Changes"
 msgstr "Descarta els canvis"
 
+#. Label shown when scan started
+#: src/app-window.vala:692
+msgid "Contacting scanner…"
+msgstr "S'està contactant l'e_scàner…"
+
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/app-window.vala:800
 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/app-window.vala:812
 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/app-window.vala:990
 msgid "Combine sides"
-msgstr ""
+msgstr "Combina els costats"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/app-window.vala:1000
 msgid "Combine sides (reverse)"
-msgstr ""
+msgstr "Combina els costats (invers)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/app-window.vala:1010
 msgid "Reverse"
-msgstr ""
+msgstr "Reverteix"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/app-window.vala:1020
 msgid "Keep unchanged"
-msgstr ""
+msgstr "Mantingues sense canvi"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/app-window.vala:1250
 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/app-window.vala:1271
 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"
@@ -523,7 +547,7 @@ 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 ""
-"Este programa és programari lliure: podeu redistribuir-lo l'i/o modificar-"
+"Este programa és programari lliure: podeu redistribuir-lo i/o modificar-"
 "lo\n"
 "sota els termes de la Llicència Pública General GNU (GNU GPL) segons publica "
 "la \n"
@@ -540,301 +564,528 @@ msgstr ""
 "juntament amb este programa. Si no, mireu <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/app-window.vala:1274
 msgid "About Simple Scan"
-msgstr "Quant a l'escaneig senzill"
+msgstr "Quant a l'Escaneig senzill"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/app-window.vala:1277
 msgid "Simple document scanning tool"
 msgstr "Eina senzilla d'escaneig de documents"
 
-#: ../src/ui.vala:1487
+#: src/app-window.vala:1286
 msgid "translator-credits"
 msgstr ""
-"Launchpad Contributions:\n"
-"  David Planella https://launchpad.net/~dpm\n"
-"  Joan Duran https://launchpad.net/~jodufi"
+"Jordi Mas i Hernàndez (2017)\n"
+"Launchpad contributors (2010-2016)"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/app-window.vala:1308
 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
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:1310
 msgid "Quit without Saving"
 msgstr "Ix sense guardar"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/app-window.vala:1357
 msgid "You appear to have a Brother scanner."
-msgstr ""
+msgstr "Pareix que teniu un escàner Brother."
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/app-window.vala:1359
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.brother.com\">Brother website</a>."
+"Drivers for this are available on the <a href=\"http://support.brother.com"
+"\">Brother website</a>."
 msgstr ""
+"Hi ha controladors disponibles a la <a href=\"http://support.brother.com"
+"\">pàgina web de Brother</a>."
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/app-window.vala:1363
 msgid "You appear to have a Samsung scanner."
-msgstr ""
+msgstr "Pareix que teniu un escàner Samsung."
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/app-window.vala:1365
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://samsung.com/support\">Samsung website</a>."
+"Drivers for this are available on the <a href=\"http://samsung.com/support"
+"\">Samsung website</a>."
 msgstr ""
+"Hi ha controladors disponibles a la <a href=\"http://samsung.com/support"
+"\">pàgina web de Samsung</a>."
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/app-window.vala:1369
 msgid "You appear to have an HP scanner."
-msgstr ""
+msgstr "Pareix que teniu un escàner HP."
 
 #. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/app-window.vala:1374
 msgid "You appear to have an Epson scanner."
-msgstr ""
+msgstr "Pareix que teniu un escàner Epson."
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/app-window.vala:1376
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.epson.com\">Epson website</a>."
+"Drivers for this are available on the <a href=\"http://support.epson.com"
+"\">Epson website</a>."
 msgstr ""
+"Hi ha controladors disponibles a la <a href=\"http://samsung.com/support"
+"\">pàgina web d'Epson</a>."
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/app-window.vala:1380
 msgid "Install drivers"
-msgstr ""
+msgstr "Instal·la els controladors"
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/app-window.vala:1411
 msgid "Once installed you will need to restart Simple Scan."
-msgstr ""
+msgstr "Un cop instal·lat haureu de reiniciar l'Escaneig senzill."
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
-msgid "Installing drivers..."
-msgstr ""
+#: src/app-window.vala:1423
+msgid "Installing drivers…"
+msgstr "S'estan instal·lant els controladors…"
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/app-window.vala:1431
 msgid "Drivers installed successfully!"
-msgstr ""
+msgstr "La instal·lació dels controladors ha estat reeixida!"
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/app-window.vala:1441
 #, c-format
 msgid "Failed to install drivers (error code %d)."
-msgstr ""
+msgstr "Ha fallat la instal·lació dels controladors (codi d'error %d)."
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/app-window.vala:1447
 msgid "Failed to install drivers."
-msgstr ""
+msgstr "No s'han pogut instal·lar els controladors."
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/app-window.vala:1454
 #, c-format
-msgid "You need to install the %s package(s)."
-msgstr ""
+msgid "You need to install the %s package."
+msgid_plural "You need to install the %s packages."
+msgstr[0] "Heu d'instal·lar el paquet %s."
+msgstr[1] "Heu d'instal·lar els paquets %s."
+
+#. Title of preferences dialog
+#: src/app-window.vala:1568 src/app-window.vala:1591
+#: src/preferences-dialog.ui:53
+msgid "Preferences"
+msgstr "Preferències"
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
-#, c-format
-msgid "%d dpi (default)"
-msgstr "%d ppp (predeterminat)"
+#: src/app-window.vala:1572
+msgid "Keyboard Shortcuts"
+msgstr "Dreceres de teclat"
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
-#, c-format
-msgid "%d dpi (draft)"
-msgstr "%d ppp (esborrany)"
+#: src/app-window.vala:1573
+msgid "Help"
+msgstr "Ajuda"
 
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
-#, c-format
-msgid "%d dpi (high resolution)"
-msgstr "%d ppp (alta resolució)"
+#: src/app-window.vala:1574
+msgid "About"
+msgstr "Quant a"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/app-window.vala:1575
+msgid "Quit"
+msgstr "Ix"
+
+#: src/app-window.vala:1589
+msgid "Email"
+msgstr "Correu electrònic"
+
+#. Populate ActionBar (not supported in Glade)
+#. https://bugzilla.gnome.org/show_bug.cgi?id=769966
+#. Label on new document button
+#: src/app-window.vala:1599
+msgid "Start Again…"
+msgstr "Comença de nou…"
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: src/app-window.vala:1616
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Gireu la pàgina cap a l'esquerra (en sentit antihorari)"
+
+#. Tooltip for rotate right (clockwise) button
+#: src/app-window.vala:1623
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Gireu la pàgina cap a la dreta (en sentit horari)"
+
+#. Tooltip for crop button
+#: src/app-window.vala:1633
+msgid "Crop the selected page"
+msgstr "Escapça la pàgina seleccionada"
+
+#. Tooltip for delete button
+#: src/app-window.vala:1649
+msgid "Delete the selected page"
+msgstr "Suprimeix la pàgina seleccionada"
+
+#. Text of button for cancelling save
+#: src/app-window.vala:1814
+msgid "Cancel"
+msgstr "Cancel·la"
+
+#. Button to submit authorization dialog
+#: src/authorize-dialog.ui:25
+msgid "_Authorize"
+msgstr "_Autoritza"
+
+#. Label beside username entry
+#: src/authorize-dialog.ui:99
+msgid "_Username for resource:"
+msgstr "_Nom d'usuari del recurs:"
+
+#. Label beside password entry
+#: src/authorize-dialog.ui:112
+msgid "_Password:"
+msgstr "_Contrasenya:"
+
+#: src/book.vala:331 src/book.vala:337
 #, c-format
-msgid "%d dpi"
-msgstr "%d ppp"
+msgid "Unable to encode page %i"
+msgstr "No s'ha pogut codificar la pàgina %i"
+
+#: src/help-overlay.ui:12
+msgctxt "shortcut window"
+msgid "Scanning"
+msgstr "Escaneig"
+
+#: src/help-overlay.ui:17
+msgctxt "shortcut window"
+msgid "Scan a single page"
+msgstr "Escaneja una sola pàgina"
+
+#: src/help-overlay.ui:24
+msgctxt "shortcut window"
+msgid "Scan all pages from document feeder"
+msgstr "Escaneja totes les pàgines des de l'alimentador"
+
+#: src/help-overlay.ui:31
+msgctxt "shortcut window"
+msgid "Scan continuously from a flatbed scanner"
+msgstr "Escaneja contínuament des d'un escàner pla"
+
+#: src/help-overlay.ui:38
+msgctxt "shortcut window"
+msgid "Stop scan in progress"
+msgstr "Atura l'escaneig en curs"
+
+#: src/help-overlay.ui:46
+msgctxt "shortcut window"
+msgid "Document Modification"
+msgstr "Modificació del document"
+
+#: src/help-overlay.ui:51
+msgctxt "shortcut window"
+msgid "Move page left"
+msgstr "Mou a l'esquerra"
 
-#: ../src/ui.vala:1835
-msgid "New Document"
-msgstr ""
+#: src/help-overlay.ui:58
+msgctxt "shortcut window"
+msgid "Move page right"
+msgstr "Mou a la dreta"
 
-#: ../src/ui.vala:1840
-msgid "Document"
-msgstr ""
+#: src/help-overlay.ui:65
+msgctxt "shortcut window"
+msgid "Rotate page to the left (anti-clockwise)"
+msgstr "Gireu la pàgina cap a l'esquerra (en sentit antihorari)"
 
-#: ../src/ui.vala:1844
-msgid "Email..."
-msgstr ""
+#: src/help-overlay.ui:72
+msgctxt "shortcut window"
+msgid "Rotate page to the right (clockwise)"
+msgstr "Gireu la pàgina cap a la dreta (en sentit horari)"
 
-#: ../src/ui.vala:1845
-msgid "Print..."
-msgstr ""
+#: src/help-overlay.ui:79
+msgctxt "shortcut window"
+msgid "Delete page"
+msgstr "Suprimeix la pàgina"
 
-#: ../src/ui.vala:1853
-msgid "Help"
-msgstr ""
+#: src/help-overlay.ui:87
+msgctxt "shortcut window"
+msgid "Document Management"
+msgstr "Gestió de documents"
 
-#: ../src/ui.vala:1854
-msgid "About"
-msgstr ""
+#: src/help-overlay.ui:92
+msgctxt "shortcut window"
+msgid "Start new document"
+msgstr "Comença un document nou"
 
-#: ../src/ui.vala:1855
-msgid "Quit"
-msgstr ""
+#: src/help-overlay.ui:99
+msgctxt "shortcut window"
+msgid "Save scanned document"
+msgstr "Guarda el document escanejat"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
-msgid "Change _Scanner"
-msgstr "Canvia l'e_scàner"
+#: src/help-overlay.ui:106
+msgctxt "shortcut window"
+msgid "Email scanned document"
+msgstr "Envia per correu el document escanejat"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
-msgid "_Install Drivers"
-msgstr ""
+#: src/help-overlay.ui:113
+msgctxt "shortcut window"
+msgid "Print scanned document"
+msgstr "Imprimeix el document escanejat"
+
+#: src/help-overlay.ui:120
+msgctxt "shortcut window"
+msgid "Copy current page to clipboard"
+msgstr "Copia la pàgina actual al porta-retalls"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:113
+msgid "_Scanner"
+msgstr "_Escàner"
+
+#. Label beside scan side combo box
+#: src/preferences-dialog.ui:143
+msgid "Scan Sides"
+msgstr "Cares a escanejar"
+
+#. Label beside page size combo box
+#: src/preferences-dialog.ui:160
+msgid "Page Size"
+msgstr "Mida de la pàgina"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:191
+msgid "Front"
+msgstr "Anvers de la pàgina"
+
+#. Preferences Dialog: Toggle button to select scanning on the back side of a page
+#: src/preferences-dialog.ui:206
+msgid "Back"
+msgstr "Revers de la pàgina"
+
+#. Preferences Dialog: Toggle button to select scanning on both sides of a page
+#: src/preferences-dialog.ui:221
+msgid "Both"
+msgstr "Ambdues"
+
+#. Label beside page delay scale
+#: src/preferences-dialog.ui:260
+msgid "Delay"
+msgstr "Espera"
+
+#. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
+#: src/preferences-dialog.ui:276
+msgid "Multiple pages from flatbed"
+msgstr "Múltiples pàgines des d'un escàner pla"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:295
+msgid "3"
+msgstr "3"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:310
+msgid "5"
+msgstr "5"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:326
+msgid "7"
+msgstr "7"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:342
+msgid "10"
+msgstr "10"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:358
+msgid "15"
+msgstr "15"
+
+#. Label after page delay radio buttons
+#: src/preferences-dialog.ui:385
+msgid "Seconds"
+msgstr "Segons"
+
+#. Preferences Dialog: Tab label for scanning settings
+#: src/preferences-dialog.ui:413
+msgid "Scanning"
+msgstr "S'està escanejant"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:436
+msgid "_Text Resolution"
+msgstr "_Resolució de text"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:452
+msgid "_Photo Resolution"
+msgstr "_Resolució fotogràfica"
+
+#. Label beside brightness scale
+#: src/preferences-dialog.ui:505
+msgid "Brightness"
+msgstr "Brillantor"
+
+#. Label beside contrast scale
+#: src/preferences-dialog.ui:521
+msgid "Contrast"
+msgstr "Contrast"
+
+#. Preferences Dialog: Tab for quality settings
+#: src/preferences-dialog.ui:576
+msgid "Quality"
+msgstr "Qualitat"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/preferences-dialog.vala:77
 msgid "Automatic"
 msgstr "Automàtic"
 
-#: ../src/ui.vala:1947
+#: src/preferences-dialog.vala:116
 msgid "Darker"
 msgstr "Més fosc"
 
-#: ../src/ui.vala:1949
+#: src/preferences-dialog.vala:118
 msgid "Lighter"
 msgstr "Més clar"
 
-#: ../src/ui.vala:1957
+#: src/preferences-dialog.vala:126
 msgid "Less"
 msgstr "Menys"
 
-#: ../src/ui.vala:1959
+#: src/preferences-dialog.vala:128
 msgid "More"
 msgstr "Més"
 
-#: ../src/ui.vala:1967
-msgid "Minimum"
-msgstr "Mínim"
+#. Preferences dialog: Label for default resolution in resolution list
+#: src/preferences-dialog.vala:440
+#, c-format
+msgid "%d dpi (default)"
+msgstr "%d ppp (predeterminat)"
 
-#: ../src/ui.vala:1969
-msgid "Maximum"
-msgstr "Màxim"
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: src/preferences-dialog.vala:443
+#, c-format
+msgid "%d dpi (draft)"
+msgstr "%d ppp (esborrany)"
 
-#: ../src/ui.vala:2008
-msgid "Saving document..."
-msgstr "S'està guardant el document..."
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: src/preferences-dialog.vala:446
+#, c-format
+msgid "%d dpi (high resolution)"
+msgstr "%d ppp (alta resolució)"
 
-#: ../src/ui.vala:2173
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: src/preferences-dialog.vala:449
 #, c-format
-msgid "Saving page %d out of %d"
-msgstr "S'està guardant la pàgina %d de %d"
+msgid "%d dpi"
+msgstr "%d ppp"
 
-#~ msgid "4&#xD7;6"
-#~ msgstr "4&#xD7;6"
+#. Error displayed when no scanners to scan with
+#: src/scanner.vala:844
+msgid "No scanners available.  Please connect a scanner."
+msgstr "No hi ha cap escàner disponible. Connecteu-ne un."
 
-#~ msgid "Device to scan from"
-#~ msgstr "Dispositiu d'escaneig"
+#. Error displayed when cannot connect to scanner
+#: src/scanner.vala:874
+msgid "Unable to connect to scanner"
+msgstr "No s'ha pogut connectar a l'escàner"
 
-#~ msgid "Direction of scan"
-#~ msgstr "Direcció de l'escaneig"
+#. Error display when unable to start scan
+#: src/scanner.vala:1227
+msgid "Unable to start scan"
+msgstr "No s'ha pogut iniciar l'escaneig"
 
-#~ msgid "Height of paper in tenths of a mm"
-#~ msgstr "Alçada del paper en dècimes parts d'un mm"
+#. Error displayed when communication with scanner broken
+#: src/scanner.vala:1240 src/scanner.vala:1340
+msgid "Error communicating with scanner"
+msgstr "S'ha produït un error en comunicar-se amb l'escàner"
 
-#~ msgid "Height of scanned image in pixels"
-#~ msgstr "Alçada de la imatge escanejada en píxels"
+#. Help string for command line --version flag
+#: src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "Mostra la versió de llançament"
 
-#~ msgid "Page side to scan"
-#~ msgstr "Cara de la pàgina a escanejar"
+#. Help string for command line --debug flag
+#: src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Mostra els missatges de depuració"
 
-#~ msgid "Resolution for photo scans"
-#~ msgstr "Resolució per l'escaneig de fotos"
+#: 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"
 
-#~ msgid "Resolution for text scans"
-#~ msgstr "Resolució per l'escaneig de text"
+#. Title of error dialog when scan failed
+#: src/simple-scan.vala:392
+msgid "Failed to scan"
+msgstr "Ha fallat l'escaneig"
 
-#~ msgid "Resolution of last scanned image"
-#~ msgstr "Resolució de l'última imatge escanejada"
+#. Attempt to inhibit the screensaver when scanning
+#: src/simple-scan.vala:407
+msgid "Scan in progress"
+msgstr "S'està escanejant"
 
-#~ msgid "SANE device to acquire images from."
-#~ msgstr "Dispositiu SANE per a l'adquisició d'imatges."
+#. Arguments and description for --help text
+#: src/simple-scan.vala:584
+msgid "[DEVICE…] — Scanning utility"
+msgstr "[DISPOSITIU…] - Utilitat d'escaneig"
 
-#~ msgid "TRUE if the application window is maximized"
-#~ msgstr "TRUE (cert) si la finestra de l'aplicació està maximitzada"
+#. Text printed out when an unknown command-line argument provided
+#: src/simple-scan.vala:595
+#, 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."
 
-#~ msgid ""
-#~ "The direction of the scanner across the scanned page. It can be one of the "
-#~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
-#~ msgstr ""
-#~ "La direcció de l'escaneig a través de la pàgina escanejada. Pot ser una de "
-#~ "les següents: «top-to-bottom» (de dalt a baix), «bottom-to-top» (de baix a "
-#~ "dalt), «left-to-right» (d'esquerra a dreta) o «right-to-left» (de dreta a "
-#~ "esquerra)."
+#~ msgid "Front and Back"
+#~ msgstr "Ambdues cares"
 
-#~ msgid ""
-#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
-#~ msgstr ""
-#~ "L'alçada del paper en dècimes de mm (o 0 per la detecció automàtica del "
-#~ "paper)."
+#~ msgid "New"
+#~ msgstr "Nou"
 
-#~ msgid ""
-#~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
-#~ msgstr ""
-#~ "El costat de la pàgina a escanejar. Pot ser un dels següents: «both» "
-#~ "(ambdós), «front» (frontal) o «back» (dorsal)"
+#~ msgid "Rotate Left"
+#~ msgstr "Gira a l'esquerra"
 
-#~ msgid "The resolution in dots-per-inch of the previously scanned image."
-#~ msgstr ""
-#~ "La resolució en punts per polzada de la imatge prèviament escanejada."
+#~ msgid "Rotate Right"
+#~ msgstr "Gira a la dreta"
 
-#~ msgid "The resolution in dots-per-inch to use when scanning photos."
-#~ msgstr "La resolució en punts per polzada quan s'escanegin fotos."
+#~ msgid "Crop"
+#~ msgstr "Escapça"
 
-#~ msgid "The resolution in dots-per-inch to use when scanning text."
-#~ msgstr "La resolució en punts per polzada quan s'escanegi text."
+#~ msgid "Scan S_ource:"
+#~ msgstr "Font d'_escaneig:"
 
-#~ msgid ""
-#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
-#~ msgstr ""
-#~ "L'amplada del paper en dècimes de mm (o 0 per la detecció automàtica del "
-#~ "paper)"
+#~ msgid "New Document"
+#~ msgstr "Document nou"
 
-#~ msgid "Type of document being scanned"
-#~ msgstr "Tipus de document a escanejar"
+#~ msgid "Document"
+#~ msgstr "Document"
 
-#~ msgid "Width of paper in tenths of a mm"
-#~ msgstr "Amplada del paper en dècimes de mm"
+#~ msgid "Email..."
+#~ msgstr "Envia per correu electrònic..."
 
-#~ msgid "Width of scanned image in pixels"
-#~ msgstr "Amplada de la imatge escanejada en píxels"
+#~ msgid "Print..."
+#~ msgstr "Imprimeix..."
 
-#~ msgid "Window height in pixels"
-#~ msgstr "Alçada de la finestra en píxels"
+#~ msgid "_Install Drivers"
+#~ msgstr "_Instal·la els controladors"
 
-#~ msgid "Window width in pixels"
-#~ msgstr "Amplada de la finestra en píxels"
+#~ msgid "Minimum"
+#~ msgstr "Mínim"
 
-#~ msgid "Scanned Document"
-#~ msgstr "Document escanejat"
+#~ msgid "Maximum"
+#~ msgstr "Màxim"
+
+#~ msgid "Saving document..."
+#~ msgstr "S'està desant el document..."
+
+#~ msgid "Saving page %d out of %d"
+#~ msgstr "S'està desant la pàgina %d de %d"
 
-#, c-format
 #~ msgid ""
 #~ "Usage:\n"
 #~ "  %s [DEVICE...] - Scanning utility"
@@ -842,45 +1093,6 @@ msgstr "S'està guardant la pàgina %d de %d"
 #~ "Forma d'ús:\n"
 #~ "  %s [DISPOSITIU...] - Utilitat d'escaneig"
 
-#, c-format
-#~ msgid ""
-#~ "Help Options:\n"
-#~ "  -d, --debug                     Print debugging messages\n"
-#~ "  -v, --version                   Show release version\n"
-#~ "  -h, --help                      Show help options\n"
-#~ "  --help-all                      Show all help options\n"
-#~ "  --help-gtk                      Show GTK+ options"
-#~ msgstr ""
-#~ "Ajuda per a les opcions:\n"
-#~ "  -d, --debug                     Mostra els missatges de depuració\n"
-#~ "  -v, --version                   Mostra la versió del programa\n"
-#~ "  -h, --help                      Mostra l'ajuda de les opcions\n"
-#~ "  --help-all                      Mostra l'ajuda de totes les opcions\n"
-#~ "  --help-gtk                      Mostra l'ajuda de les opcions de la GTK+"
-
-#~ msgid "Select File _Type"
-#~ msgstr "Seleccioneu el _tipus de fitxer"
-
-#~ msgid "Files missing"
-#~ msgstr "Manquen fitxers"
-
-#~ msgid "Please check your installation"
-#~ msgstr "Comproveu la vostra instal·lació"
-
-#~ msgid "The direction of the scanner across the scanned page."
-#~ msgstr "La direcció de l'escànner a través de la pàgina escanejada."
-
-#~ msgid "The page side to scan."
-#~ msgstr "La cara de la pàgina a escanejar."
-
-#~ msgid ""
-#~ "Type of document being scanned. This setting decides on the scan resolution, "
-#~ "colors and post-processing."
-#~ msgstr ""
-#~ "El tipus de document que s'està escanejant. Este paràmetre decideix la "
-#~ "resolució d'escaneig, els colors i el processament posterior."
-
-#, c-format
 #~ msgid ""
 #~ "GTK+ Options:\n"
 #~ "  --class=CLASS                   Program class as used by the window "
@@ -893,8 +1105,8 @@ msgstr "S'està guardant la pàgina %d de %d"
 #~ "  --g-fatal-warnings              Make all warnings fatal"
 #~ msgstr ""
 #~ "Opcions de la GTK+:\n"
-#~ "  --class=CLASSE                  Classe del programa tal com l'utilitza el "
-#~ "gestor de finestres\n"
+#~ "  --class=CLASSE                  Classe del programa tal com l'utilitza "
+#~ "el gestor de finestres\n"
 #~ "  --name=NOM                      Nom del programa tal com l'utilitza el "
 #~ "gestor de finestres\n"
 #~ "  --screen=PANTALLA               Pantalla X a utilitzar\n"
@@ -902,52 +1114,97 @@ msgstr "S'està guardant la pàgina %d de %d"
 #~ "  --gtk-module=MÒDULS             Carrega mòduls de la GTK+ addicionals\n"
 #~ "  --g-fatal-warnings              Fa que tots els avisos siguin fatals"
 
-#~ msgid ""
-#~ "Type of document being scanned. 'text' for text documents, 'photo' for "
-#~ "photos. This setting decides on the scan resolution, colors and post-"
-#~ "processing."
-#~ msgstr ""
-#~ "Tipus de document a escanejar. «text» per documents de text o «photo» per "
-#~ "fotos. Aquest paràmetre decideix la resolució de l'escaneig, els colors i el "
-#~ "postprocessament."
+#~ msgid "4&#xD7;6"
+#~ msgstr "4&#xD7;6"
 
-#~ msgid "Brightness of scan"
-#~ msgstr "Brillantor de l'escaneig"
+#~ msgid "Please check your installation"
+#~ msgstr "Comproveu la vostra instal·lació"
 
-#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
-#~ msgstr "L'ajustament de la brillantor, de -100 a 100 (on 0 significa cap)"
+#~ msgid "Files missing"
+#~ msgstr "Manquen fitxers"
 
-#~ msgid "Contrast of scan"
-#~ msgstr "Contrast de l'escaneig"
+#~ msgid "Height of scanned image in pixels"
+#~ msgstr "Alçada de la imatge escanejada en píxels"
 
-#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
-#~ msgstr "L'ajustament del contrast, de -100 a 100 (on 0 significa cap)"
+#~ msgid "Direction of scan"
+#~ msgstr "Direcció de l'escaneig"
 
-#~ msgid "Quality value to use for JPEG compression"
-#~ msgstr "Valor de la qualitat a utilitzar per la compressió JPEG"
+#~ msgid ""
+#~ "The page side to scan. It can be one of the following: 'both' 'front' "
+#~ "'back'"
+#~ msgstr ""
+#~ "El costat de la pàgina a escanejar. Pot ser un dels següents: "
+#~ "«both» (ambdós), «front» (frontal) o «back» (dorsal)"
 
-#~ msgid "Quality value to use for JPEG compression."
-#~ msgstr "Valor de la qualitat a utilitzar per la compressió JPEG."
+#~ msgid ""
+#~ "The direction of the scanner across the scanned page. It can be one of "
+#~ "the following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-"
+#~ "left'"
+#~ msgstr ""
+#~ "La direcció de l'escaneig a través de la pàgina escanejada. Pot ser una "
+#~ "de les següents: «top-to-bottom» (de dalt a baix), «bottom-to-top» (de "
+#~ "baix a dalt), «left-to-right» (d'esquerra a dreta) o «right-to-left» (de "
+#~ "dreta a esquerra)."
+
+#~ msgid "TRUE if the application window is maximized"
+#~ msgstr "TRUE (cert) si la finestra de l'aplicació està maximitzada"
 
 #~ msgid ""
 #~ "The height of scanned image in pixels. This value is updated to what the "
 #~ "last scanned page was."
 #~ msgstr ""
-#~ "L'alçada de la imatge escanejada en píxels. Aquest valor s'ha actualitzat al "
-#~ "que tenia l'última pàgina escanejada."
+#~ "L'alçada de la imatge escanejada en píxels. Aquest valor s'ha actualitzat "
+#~ "al que tenia l'última pàgina escanejada."
+
+#~ msgid "The resolution in dots-per-inch of the previously scanned image."
+#~ msgstr ""
+#~ "La resolució en punts per polzada de la imatge prèviament escanejada."
+
+#~ msgid "Resolution of last scanned image"
+#~ msgstr "Resolució de l'última imatge escanejada"
 
 #~ msgid ""
-#~ "The width of scanned image in pixels. This value is updated to what the last "
-#~ "scanned page was."
+#~ "Type of document being scanned. 'text' for text documents, 'photo' for "
+#~ "photos. This setting decides on the scan resolution, colors and post-"
+#~ "processing."
 #~ msgstr ""
-#~ "L'amplada de la imatge escanejada en píxels. Aquest valor s'ha actualitzat "
-#~ "al que tenia l'última pàgina escanejada."
+#~ "Tipus de document a escanejar. «text» per documents de text o «photo» per "
+#~ "fotos. Aquest paràmetre decideix la resolució de l'escaneig, els colors i "
+#~ "el postprocessament."
 
-#~ msgid "Directory to save files to"
-#~ msgstr "Directori on guardar els fitxers"
+#~ msgid "Window height in pixels"
+#~ msgstr "Alçada de la finestra en píxels"
+
+#~ msgid "Window width in pixels"
+#~ msgstr "Amplada de la finestra en píxels"
 
 #~ msgid ""
-#~ "The directory to save files to. Defaults to the documents directory if unset."
+#~ "The width of scanned image in pixels. This value is updated to what the "
+#~ "last scanned page was."
 #~ msgstr ""
-#~ "El directori on guardar els fitxers. Per defecte serà el directori de "
-#~ "documents si no es defineix."
+#~ "L'amplada de la imatge escanejada en píxels. Aquest valor s'ha "
+#~ "actualitzat al que tenia l'última pàgina escanejada."
+
+#~ msgid "Width of scanned image in pixels"
+#~ msgstr "Amplada de la imatge escanejada en píxels"
+
+#~ msgid "Select File _Type"
+#~ msgstr "Seleccioneu el _tipus de fitxer"
+
+#~ msgid ""
+#~ "Help Options:\n"
+#~ "  -d, --debug                     Print debugging messages\n"
+#~ "  -v, --version                   Show release version\n"
+#~ "  -h, --help                      Show help options\n"
+#~ "  --help-all                      Show all help options\n"
+#~ "  --help-gtk                      Show GTK+ options"
+#~ msgstr ""
+#~ "Ajuda per a les opcions:\n"
+#~ "  -d, --debug                     Mostra els missatges de depuració\n"
+#~ "  -v, --version                   Mostra la versió del programa\n"
+#~ "  -h, --help                      Mostra l'ajuda de les opcions\n"
+#~ "  --help-all                      Mostra l'ajuda de totes les opcions\n"
+#~ "  --help-gtk                      Mostra l'ajuda de les opcions de la GTK+"
+
+#~ msgid "The direction of the scanner across the scanned page."
+#~ msgstr "La direcció de l'escànner a través de la pàgina escanejada."
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..af5f741 100644
--- a/po/ce.po
+++ b/po/ce.po
@@ -7,296 +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"
+"POT-Creation-Date: 2017-04-16 08:54-0400\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"
+"Language: ce\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-25 06:10+0000\n"
+"X-Generator: Launchpad (build 18361)\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
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: 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 ""
 
-#: ../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 ""
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: 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 ""
 
@@ -308,7 +322,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 +330,207 @@ 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:844
 msgid "No scanners available.  Please connect a scanner."
 msgstr ""
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:874
 msgid "Unable to connect to scanner"
 msgstr ""
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1227
 msgid "Unable to start scan"
 msgstr ""
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: 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
+#: 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:332 src/ui.vala:1655 src/ui.vala:1935
 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:341
 #, 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:389
 msgid "No scanners detected"
 msgstr ""
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:391
 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:396
 msgid "Additional software needed"
 msgstr ""
 
 #. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:398
 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: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 ""
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:522
 msgid "Scanned Document.pdf"
 msgstr ""
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:528
 msgid "Image Files"
 msgstr ""
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:534
 msgid "All Files"
 msgstr ""
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:543
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:549
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:555
 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: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:650
+#: src/ui.vala:698
 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:721
 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:763
 msgid "Save current document?"
 msgstr ""
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:765
 msgid "Discard Changes"
 msgstr ""
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:1056
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1068
 msgid "Unable to open image preview application"
 msgstr ""
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1270
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1280
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1290
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1300
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1504
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: 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"
@@ -522,203 +547,203 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1528
 msgid "About Simple Scan"
 msgstr ""
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1531
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1540
 msgid "translator-credits"
 msgstr ""
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/ui.vala:1562
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1564
 msgid "Quit without Saving"
 msgstr ""
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1632
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1634
 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:1638
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1640
 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:1644
 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:1649
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1651
 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:1655
 msgid "Install drivers"
 msgstr ""
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1686
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1698
 msgid "Installing drivers..."
 msgstr ""
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1706
 msgid "Drivers installed successfully!"
 msgstr ""
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1716
 #, 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:1722
 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:1729
 #, 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:1833
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1836
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1839
 #, 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: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 ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1937
 msgid "Change _Scanner"
 msgstr ""
 
 #. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1939
 msgid "_Install Drivers"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: 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/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..204f53c 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,519 +1,528 @@
 # Czech translation for simple-scan
 # Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
 # This file is distributed under the same license as the simple-scan package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
+# Tadeáš Pařík <tadeas.parik@gmail.com>, 2009.
+# Marek Černocký <marek@manet.cz>, 2017.
 #
 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-12-18 12:25+0000\n"
-"Last-Translator: Tadeáš Pařík <tadeas.parik@gmail.com>\n"
-"Language-Team: Czech <cs@li.org>\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
+"product=simple-scan&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-08-07 02:27+0000\n"
+"PO-Revision-Date: 2017-08-08 16:47+0200\n"
+"Last-Translator: Marek Černocký <marek@manet.cz>\n"
+"Language-Team: Czech <gnome-cs-list@gnome.org>\n"
+"Language: cs\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"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Launchpad-Export-Date: 2017-04-25 06:10+0000\n"
 
-#. Button to submit authorization dialog
-#: data/simple-scan.ui:24
-msgid "_Authorize"
-msgstr "_Autorizovat"
+#: data/org.gnome.SimpleScan.gschema.xml:11
+msgid "Device to scan from"
+msgstr "Zařízení určené ke skenování"
 
-#. Label beside username entry
-#: data/simple-scan.ui:102
-msgid "_Username for resource:"
-msgstr "_Vlastní pojmenování zdroje:"
+#: data/org.gnome.SimpleScan.gschema.xml:12
+msgid "SANE device to acquire images from."
+msgstr "Zařízení SANE pro získávání obrázků."
 
-#. Label beside password entry
-#: data/simple-scan.ui:117
-msgid "_Password:"
-msgstr "_Heslo:"
+#: data/org.gnome.SimpleScan.gschema.xml:20
+msgid "Type of document being scanned"
+msgstr "Typ skenovaného dokumentu"
+
+#: data/org.gnome.SimpleScan.gschema.xml:21
+msgid ""
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+msgstr ""
+"Typ skenovaného dokumentu. Toto nastavení rozhoduje o rozlišení, barvách a "
+"následném zpracování při skenování."
 
-#. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
-msgid "Front and Back"
-msgstr "Přední a zadní"
+#: data/org.gnome.SimpleScan.gschema.xml:25
+msgid "Width of paper in tenths of a mm"
+msgstr "Šířka papíru v desetinách milimetru"
 
-#. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
-msgid "Front"
-msgstr "Přední"
+#: data/org.gnome.SimpleScan.gschema.xml:26
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"Šířka papíru v desetinách milimetru (nebo 0 pro automatické zjištění papíru)."
 
-#. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
-msgid "Back"
-msgstr "Zadní"
+#: data/org.gnome.SimpleScan.gschema.xml:30
+msgid "Height of paper in tenths of a mm"
+msgstr "Výška papíru v desetinách milimetru"
+
+#: data/org.gnome.SimpleScan.gschema.xml:31
+msgid ""
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"Výška papíru v desetinách milimetru (nebo 0 pro automatické zjištění papíru)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:35
+msgid "Brightness of scan"
+msgstr "Jas skenu"
+
+#: data/org.gnome.SimpleScan.gschema.xml:36
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr "Nastavení jasu od -100 do 100 (0 znamená žádná hodnota)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:40
+msgid "Contrast of scan"
+msgstr "Kontrast skenu"
+
+#: data/org.gnome.SimpleScan.gschema.xml:41
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr "Nastavení kontrastu od -100 do 100 (0 znamená žádná hodnota)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:45
+msgid "Resolution for text scans"
+msgstr "Rozlišení pro skenování textu"
+
+#: data/org.gnome.SimpleScan.gschema.xml:46
+msgid "The resolution in dots-per-inch to use when scanning text."
+msgstr "Rozlišení v bodech na palec, které se má použít při skenování textu."
+
+#: data/org.gnome.SimpleScan.gschema.xml:50
+msgid "Resolution for photo scans"
+msgstr "Rozlišení pro skenování fotografií"
+
+#: data/org.gnome.SimpleScan.gschema.xml:51
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr ""
+"Rozlišení v bodech na palec, které se má použít při skenování fotografií."
+
+#: data/org.gnome.SimpleScan.gschema.xml:55
+msgid "Page side to scan"
+msgstr "Strana stránky ke skenování"
+
+#: data/org.gnome.SimpleScan.gschema.xml:56
+msgid "The page side to scan."
+msgstr "Strana stránky, která se má skenovat."
+
+#: data/org.gnome.SimpleScan.gschema.xml:60
+msgid "Directory to save files to"
+msgstr "Složka pro ukládání souborů"
+
+#: data/org.gnome.SimpleScan.gschema.xml:61
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+"Složka pro ukládání souborů. Pokud není nastaveno, ukládají se standardně do "
+"složky Dokumenty."
+
+#: data/org.gnome.SimpleScan.gschema.xml:66
+msgid "Quality value to use for JPEG compression"
+msgstr "Hodnota kvality u komprimace JPEG"
+
+#: data/org.gnome.SimpleScan.gschema.xml:67
+msgid "Quality value to use for JPEG compression."
+msgstr "Hodnota kvality, která se má používat u komprimace JPEG."
+
+#: data/org.gnome.SimpleScan.gschema.xml:72
+msgid "Delay in millisecond between pages"
+msgstr "Prodleva v milisekundách mezi stránkami"
+
+#: data/org.gnome.SimpleScan.gschema.xml:73
+msgid "Delay in millisecond between pages."
+msgstr "Prodleva v milisekundách, která se má ponechat mezi stránkami."
 
 #. 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
+#. Set HeaderBar title here because Glade doesn't keep it translated
+#. https://bugzilla.gnome.org/show_bug.cgi?id=782753
+#. Title of scan window
+#: data/simple-scan.appdata.xml.in:6 data/simple-scan.desktop.in:3
+#: src/app-window.ui:76 src/app-window.vala:1560
 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
-msgid "_Document"
-msgstr "_Dokument"
+#: data/simple-scan.appdata.xml.in:7 data/simple-scan.desktop.in:5
+msgid "Scan Documents"
+msgstr "Skenujte dokumenty"
 
-#. Scan menu item
-#: data/simple-scan.ui:260
-msgid "Sc_an"
-msgstr "Sk_enovat"
+#: 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 "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+"Skutečně snadné skenování dokumentů a fotek, které navíc nabízí šikovné "
+"možnosti úprav. Vystřihněte nechtěné části fotografie a očte ji, jestli "
+"jenaopak. Až budete hotovi, výsledek si vytiskněte, převeďte do PDF, nebo "
+"uložte v některém z rozmanité nabídky formátů."
+
+#: data/simple-scan.appdata.xml.in:14
+msgid "Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+"Jednoduché skenování používá jako základ rohraní SANE, aby pokrylo co "
+"největší množství skenerů."
+
+#: data/simple-scan.desktop.in:4
+msgid "Document Scanner"
+msgstr "Skener na dokumenty"
 
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: data/simple-scan.desktop.in:7
+msgid "scan;scanner;flatbed;adf;"
+msgstr ""
+"scan;skenovat;scanner;skener;flatbed;stolní;plochý;adf;podavač dokumentů;"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: data/simple-scan.desktop.in:10
+msgid "scanner"
+msgstr "scanner"
+
+#. Toolbar scan menu item to scan a single page from the scanner
 #. 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/app-window.ui:22 src/app-window.ui:123 src/app-window.ui:820
 msgid "Single _Page"
 msgstr "Jedna _stránka"
 
+#. Toolbar scan menu item to scan all pages from a document feeder
 #. 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/app-window.ui:31 src/app-window.ui:133 src/app-window.ui:829
 msgid "All Pages From _Feeder"
 msgstr "Všechny stránky z _podavače"
 
-#. Menu entry to stop current scan
-#: data/simple-scan.ui:294
-msgid "_Stop Scan"
-msgstr "_Zastavit skenování"
+#. Toolbar scan menu item to scan continuously from the flatbed
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/app-window.ui:40 src/app-window.ui:143 src/app-window.ui:838
+msgid "_Multiple Pages From Flatbed"
+msgstr "_Více ručně podávanách stránek"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:853
 msgid "Text"
 msgstr "Text"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:863
 msgid "Photo"
 msgstr "Fotografie"
 
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: src/app-window.ui:91
+msgid "_Document"
+msgstr "_Dokument"
+
+#. Scan menu item
+#: src/app-window.ui:110
+msgid "Sc_an"
+msgstr "Sk_enovat"
+
+#. Menu entry to stop current scan
+#: src/app-window.ui:154
+msgid "_Stop Scan"
+msgstr "_Zastavit skenování"
+
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/app-window.ui:196 src/app-window.vala:967 src/app-window.vala:1590
 msgid "Reorder Pages"
 msgstr "Přeskupit stránky"
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/app-window.ui:215
 msgid "_Email"
 msgstr "_E-mail"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/app-window.ui:280
 msgid "_Page"
 msgstr "_Stránka"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/app-window.ui:290
 msgid "Rotate _Left"
 msgstr "Otočit do_leva"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/app-window.ui:300
 msgid "Rotate _Right"
 msgstr "Otočit dop_rava"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/app-window.ui:310
 msgid "_Crop"
 msgstr "_Oříznout"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/app-window.ui:320
 msgid "_None"
 msgstr "Žád_né"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/app-window.ui:331
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/app-window.ui:342
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/app-window.ui:353
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/app-window.ui:364
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/app-window.ui:375
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/app-window.ui:386
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/app-window.ui:397
 msgid "_Custom"
 msgstr "_Vlastní"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/app-window.ui:415
 msgid "_Rotate Crop"
 msgstr "_Otočit ořez"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/app-window.ui:428
 msgid "Move Left"
 msgstr "Posunout doleva"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/app-window.ui:437
 msgid "Move Right"
 msgstr "Posunout doprava"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/app-window.ui:474
 msgid "_Help"
 msgstr "_Nápověda"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/app-window.ui:482
 msgid "_Contents"
 msgstr "_Obsah"
 
-#. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
-msgid "Start a new document"
-msgstr "Vytvořit nový dokument"
-
-#: data/simple-scan.ui:675
-msgid "New"
-msgstr "Nový"
-
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/app-window.ui:520 src/app-window.ui:720
 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/app-window.ui:522 src/app-window.ui:716
 msgid "Scan"
 msgstr "Skenovat"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/app-window.ui:538 src/app-window.ui:787
 msgid "Save document to a file"
 msgstr "Uložit dokument do souboru"
 
-#: ../src/ui.vala:1842
+#: src/app-window.ui:540
 msgid "Save"
 msgstr "Uložit"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/app-window.ui:555 src/app-window.ui:700
 msgid "Stop the current scan"
 msgstr "Zastavit probíhající skenování"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/app-window.ui:556 src/app-window.ui:697
 msgid "Stop"
 msgstr "Zastavit"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "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
-msgid "Rotate Left"
-msgstr "Otočit doleva"
-
-#. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
-msgid "Rotate the page to the right (clockwise)"
-msgstr "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
-msgid "Rotate Right"
-msgstr "Otočit doprava"
-
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
-msgid "Crop the selected page"
-msgstr "Oříznout vybranou stránku"
-
-#: data/simple-scan.ui:781
-msgid "Crop"
-msgstr "Oříznout"
-
-#: ../src/ui.vala:1849
-msgid "Preferences"
-msgstr "Předvolby"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1048
-msgid "Scan S_ource:"
-msgstr "_Zdroj skenování:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1079
-msgid "_Text Resolution:"
-msgstr "_Rozlišení textu:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1095
-msgid "_Photo Resolution:"
-msgstr "_Rozlišení fotografie:"
-
-#. Label beside scan side combo box
-#: data/simple-scan.ui:1139
-msgid "Scan Side:"
-msgstr "Skenovat stranu:"
-
-#. Label beside page size combo box
-#: data/simple-scan.ui:1169
-msgid "Page Size:"
-msgstr "Velikost stránky:"
-
-#. Label beside brightness scale
-#: data/simple-scan.ui:1199
-msgid "Brightness:"
-msgstr "Jas:"
-
-#. Label beside contrast scale
-#: data/simple-scan.ui:1229
-msgid "Contrast:"
-msgstr "Kontrast:"
-
-#. Label beside quality scale
-#: data/simple-scan.ui:1260
-msgid "Quality:"
-msgstr "Kvalita:"
-
-#: data/simple-scan.desktop.in:4
-msgid "Document Scanner"
-msgstr "Skener dokumentu"
+#. Label shown when searching for scanners
+#: src/app-window.ui:611
+msgid "Searching for Scanners…"
+msgstr "Vyhledávají se skenery…"
 
-#: data/simple-scan.desktop.in:5
-msgid "Scan Documents"
-msgstr "Naskenovat dokumenty"
+#: src/app-window.vala:237 src/app-window.vala:1380
+msgid "_Close"
+msgstr "Z_avřít"
 
-#: data/simple-scan.desktop.in:6
-msgid "scan;scanner;flatbed;adf;"
-msgstr "scan;scanner;flatbed;adf;"
+#. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
+#: src/app-window.vala:246
+#, 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"
 
-#: data/simple-scan.desktop.in:8
-msgid "scanner"
-msgstr ""
+#. Label shown when detected a scanner
+#: src/app-window.vala:266 src/app-window.vala:584
+msgid "Ready to Scan"
+msgstr "Připraveno ke skenování"
 
-#: data/simple-scan.appdata.xml.in:8
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-"Skutečně snadné skenování dokumentů a fotek, které mimo jiné nabízí šikovné "
-"úpravy. Vystřihněte nechtěné části fotografie a přetočte ji klidně o 360 "
-"stupňů! Až budete hotovy, materiál si nechtě vytisknout, převést do pdf, "
-"nebo uložit v rozmanité škále formátů."
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: src/app-window.vala:273
+msgid "Additional software needed"
+msgstr "Jsou zapotřebí ovladače skeneru"
 
-#: data/simple-scan.appdata.xml.in:13
+#. Instructions to install driver software
+#: src/app-window.vala:275
 msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
+"You need to <a href=\"install-firmware\">install driver software</a> for "
+"your scanner."
 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
-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
-msgid "Unable to connect to scanner"
-msgstr "Nelze navázat spojení se skenerem"
-
-#. Error display when unable to start scan
-#: ../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
-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
-msgid "Show release version"
-msgstr "Zobrazit verzi vydání"
-
-#. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
-msgid "Print debugging messages"
-msgstr "Vypisovat debugovací zprávy"
-
-#: ../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
-msgid "Failed to scan"
-msgstr "Skenování selhalo"
-
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
-msgid "[DEVICE...] - Scanning utility"
-msgstr "[ZAŘÍZENÍ...] - Nástroj pro skenování"
-
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
-#, 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
-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
-#, 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"
+"Potřebujete <a href=\"install-firmware\">nainstalovat ovladače</a> pro svůj "
+"skener."
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/app-window.vala:281
 msgid "No scanners detected"
-msgstr "Nenalezen žádný skener"
+msgstr "Nebyl nalezen žádný skener"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/app-window.vala:283
 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
-msgid "Additional software needed"
-msgstr "Jsou potřeba ovladače scaneru"
-
-#. Instructions to install driver software
-#: ../src/ui.vala:384
-msgid "You need to install driver software for your scanner."
-msgstr "Jsou potřeba ovladače scaneru"
+msgstr "Zkontrolujte prosím, že je váš skener připojený a zapnutý"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
-msgid "Save As..."
-msgstr "Uložit jako..."
+#: src/app-window.vala:298
+msgid "Save As…"
+msgstr "Uložit jako…"
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/app-window.vala:301 src/app-window.vala:471 src/app-window.vala:552
 msgid "_Cancel"
 msgstr "_Zrušit"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/app-window.vala:302 src/app-window.vala:553
 msgid "_Save"
 msgstr "_Uložit"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/app-window.vala:310
 msgid "Scanned Document.pdf"
 msgstr "Naskenovaný dokument.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#. Save dialog: Filter name to show only supported image files
+#: src/app-window.vala:316
 msgid "Image Files"
 msgstr "Soubory obrázků"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/app-window.vala:326
 msgid "All Files"
 msgstr "Všechny soubory"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/app-window.vala:335
 msgid "PDF (multi-page document)"
 msgstr "PDF (vícestránkový dokument)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/app-window.vala:341
 msgid "JPEG (compressed)"
 msgstr "JPEG (komprimovaný)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/app-window.vala:347
 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
+#. Save dialog: Label for sabing in WEBP format
+#: src/app-window.vala:354
+msgid "WebP (compressed)"
+msgstr "WebP (komprimovaný)"
+
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
+#: src/app-window.vala:364
 msgid "File format:"
-msgstr "Typ souboru:"
+msgstr "Formát souboru:"
+
+#. Label in save dialog beside compression slider
+#: src/app-window.vala:376
+msgid "Compression:"
+msgstr "Komprimace:"
+
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/app-window.vala:470
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr "Soubor s názvem „%s“ již existuje. Chcete jej nahradit?"
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/app-window.vala:473
+msgid "_Replace"
+msgstr "Nah_radit"
+
+#: src/app-window.vala:512
+msgid "Saving"
+msgstr "Ukládá se"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/app-window.vala:527
 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
-msgid "If you don't save, changes will be permanently lost."
-msgstr "Pokud neuložíte, změny budou nenávratně ztraceny."
+#: src/app-window.vala:550
+msgid "If you don’t save, changes will be permanently lost."
+msgstr "Pokud dokument 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/app-window.vala:591
 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/app-window.vala:593
 msgid "Discard Changes"
 msgstr "Zahodit změny"
 
+#. Label shown when scan started
+#: src/app-window.vala:692
+msgid "Contacting scanner…"
+msgstr "Kontaktuje se skener…"
+
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/app-window.vala:800
 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/app-window.vala:812
 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/app-window.vala:990
 msgid "Combine sides"
 msgstr "Kombinovat strany"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/app-window.vala:1000
 msgid "Combine sides (reverse)"
 msgstr "Kombinovat strany (obráceně)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/app-window.vala:1010
 msgid "Reverse"
 msgstr "Obrátit"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/app-window.vala:1020
 msgid "Keep unchanged"
 msgstr "Zachovat beze změň"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/app-window.vala:1250
 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/app-window.vala:1271
 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,30 +538,30 @@ msgid ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
 "Tento program je svobodný software: můžete jej šířit a/nebo upravovat\n"
-"podle ustanovení GNU General Public License vydané\n"
-"Free Software Foundation, buď verze 3 této licence nebo\n"
-"(dle vlastního uvážení) kterékoliv pozdější verze.\n"
+"podle ustanovení licence GNU General Public License vydané organizací\n"
+"Free Software Foundation, buď ve verzi 3 této licence nebo\n"
+"(dle vlastního uvážení) v kterékoliv novější verzi.\n"
 "\n"
 "Tento program je šířen v naději, že bude užitečný, avšak BEZ JAKÉKOLIV\n"
-"ZÁRUKY; neposkytují se ani odvozené záruky PRODEJNOSTI anebo\n"
-"VHODNOSTI PRO URČITÝ ÚČEL. Další podrobnosti hledejte\n"
-"v GNU General Public License.\n"
+"ZÁRUKY; neposkytují se ani odvozené záruky PRODEJNOSTI anebo VHODNOSTI\n"
+"PRO URČITÝ ÚČEL. Další podrobnosti hledejte v licenci GNU General\n"
+"Public License.\n"
 "\n"
-"Kopii GNU General Public License byste měli obdržet spolu s tímto "
-"programem.\n"
-"Pokud ne, přečtěte si ji na stránce <http://www.gnu.org/licenses/>."
+"Kopii GNU General Public License byste měli obdržet spolu s tímto\n"
+"programem. Pokud tomu tak není, přečtěte si ji na webové stránce\n"
+"<http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/app-window.vala:1274
 msgid "About Simple Scan"
 msgstr "O aplikaci Jednoduché skenování"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/app-window.vala:1277
 msgid "Simple document scanning tool"
 msgstr "Jednoduchý nástroj pro skenování dokumentů"
 
-#: ../src/ui.vala:1487
+#: src/app-window.vala:1286
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -567,401 +576,467 @@ msgstr ""
 "  Vitezslav Kotrla https://launchpad.net/~vitezslav-kotrla\n"
 "  Vojtěch Trefný https://launchpad.net/~vojtech.trefny\n"
 "  Zdeněk Kopš https://launchpad.net/~zdenekkops\n"
-"  la_serpe https://launchpad.net/~tom-mil"
+"  la_serpe https://launchpad.net/~tom-mil\n"
+"  Marek Černocký <marek@manet.cz>"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/app-window.vala:1308
 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
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:1310
 msgid "Quit without Saving"
 msgstr "Ukončit bez uložení"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/app-window.vala:1357
 msgid "You appear to have a Brother scanner."
-msgstr "Vypadá to, že máte scaner Brother"
+msgstr "Vypadá to, že máte skener Brother"
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/app-window.vala:1359
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.brother.com\">Brother website</a>."
+"Drivers for this are available on the <a href=\"http://support.brother.com"
+"\">Brother website</a>."
 msgstr ""
 "Ovladače jsou dostupné na <a href=\"http://support.brother.com\">webu "
 "výrobce</a>."
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/app-window.vala:1363
 msgid "You appear to have a Samsung scanner."
-msgstr "Vypadá to, že máte scaner Samsung"
+msgstr "Vypadá to, že máte skener Samsung"
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/app-window.vala:1365
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://samsung.com/support\">Samsung website</a>."
+"Drivers for this are available on the <a href=\"http://samsung.com/support"
+"\">Samsung website</a>."
 msgstr ""
 "Ovladače jsou dostupné na <a href=\"http://samsung.com/support\">webu "
 "výrobce</a>."
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/app-window.vala:1369
 msgid "You appear to have an HP scanner."
-msgstr "Vypadá to, že máte scaner HP."
+msgstr "Vypadá to, že máte skener HP."
 
 #. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/app-window.vala:1374
 msgid "You appear to have an Epson scanner."
-msgstr "Vypadá to, že máte scaner Epson."
+msgstr "Vypadá to, že máte skener Epson."
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/app-window.vala:1376
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.epson.com\">Epson website</a>."
+"Drivers for this are available on the <a href=\"http://support.epson.com"
+"\">Epson website</a>."
 msgstr ""
-"Ovladače jsou dostupné na <a href=\"http://support.epson.com\">webu "
-"výrobce</a>."
+"Ovladače jsou dostupné na <a href=\"http://support.epson.com\">webu výrobce</"
+"a>."
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/app-window.vala:1380
 msgid "Install drivers"
 msgstr "Instalace ovladačů"
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/app-window.vala:1411
 msgid "Once installed you will need to restart Simple Scan."
-msgstr "Po instlaci je potřeba restartovat Simple Scan"
+msgstr "Po instlaci je potřeba Jednoduché skenování restartovat"
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
-msgid "Installing drivers..."
-msgstr "Instalace ovladačů..."
+#: src/app-window.vala:1423
+msgid "Installing drivers…"
+msgstr "Instalují se ovladače…"
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/app-window.vala:1431
 msgid "Drivers installed successfully!"
 msgstr "Instalace ovladačů byla úspěšná!"
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/app-window.vala:1441
 #, c-format
 msgid "Failed to install drivers (error code %d)."
-msgstr "Instalace ovladačů skončila chybou %d"
+msgstr "Instalace ovladačů selhala (kód chyby %d)"
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/app-window.vala:1447
 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
-#, 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
-#, 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/app-window.vala:1454
 #, c-format
-msgid "%d dpi (draft)"
-msgstr "%d dpi (náčrt)"
-
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../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
-#, c-format
-msgid "%d dpi"
-msgstr "%d dpi"
-
-#: ../src/ui.vala:1835
-msgid "New Document"
-msgstr "Nový dokument"
-
-#: ../src/ui.vala:1840
-msgid "Document"
-msgstr "Dokument"
-
-#: ../src/ui.vala:1844
-msgid "Email..."
-msgstr "Email..."
+msgid "You need to install the %s package."
+msgid_plural "You need to install the %s packages."
+msgstr[0] "Je potřeba nainstalovat balíček %s."
+msgstr[1] "Je potřeba nainstalovat balíčky %s."
+msgstr[2] "Je potřeba nainstalovat balíčky %s."
+
+#. Title of preferences dialog
+#: src/app-window.vala:1568 src/app-window.vala:1591
+#: src/preferences-dialog.ui:53
+msgid "Preferences"
+msgstr "Předvolby"
 
-#: ../src/ui.vala:1845
-msgid "Print..."
-msgstr "Tisk…"
+#: src/app-window.vala:1572
+msgid "Keyboard Shortcuts"
+msgstr "Klávesové zkratky"
 
-#: ../src/ui.vala:1853
+#: src/app-window.vala:1573
 msgid "Help"
 msgstr "Nápověda"
 
-#: ../src/ui.vala:1854
+#: src/app-window.vala:1574
 msgid "About"
 msgstr "O aplikaci"
 
-#: ../src/ui.vala:1855
+#: src/app-window.vala:1575
 msgid "Quit"
 msgstr "Ukončit"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
-msgid "Change _Scanner"
-msgstr "Změnit _skener"
+#: src/app-window.vala:1589
+msgid "Email"
+msgstr "E-mail"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
-msgid "_Install Drivers"
-msgstr "_Instalovat ovladače"
+#. Populate ActionBar (not supported in Glade)
+#. https://bugzilla.gnome.org/show_bug.cgi?id=769966
+#. Label on new document button
+#: src/app-window.vala:1599
+msgid "Start Again…"
+msgstr "Spustit znovu…"
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
-msgid "Automatic"
-msgstr "Automaticky"
+#. Tooltip for rotate left (counter-clockwise) button
+#: src/app-window.vala:1616
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Otočit stránku doleva (proti směru hodinových ručiček)"
 
-#: ../src/ui.vala:1947
-msgid "Darker"
-msgstr "Tmavší"
+#. Tooltip for rotate right (clockwise) button
+#: src/app-window.vala:1623
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Otočit stránku doprava (po směru hodinových ručiček)"
 
-#: ../src/ui.vala:1949
-msgid "Lighter"
-msgstr "Světlejší"
+#. Tooltip for crop button
+#: src/app-window.vala:1633
+msgid "Crop the selected page"
+msgstr "Oříznout vybranou stránku"
 
-#: ../src/ui.vala:1957
-msgid "Less"
-msgstr "Méně"
+#. Tooltip for delete button
+#: src/app-window.vala:1649
+msgid "Delete the selected page"
+msgstr "Smazat vybranou stránku"
 
-#: ../src/ui.vala:1959
-msgid "More"
-msgstr "Více"
+#. Text of button for cancelling save
+#: src/app-window.vala:1814
+msgid "Cancel"
+msgstr "Zrušit"
 
-#: ../src/ui.vala:1967
-msgid "Minimum"
-msgstr "Minimum"
+#. Button to submit authorization dialog
+#: src/authorize-dialog.ui:25
+msgid "_Authorize"
+msgstr "_Autorizovat"
 
-#: ../src/ui.vala:1969
-msgid "Maximum"
-msgstr "Maximum"
+#. Label beside username entry
+#: src/authorize-dialog.ui:99
+msgid "_Username for resource:"
+msgstr "_Uživatelské jméno pro zdroj:"
 
-#: ../src/ui.vala:2008
-msgid "Saving document..."
-msgstr "Ukládání dokumentu..."
+#. Label beside password entry
+#: src/authorize-dialog.ui:112
+msgid "_Password:"
+msgstr "_Heslo:"
 
-#: ../src/ui.vala:2173
+#: src/book.vala:331 src/book.vala:337
 #, c-format
-msgid "Saving page %d out of %d"
-msgstr "Ukládání strany %d z %d"
-
-#~ msgid "4&#xD7;6"
-#~ msgstr "4&#xD7;6"
+msgid "Unable to encode page %i"
+msgstr "Nelze zakódovat stránku %i"
+
+#: src/help-overlay.ui:12
+msgctxt "shortcut window"
+msgid "Scanning"
+msgstr "Skenování"
+
+#: src/help-overlay.ui:17
+msgctxt "shortcut window"
+msgid "Scan a single page"
+msgstr "Naskenovat jednu stránku"
+
+#: src/help-overlay.ui:24
+msgctxt "shortcut window"
+msgid "Scan all pages from document feeder"
+msgstr "Naskenovat všechny stránky z podavače"
+
+#: src/help-overlay.ui:31
+msgctxt "shortcut window"
+msgid "Scan continuously from a flatbed scanner"
+msgstr "Naskenovat jednu ručně podanou stránku"
+
+#: src/help-overlay.ui:38
+msgctxt "shortcut window"
+msgid "Stop scan in progress"
+msgstr "Zastavit probíhající skenování"
 
-#~ msgid "Please check your installation"
-#~ msgstr "Zkontrolujte prosím svoji instalaci"
+#: src/help-overlay.ui:46
+msgctxt "shortcut window"
+msgid "Document Modification"
+msgstr "Úpravy dokumentu"
 
-#~ msgid "Files missing"
-#~ msgstr "Soubory chybí"
+#: src/help-overlay.ui:51
+msgctxt "shortcut window"
+msgid "Move page left"
+msgstr "Posunout stránku doleva"
 
-#~ msgid "Height of scanned image in pixels"
-#~ msgstr "Výška skenovaného obrázku v pixelech"
+#: src/help-overlay.ui:58
+msgctxt "shortcut window"
+msgid "Move page right"
+msgstr "Posunout stránku doprava"
 
-#~ msgid "Direction of scan"
-#~ msgstr "Směr skenování"
+#: src/help-overlay.ui:65
+msgctxt "shortcut window"
+msgid "Rotate page to the left (anti-clockwise)"
+msgstr "Otočit stránku doleva (proti směru hodinových ručiček)"
 
-#~ msgid "Resolution for photo scans"
-#~ msgstr "Rozlišení pro skenování fotografií"
+#: src/help-overlay.ui:72
+msgctxt "shortcut window"
+msgid "Rotate page to the right (clockwise)"
+msgstr "Otočit stránku doprava (po směru hodinových ručiček)"
 
-#~ msgid "Window height in pixels"
-#~ msgstr "Výška okna v pixelech"
+#: src/help-overlay.ui:79
+msgctxt "shortcut window"
+msgid "Delete page"
+msgstr "Smazat stránku"
+
+#: src/help-overlay.ui:87
+msgctxt "shortcut window"
+msgid "Document Management"
+msgstr "Správa dokumentů"
+
+#: src/help-overlay.ui:92
+msgctxt "shortcut window"
+msgid "Start new document"
+msgstr "Začít nový dokument"
+
+#: src/help-overlay.ui:99
+msgctxt "shortcut window"
+msgid "Save scanned document"
+msgstr "Uložit naskenovaný dokument"
+
+#: src/help-overlay.ui:106
+msgctxt "shortcut window"
+msgid "Email scanned document"
+msgstr "Odeslat naskenovaný dokument e-mailem"
+
+#: src/help-overlay.ui:113
+msgctxt "shortcut window"
+msgid "Print scanned document"
+msgstr "Vytisknout naskenovaný dokument"
+
+#: src/help-overlay.ui:120
+msgctxt "shortcut window"
+msgid "Copy current page to clipboard"
+msgstr "Zkopírovat aktuální stránku do schránky"
 
-#~ msgid "Window width in pixels"
-#~ msgstr "Šířka okna v pixelech"
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:113
+msgid "_Scanner"
+msgstr "_Skener"
 
-#~ msgid "Width of scanned image in pixels"
-#~ msgstr "Šířka skenovaného obrázku v pixelech"
+#. Label beside scan side combo box
+#: src/preferences-dialog.ui:143
+msgid "Scan Sides"
+msgstr "Skenovat strany"
 
-#~ msgid "Scanned Document"
-#~ msgstr "Skenovaný dokument"
+#. Label beside page size combo box
+#: src/preferences-dialog.ui:160
+msgid "Page Size"
+msgstr "Velikost stránky:"
 
-#~ msgid "TRUE if the application window is maximized"
-#~ msgstr "Nastavit na hodnotu PRAVDA, pokud má být okno maximalizované"
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:191
+msgid "Front"
+msgstr "Přední"
 
-#~ msgid "Device to scan from"
-#~ msgstr "Zařízení určené ke skenování"
+#. Preferences Dialog: Toggle button to select scanning on the back side of a page
+#: src/preferences-dialog.ui:206
+msgid "Back"
+msgstr "Zadní"
 
-#~ msgid "SANE device to acquire images from."
-#~ msgstr "Zařízení SANE pro načítání obrázků."
+#. Preferences Dialog: Toggle button to select scanning on both sides of a page
+#: src/preferences-dialog.ui:221
+msgid "Both"
+msgstr "Obě"
+
+#. Label beside page delay scale
+#: src/preferences-dialog.ui:260
+msgid "Delay"
+msgstr "Prodleva"
+
+#. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
+#: src/preferences-dialog.ui:276
+msgid "Multiple pages from flatbed"
+msgstr "Více ručně podávanách stránek"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:295
+msgid "3"
+msgstr "3"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:310
+msgid "5"
+msgstr "5"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:326
+msgid "7"
+msgstr "7"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:342
+msgid "10"
+msgstr "10"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:358
+msgid "15"
+msgstr "15"
+
+#. Label after page delay radio buttons
+#: src/preferences-dialog.ui:385
+msgid "Seconds"
+msgstr "sekund"
+
+#. Preferences Dialog: Tab label for scanning settings
+#: src/preferences-dialog.ui:413
+msgid "Scanning"
+msgstr "Skenuje se"
 
-#~ msgid "Resolution for text scans"
-#~ msgstr "Rozlišení pro skenování textu"
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:436
+msgid "_Text Resolution"
+msgstr "Rozlišení _textu"
 
-#~ msgid "Resolution of last scanned image"
-#~ msgstr "Rozlišení posledního skenovaného obrázku"
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:452
+msgid "_Photo Resolution"
+msgstr "Rozlišení _fotografie"
 
-#~ msgid "Directory to save files to"
-#~ msgstr "Adresář pro ukládání souborů"
+#. Label beside brightness scale
+#: src/preferences-dialog.ui:505
+msgid "Brightness"
+msgstr "Jas"
 
-#~ msgid ""
-#~ "The direction of the scanner across the scanned page. It can be one of the "
-#~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
-#~ msgstr ""
-#~ "Směr skenování stránky. Jsou dostupné následující možnosti: 'top-to-bottom' "
-#~ "'bottom-to-top' 'left-to-right' 'right-to-left'"
+#. Label beside contrast scale
+#: src/preferences-dialog.ui:521
+msgid "Contrast"
+msgstr "Kontrast"
 
-#~ msgid ""
-#~ "The height of scanned image in pixels. This value is updated to what the "
-#~ "last scanned page was."
-#~ msgstr ""
-#~ "Výška skenovaného obrázku v pixelech. Tato hodnota je přizpůsobena posledně "
-#~ "skenované stránce."
+#. Preferences Dialog: Tab for quality settings
+#: src/preferences-dialog.ui:576
+msgid "Quality"
+msgstr "Kvalita"
 
-#~ msgid "The resolution in dots-per-inch of the previously scanned image."
-#~ msgstr "Rozlišení posledně skenovaného obrázku v bodech na palec."
+#. Combo box value for automatic paper size
+#: src/preferences-dialog.vala:77
+msgid "Automatic"
+msgstr "Automaticky"
 
-#~ msgid ""
-#~ "The directory to save files to. Defaults to the documents directory if unset."
-#~ msgstr ""
-#~ "Adresář pro ukládání souborů. Standardně se ukládají do adresáře Dokumenty, "
-#~ "pokud není nastaveno."
+#: src/preferences-dialog.vala:116
+msgid "Darker"
+msgstr "Tmavší"
 
-#~ msgid "Type of document being scanned"
-#~ msgstr "Typ skenovaného dokumentu"
+#: src/preferences-dialog.vala:118
+msgid "Lighter"
+msgstr "Světlejší"
 
-#~ msgid ""
-#~ "Type of document being scanned. 'text' for text documents, 'photo' for "
-#~ "photos. This setting decides on the scan resolution, colors and post-"
-#~ "processing."
-#~ msgstr ""
-#~ "Typ skenovaného dokumentu. 'text' pro textové dokumenty, 'photo' pro "
-#~ "fotografie. Toto nastavení rozhoduje o rozlišení skenování, barvách a "
-#~ "následném zpracování."
+#: src/preferences-dialog.vala:126
+msgid "Less"
+msgstr "Menší"
 
-#~ msgid ""
-#~ "The width of scanned image in pixels. This value is updated to what the last "
-#~ "scanned page was."
-#~ msgstr ""
-#~ "Šířka skenovaného obrázku v pixelech. Tato hodnota je přizpůsobena posledně "
-#~ "skenované stránce."
+#: src/preferences-dialog.vala:128
+msgid "More"
+msgstr "Větší"
 
-#~ msgid "The resolution in dots-per-inch to use when scanning text."
-#~ msgstr "Rozlišení v bodech na palec použité při skenování textu."
+#. Preferences dialog: Label for default resolution in resolution list
+#: src/preferences-dialog.vala:440
+#, c-format
+msgid "%d dpi (default)"
+msgstr "%d dpi (výchozí)"
 
-#~ msgid "The resolution in dots-per-inch to use when scanning photos."
-#~ msgstr "Rozlišení v bodech na palec použité při skenování fotografií."
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: src/preferences-dialog.vala:443
+#, c-format
+msgid "%d dpi (draft)"
+msgstr "%d dpi (náčrt)"
 
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: src/preferences-dialog.vala:446
 #, c-format
-#~ msgid ""
-#~ "Help Options:\n"
-#~ "  -d, --debug                     Print debugging messages\n"
-#~ "  -v, --version                   Show release version\n"
-#~ "  -h, --help                      Show help options\n"
-#~ "  --help-all                      Show all help options\n"
-#~ "  --help-gtk                      Show GTK+ options"
-#~ msgstr ""
-#~ "Přepínače nápovědy:\n"
-#~ "  -d, --debug                     Vypisovat ladicí informace\n"
-#~ "  -v, --version                   Zobrazit verzi vydání\n"
-#~ "  -h, --help                      Zobrazit přepínače nápovědy\n"
-#~ "  --help-all                      Zobrazit všechny přepínače nápovědy\n"
-#~ "  --help-gtk                      Zobrazit přepínače GTK+"
+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/preferences-dialog.vala:449
 #, c-format
-#~ msgid ""
-#~ "Usage:\n"
-#~ "  %s [DEVICE...] - Scanning utility"
-#~ msgstr ""
-#~ "Použití:\n"
-#~ "  %s [ZAŘÍZENÍ...] - Skenovací nástroj"
+msgid "%d dpi"
+msgstr "%d dpi"
+
+#. Error displayed when no scanners to scan with
+#: src/scanner.vala:844
+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:874
+msgid "Unable to connect to scanner"
+msgstr "Nelze navázat spojení se skenerem"
+
+#. Error display when unable to start scan
+#: src/scanner.vala:1227
+msgid "Unable to start scan"
+msgstr "Nelze zahájit skenování"
+
+#. Error displayed when communication with scanner broken
+#: src/scanner.vala:1240 src/scanner.vala:1340
+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
+msgid "Show release version"
+msgstr "Zobrazit verzi vydání"
+
+#. Help string for command line --debug flag
+#: src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Vypisovat ladicí zprávy"
+
+#: src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+msgstr "Opravit soubory PDF vygenerovaných starší verzí Jednoduchého skenování"
+
+#. Title of error dialog when scan failed
+#: src/simple-scan.vala:392
+msgid "Failed to scan"
+msgstr "Skenování selhalo"
+
+#. Attempt to inhibit the screensaver when scanning
+#: src/simple-scan.vala:407
+msgid "Scan in progress"
+msgstr "Skenování probíhá"
+
+#. Arguments and description for --help text
+#: src/simple-scan.vala:584
+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:595
 #, c-format
-#~ msgid ""
-#~ "GTK+ Options:\n"
-#~ "  --class=CLASS                   Program class as used by the window "
-#~ "manager\n"
-#~ "  --name=NAME                     Program name as used by the window "
-#~ "manager\n"
-#~ "  --screen=SCREEN                 X screen to use\n"
-#~ "  --sync                          Make X calls synchronous\n"
-#~ "  --gtk-module=MODULES            Load additional GTK+ modules\n"
-#~ "  --g-fatal-warnings              Make all warnings fatal"
-#~ msgstr ""
-#~ "Přepínače GTK+:\n"
-#~ "  --class=TŘÍDA                   Třída programu, jak je použita okenním "
-#~ "správcem\n"
-#~ "  --name=NÁZEV                    Název programu, jak je použit okenním "
-#~ "správcem\n"
-#~ "  --screen=OBRAZOVKA              Obrazovka X, která se má použít\n"
-#~ "  --sync                          Volání X budou synchronní\n"
-#~ "  --gtk-module=MODULY             Načte přídavné moduly GTK+\n"
-#~ "  --g-fatal-warnings              Všechna varování budou kritická"
-
-#~ msgid "Select File _Type"
-#~ msgstr "Zvolit _typ souboru"
-
-#~ msgid ""
-#~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
-#~ msgstr ""
-#~ "Strana stránky ke skenování. Může to být jedna z následujících hodnot: "
-#~ "„both“ (obě), „front“ (přední), „back“ (zadní)"
-
-#~ msgid ""
-#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
-#~ msgstr ""
-#~ "Výška papíru v desetinách milimetru (nebo 0 pro automatické zjištění papíru)."
-
-#~ msgid "Height of paper in tenths of a mm"
-#~ msgstr "Výška papíru v desetinách milimetru"
-
-#~ msgid "Page side to scan"
-#~ msgstr "Strana stránky ke skenování"
-
-#~ msgid ""
-#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
-#~ msgstr ""
-#~ "Šířka papíru v desetinách milimetru (nebo 0 pro automatické zjištění papíru)."
-
-#~ msgid "Width of paper in tenths of a mm"
-#~ msgstr "Šířka papíru v desetinách milimetru"
-
-#~ msgid "The page side to scan."
-#~ msgstr "Strana stránky ke skenování."
-
-#~ msgid ""
-#~ "Type of document being scanned. This setting decides on the scan resolution, "
-#~ "colors and post-processing."
-#~ msgstr ""
-#~ "Typ skenovaného dokumentu. Toto nastavení rozhoduje o rozlišení skenování, "
-#~ "barvách a následném zpracování."
-
-#~ msgid "The direction of the scanner across the scanned page."
-#~ msgstr "Směr skenování stránky."
-
-#~ msgid "Contrast of scan"
-#~ msgstr "Kontrast skenu"
-
-#~ msgid "Brightness of scan"
-#~ msgstr "Jas skenu"
-
-#~ msgid "Quality value to use for JPEG compression."
-#~ msgstr "Hodnota kvality u JPEG komprese."
-
-#~ msgid "Quality value to use for JPEG compression"
-#~ msgstr "Hodnota kvality u JPEG komprese"
-
-#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
-#~ msgstr "Nastavení kontrastu od -100 do 100 (0 žádná hodnota)."
-
-#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
-#~ msgstr "Nastavení jasu od -100 do 100 (0 žádná hodnota)."
+msgid "Run “%s --help” to see a full list of available command line options."
+msgstr ""
+"Spuštěním „%s --help“ si zobrazíte úplný seznam dostupných přepínačů "
+"příkazové řádky."
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..5dba793 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,519 +1,525 @@
 # Danish translation for simple-scan
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# Copyright (c) 2017 Rosetta Contributors and Canonical Ltd 2017
 # This file is distributed under the same license as the simple-scan package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
 #
 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-10 12:13+0000\n"
-"Last-Translator: AJenbo <anders@jenbo.dk>\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
+"product=simple-scan&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-08-28 18:35+0000\n"
+"PO-Revision-Date: 2017-09-05 20:45+0200\n"
+"Last-Translator: Alan Mortensen <alanmortensen.am@gmail.com>\n"
 "Language-Team: Danish <da@li.org>\n"
+"Language: da\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-25 06:10+0000\n"
+"X-Generator: Poedit 1.8.7.1\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. Button to submit authorization dialog
-#: data/simple-scan.ui:24
-msgid "_Authorize"
-msgstr "_Autorisér"
+#: data/org.gnome.SimpleScan.gschema.xml:11
+msgid "Device to scan from"
+msgstr "Enhed at skanne fra"
 
-#. Label beside username entry
-#: data/simple-scan.ui:102
-msgid "_Username for resource:"
-msgstr "Br_ugernavn for ressource:"
+#: data/org.gnome.SimpleScan.gschema.xml:12
+msgid "SANE device to acquire images from."
+msgstr "SANE-enhed at erhverve billeder fra."
 
-#. Label beside password entry
-#: data/simple-scan.ui:117
-msgid "_Password:"
-msgstr "_Adgangskode:"
+#: data/org.gnome.SimpleScan.gschema.xml:20
+msgid "Type of document being scanned"
+msgstr "Dokumenttype der skannes"
 
-#. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
-msgid "Front and Back"
-msgstr "For- og bagside"
+#: data/org.gnome.SimpleScan.gschema.xml:21
+msgid ""
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+msgstr ""
+"Hvilken slags dokument der skannes. Denne indstilling bestemmer opløsning, "
+"farver og efterbehandling."
 
-#. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
-msgid "Front"
-msgstr "Forside"
+#: data/org.gnome.SimpleScan.gschema.xml:25
+msgid "Width of paper in tenths of a mm"
+msgstr "Papirbredde i tiendedele millimeter"
 
-#. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
-msgid "Back"
-msgstr "Bagside"
+#: data/org.gnome.SimpleScan.gschema.xml:26
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"Papirbredde i tiendedele millimeter (eller 0 for automatisk registrering)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:30
+msgid "Height of paper in tenths of a mm"
+msgstr "Papirhøjde i tiendedele millimeter"
+
+#: data/org.gnome.SimpleScan.gschema.xml:31
+msgid ""
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"Papirhøjde i tiendedele millimeter (eller 0 for automatisk registrering)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:35
+msgid "Brightness of scan"
+msgstr "Lysstyrke for skanning"
+
+#: data/org.gnome.SimpleScan.gschema.xml:36
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr "Lysstyrkejusteringen mellem -100 og 100 (hvor 0 betyder ingen)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:40
+msgid "Contrast of scan"
+msgstr "Kontrast for skanning"
+
+#: data/org.gnome.SimpleScan.gschema.xml:41
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr "Kontrastjusteringen mellem -100 og 100 (hvor 0 betyder ingen)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:45
+msgid "Resolution for text scans"
+msgstr "Opløsning for tekstskan"
 
+#: data/org.gnome.SimpleScan.gschema.xml:46
+msgid "The resolution in dots-per-inch to use when scanning text."
+msgstr "Opløsningen i punkter per tomme der skal bruges til skanning af tekst."
+
+#: data/org.gnome.SimpleScan.gschema.xml:50
+msgid "Resolution for photo scans"
+msgstr "Opløsning for billedskan"
+
+#: data/org.gnome.SimpleScan.gschema.xml:51
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr ""
+"Opløsningen i punkter per tomme der skal bruges til skanning af billeder."
+
+#: data/org.gnome.SimpleScan.gschema.xml:55
+msgid "Page side to scan"
+msgstr "Papirside der skal skannes"
+
+#: data/org.gnome.SimpleScan.gschema.xml:56
+msgid "The page side to scan."
+msgstr "Hvilken side af papiret der skal skannes."
+
+#: data/org.gnome.SimpleScan.gschema.xml:60
+msgid "Directory to save files to"
+msgstr "Mappe til at gemme filer i"
+
+#: data/org.gnome.SimpleScan.gschema.xml:61
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr "Mappen til at gemme filer i. Som standard bruges dokumentmappen."
+
+#: data/org.gnome.SimpleScan.gschema.xml:66
+msgid "Quality value to use for JPEG compression"
+msgstr "Kvalitetsværdi der bruges til JPEG-komprimering"
+
+#: data/org.gnome.SimpleScan.gschema.xml:67
+msgid "Quality value to use for JPEG compression."
+msgstr "Kvalitetsværdi der bruges til JPEG-komprimering."
+
+#: data/org.gnome.SimpleScan.gschema.xml:72
+msgid "Delay in millisecond between pages"
+msgstr "Forsinkelse i millisekunder mellem sider"
+
+#: data/org.gnome.SimpleScan.gschema.xml:73
+msgid "Delay in millisecond between pages."
+msgstr "Forsinkelse i millisekunder mellem sider."
+
+#. Title of scan window
+#. Set HeaderBar title here because Glade doesn't keep it translated
+#. https://bugzilla.gnome.org/show_bug.cgi?id=782753
 #. 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
+#: data/simple-scan.appdata.xml.in:6 data/simple-scan.desktop.in:3
+#: src/app-window.ui:76 src/app-window.vala:1560
 msgid "Simple Scan"
 msgstr "Simpel skanning"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
-msgid "_Document"
-msgstr "_Dokument"
+#: data/simple-scan.appdata.xml.in:7 data/simple-scan.desktop.in:5
+msgid "Scan Documents"
+msgstr "Skan dokumenter"
 
-#. Scan menu item
-#: data/simple-scan.ui:260
-msgid "Sc_an"
-msgstr "Sk_an"
+#: 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 "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+"En virkelig nem måde at skanne både dokumenter og billeder på. Du kan beskære "
+"de uønskede dele fra et billede og rotere det, hvis det vender forkert. Du "
+"kan udskrive dine skanninger, eksportere dem til pdf eller gemme dem i en "
+"række billedformater."
+
+#: data/simple-scan.appdata.xml.in:14
+msgid "Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+"Simpel skanning bruger SANE-rammeværket for at understøtte flest mulige "
+"skannere."
 
+#: data/simple-scan.desktop.in:4
+msgid "Document Scanner"
+msgstr "Dokumentskanner"
+
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: data/simple-scan.desktop.in:7
+msgid "scan;scanner;flatbed;adf;"
+msgstr "scan;scanner;flatbed;adf;skan;skanner;"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: data/simple-scan.desktop.in:10
+msgid "scanner"
+msgstr "scanner"
+
+#. Toolbar scan menu item to scan a single page from the scanner
 #. 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/app-window.ui:22 src/app-window.ui:123 src/app-window.ui:820
 msgid "Single _Page"
 msgstr "_Enkelt side"
 
+#. Toolbar scan menu item to scan all pages from a document feeder
 #. 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/app-window.ui:31 src/app-window.ui:133 src/app-window.ui:829
 msgid "All Pages From _Feeder"
-msgstr "Alle sider fra _arkføderen"
+msgstr "_Alle sider fra arkføderen"
 
-#. Menu entry to stop current scan
-#: data/simple-scan.ui:294
-msgid "_Stop Scan"
-msgstr "_Stop skanning"
+#. Toolbar scan menu item to scan continuously from the flatbed
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/app-window.ui:40 src/app-window.ui:143 src/app-window.ui:838
+msgid "_Multiple Pages From Flatbed"
+msgstr "_Flere sider fra glaspladen"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:853
 msgid "Text"
 msgstr "Tekst"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:863
 msgid "Photo"
 msgstr "Billede"
 
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: src/app-window.ui:91
+msgid "_Document"
+msgstr "_Dokument"
+
+#. Scan menu item
+#: src/app-window.ui:110
+msgid "Sc_an"
+msgstr "Sk_an"
+
+#. Menu entry to stop current scan
+#: src/app-window.ui:154
+msgid "_Stop Scan"
+msgstr "_Stop skanning"
+
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/app-window.ui:196 src/app-window.vala:967 src/app-window.vala:1590
 msgid "Reorder Pages"
 msgstr "Sortér sider påny"
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/app-window.ui:215
 msgid "_Email"
-msgstr "_Send med e-post"
+msgstr "_E-mail"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/app-window.ui:280
 msgid "_Page"
 msgstr "_Side"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/app-window.ui:290
 msgid "Rotate _Left"
 msgstr "Rotér mod _venstre"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/app-window.ui:300
 msgid "Rotate _Right"
 msgstr "Rotér mod _højre"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/app-window.ui:310
 msgid "_Crop"
 msgstr "_Beskær"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/app-window.ui:320
 msgid "_None"
 msgstr "_Ingen"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/app-window.ui:331
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/app-window.ui:342
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/app-window.ui:353
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/app-window.ui:364
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/app-window.ui:375
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/app-window.ui:386
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/app-window.ui:397
 msgid "_Custom"
 msgstr "_Brugertilpasset"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/app-window.ui:415
 msgid "_Rotate Crop"
 msgstr "_Rotér beskæring"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/app-window.ui:428
 msgid "Move Left"
 msgstr "Flyt til venstre"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/app-window.ui:437
 msgid "Move Right"
 msgstr "Flyt til højre"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/app-window.ui:474
 msgid "_Help"
 msgstr "_Hjælp"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/app-window.ui:482
 msgid "_Contents"
 msgstr "_Indhold"
 
-#. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
-msgid "Start a new document"
-msgstr "Start et nyt dokument"
-
-#: data/simple-scan.ui:675
-msgid "New"
-msgstr "Nyt"
-
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/app-window.ui:520 src/app-window.ui:720
 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/app-window.ui:522 src/app-window.ui:716
 msgid "Scan"
 msgstr "Skan"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/app-window.ui:538 src/app-window.ui:787
 msgid "Save document to a file"
-msgstr "Gem dokument som en fil"
+msgstr "Gem skanningen som en fil"
 
-#: ../src/ui.vala:1842
+#: src/app-window.ui:540
 msgid "Save"
 msgstr "Gem"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/app-window.ui:555 src/app-window.ui:700
 msgid "Stop the current scan"
 msgstr "Stop den igangværende skanning"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/app-window.ui:556 src/app-window.ui:697
 msgid "Stop"
 msgstr "Stop"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "Rotér siden mod venstre (mod uret)"
-
-#. Label on rotate page left (anti-clockwise) item
-#: data/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
-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
-msgid "Rotate Right"
-msgstr "Rotér mod højre"
-
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
-msgid "Crop the selected page"
-msgstr "Beskær den markerede side"
-
-#: data/simple-scan.ui:781
-msgid "Crop"
-msgstr "Beskær"
-
-#: ../src/ui.vala:1849
-msgid "Preferences"
-msgstr "Indstillinger"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1048
-msgid "Scan S_ource:"
-msgstr "Skanner_kilde:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1079
-msgid "_Text Resolution:"
-msgstr "_Tekstopløsning:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1095
-msgid "_Photo Resolution:"
-msgstr "_Billedopløsning:"
-
-#. Label beside scan side combo box
-#: data/simple-scan.ui:1139
-msgid "Scan Side:"
-msgstr "Skan side:"
-
-#. Label beside page size combo box
-#: data/simple-scan.ui:1169
-msgid "Page Size:"
-msgstr "Sidestørrelse:"
-
-#. Label beside brightness scale
-#: data/simple-scan.ui:1199
-msgid "Brightness:"
-msgstr "Lysstyrke:"
-
-#. Label beside contrast scale
-#: data/simple-scan.ui:1229
-msgid "Contrast:"
-msgstr "Kontrast:"
+#. Label shown when searching for scanners
+#: src/app-window.ui:611
+msgid "Searching for Scanners…"
+msgstr "Søger efter skannere …"
 
-#. Label beside quality scale
-#: data/simple-scan.ui:1260
-msgid "Quality:"
-msgstr "Kvalitet:"
-
-#: data/simple-scan.desktop.in:4
-msgid "Document Scanner"
-msgstr "Dokumentskanner"
+#: src/app-window.vala:237 src/app-window.vala:1380
+msgid "_Close"
+msgstr "_Luk"
 
-#: data/simple-scan.desktop.in:5
-msgid "Scan Documents"
-msgstr "Skan dokumenter"
+#. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
+#: src/app-window.vala:246
+#, c-format
+msgid "Username and password required to access “%s”"
+msgstr "Brugernavn og adgangskode er krævet for at tilgå “%s”"
 
-#: data/simple-scan.desktop.in:6
-msgid "scan;scanner;flatbed;adf;"
-msgstr "scan;scanner;flatbed;adf;skan;skanner;"
+#. Label shown when detected a scanner
+#: src/app-window.vala:266 src/app-window.vala:584
+msgid "Ready to Scan"
+msgstr "Klar til at skanne"
 
-#: data/simple-scan.desktop.in:8
-msgid "scanner"
-msgstr ""
-
-#: data/simple-scan.appdata.xml.in:8
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-"En virkelig nem måde at skanne både dokumenter og billeder. Du kan beskære "
-"de uønskede dele fra et billede og rotere det, hvis det vender forkert. Du "
-"kan udskrive dine skanninger, eksportere dem til pdf eller gemme dem i en "
-"række billedformater."
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: src/app-window.vala:273
+msgid "Additional software needed"
+msgstr "Yderligere software påkrævet"
 
-#: data/simple-scan.appdata.xml.in:13
+#. Instructions to install driver software
+#: src/app-window.vala:275
 msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
+"You need to <a href=\"install-firmware\">install driver software</a> for "
+"your scanner."
 msgstr ""
-"Simpel skanning bruger SANE-rammeværket for at understøtte flest mulige "
-"skannere."
-
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
-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
-msgid "Unable to connect to scanner"
-msgstr "Kunne ikke forbinde til sḱanner"
-
-#. Error display when unable to start scan
-#: ../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
-msgid "Error communicating with scanner"
-msgstr "Fejl under kommunikation med skanner."
-
-#. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
-msgid "Show release version"
-msgstr "Vis versionsnummer"
-
-#. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
-msgid "Print debugging messages"
-msgstr "Skriv fejlsøgningsbeskeder"
-
-#: ../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
-msgid "Failed to scan"
-msgstr "Skanning mislykkedes"
-
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
-msgid "[DEVICE...] - Scanning utility"
-msgstr "[ENHED...] - Skanningsredskab"
-
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
-#, 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
-msgid "_Close"
-msgstr "_Luk"
-
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../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\""
+"Det er nødvendigt at <a href=\"install-firmware\">installere en driver</a> "
+"til din skanner."
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/app-window.vala:281
 msgid "No scanners detected"
 msgstr "Ingen skannere fundet"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/app-window.vala:283
 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
-msgid "Additional software needed"
-msgstr "Yderligere software påkrævet"
-
-#. Instructions to install driver software
-#: ../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
-msgid "Save As..."
-msgstr "Gem som..."
+#: src/app-window.vala:298
+msgid "Save As…"
+msgstr "Gem som …"
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/app-window.vala:301 src/app-window.vala:471 src/app-window.vala:552
 msgid "_Cancel"
 msgstr "_Annullér"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/app-window.vala:302 src/app-window.vala:553
 msgid "_Save"
 msgstr "_Gem"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/app-window.vala:310
 msgid "Scanned Document.pdf"
 msgstr "Skannet dokument.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#. Save dialog: Filter name to show only supported image files
+#: src/app-window.vala:316
 msgid "Image Files"
 msgstr "Billedfiler"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/app-window.vala:326
 msgid "All Files"
 msgstr "Alle filer"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/app-window.vala:335
 msgid "PDF (multi-page document)"
 msgstr "PDF (flersidet dokument)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/app-window.vala:341
 msgid "JPEG (compressed)"
 msgstr "JPEG (komprimeret)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/app-window.vala:347
 msgid "PNG (lossless)"
 msgstr "PNG (tabsfri)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#. Save dialog: Label for sabing in WEBP format
+#: src/app-window.vala:354
+msgid "WebP (compressed)"
+msgstr "WebP (komprimeret)"
+
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
+#: src/app-window.vala:364
 msgid "File format:"
 msgstr "Filformat:"
 
+#. Label in save dialog beside compression slider
+#: src/app-window.vala:376
+msgid "Compression:"
+msgstr "Komprimering:"
+
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/app-window.vala:470
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr "Filen “%s” findes allerede. Vil du erstatte den?"
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/app-window.vala:473
+msgid "_Replace"
+msgstr "E_rstat"
+
+#: src/app-window.vala:512
+msgid "Saving"
+msgstr "Gemmer"
+
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/app-window.vala:527
 msgid "Failed to save file"
-msgstr "Kunne ikke gemme fil"
+msgstr "Kunne ikke gemme filen"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../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."
+#: src/app-window.vala:550
+msgid "If you don’t save, changes will be permanently lost."
+msgstr "Hvis du ikke gemmer, vil ændringerne være tabt for altid."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:708
+#: src/app-window.vala:591
 msgid "Save current document?"
-msgstr "Gem nuværende dokument?"
+msgstr "Gem det nuværende dokument?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/app-window.vala:593
 msgid "Discard Changes"
 msgstr "Kassér ændringer"
 
+#. Label shown when scan started
+#: src/app-window.vala:692
+msgid "Contacting scanner…"
+msgstr "Kontakter skanneren …"
+
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/app-window.vala:800
 msgid "Unable to save image for preview"
-msgstr "Kan ikke gemme billede for forhåndsvisning"
+msgstr "Kan ikke gemme billedet til forhåndsvisning"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/app-window.vala:812
 msgid "Unable to open image preview application"
-msgstr "Kunne ikke åbne programmet til forhåndsvisning af billeder"
+msgstr "Kan ikke åbne programmet til forhåndsvisning af billeder"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/app-window.vala:990
 msgid "Combine sides"
 msgstr "Kombinér sider"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/app-window.vala:1000
 msgid "Combine sides (reverse)"
 msgstr "Kombinér sider (omvendt)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/app-window.vala:1010
 msgid "Reverse"
 msgstr "Omvendt"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/app-window.vala:1020
 msgid "Keep unchanged"
 msgstr "Bevar uændret"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/app-window.vala:1250
 msgid "Unable to open help file"
-msgstr "Kan ikke åbne hjælpefil"
+msgstr "Kunne ikke åbne hjælpefilen"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/app-window.vala:1271
 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 +548,21 @@ msgstr ""
 "sammen med dette program. Hvis ikke, se <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/app-window.vala:1274
 msgid "About Simple Scan"
 msgstr "Om Simpel skanning"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/app-window.vala:1277
 msgid "Simple document scanning tool"
 msgstr "Simpelt dokumentskanningsværktøj"
 
-#: ../src/ui.vala:1487
+#: src/app-window.vala:1286
 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"
@@ -565,201 +571,514 @@ msgstr ""
 "  Marcus Møller https://launchpad.net/~marcusmoller\n"
 "  Niels Kjøller Hansen https://launchpad.net/~kjoller\n"
 "  TLE https://launchpad.net/~k-nielsen81\n"
-"  Torben Gundtofte-Bruun https://launchpad.net/~torbengb"
+"  Torben Gundtofte-Bruun https://launchpad.net/~torbengb\n"
+"  Alan Mortensen https://launchpad.net/~alanmortensen-am"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/app-window.vala:1308
 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
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:1310
 msgid "Quit without Saving"
 msgstr "Afslut uden at gemme"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/app-window.vala:1357
 msgid "You appear to have a Brother scanner."
-msgstr "Du ser ud til at have en Brother skanner."
+msgstr "Du ser ud til at have en Brother-skanner."
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/app-window.vala:1359
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.brother.com\">Brother website</a>."
+"Drivers for this are available on the <a href=\"http://support.brother.com"
+"\">Brother website</a>."
 msgstr ""
-"Der er drivere er tilgængelige til denne på <a "
-"href=\"http://support.brother.com\">Brothers webside</a>."
+"Drivere til denne kan hentes på <a href=\"http://support.brother.com"
+"\">Brothers websted</a>."
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/app-window.vala:1363
 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/app-window.vala:1365
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://samsung.com/support\">Samsung website</a>."
+"Drivers for this are available on the <a href=\"http://samsung.com/support"
+"\">Samsung website</a>."
 msgstr ""
-"Drivere til dette er tilgængelige på <a "
-"href=\"http://samsung.com/support\">Samsungs hjemmeside</a>."
+"Drivere til denne kan hentes på <a href=\"http://samsung.com/support"
+"\">Samsungs websted</a>."
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/app-window.vala:1369
 msgid "You appear to have an HP scanner."
-msgstr "Du ser ud til at have en HP-skanner"
+msgstr "Du ser ud til at have en HP-skanner."
 
 #. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/app-window.vala:1374
 msgid "You appear to have an Epson scanner."
-msgstr "Du ser ud til at have en Epson-skanner"
+msgstr "Du ser ud til at have en Epson-skanner."
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/app-window.vala:1376
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.epson.com\">Epson website</a>."
+"Drivers for this are available on the <a href=\"http://support.epson.com"
+"\">Epson website</a>."
 msgstr ""
-"Drivere for denne fås på <a href=\"http://support.epson.com\">Epsons "
-"hjemmeside</a>."
+"Drivere til denne kan hentes på <a href=\"http://support.epson.com\">Epsons "
+"websted</a>."
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/app-window.vala:1380
 msgid "Install drivers"
 msgstr "Installér drivere"
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/app-window.vala:1411
 msgid "Once installed you will need to restart Simple Scan."
-msgstr "Når de er installeret, så skal du genstarte Simpel skanning."
+msgstr "Når de er installeret, skal du genstarte Simpel skanning."
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
-msgid "Installing drivers..."
-msgstr "Installerer drivere..."
+#: src/app-window.vala:1423
+msgid "Installing drivers…"
+msgstr "Installerer drivere …"
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/app-window.vala:1431
 msgid "Drivers installed successfully!"
-msgstr "Driver installeret korrekt!"
+msgstr "Driverne blev installeret!"
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/app-window.vala:1441
 #, 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/app-window.vala:1447
 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/app-window.vala:1454
+#, c-format
+msgid "You need to install the %s package."
+msgid_plural "You need to install the %s packages."
+msgstr[0] "Det er nødvendigt at installere pakken %s."
+msgstr[1] "Det er nødvendigt at installere pakkerne %s."
+
+#. Title of preferences dialog
+#: src/app-window.vala:1568 src/app-window.vala:1591
+#: src/preferences-dialog.ui:53
+msgid "Preferences"
+msgstr "Indstillinger"
+
+#: src/app-window.vala:1572
+msgid "Keyboard Shortcuts"
+msgstr "Tastaturgenveje"
+
+#: src/app-window.vala:1573
+msgid "Help"
+msgstr "Hjælp"
+
+#: src/app-window.vala:1574
+msgid "About"
+msgstr "Om"
+
+#: src/app-window.vala:1575
+msgid "Quit"
+msgstr "Afslut"
+
+#: src/app-window.vala:1589
+msgid "Email"
+msgstr "E-mail"
+
+#. Populate ActionBar (not supported in Glade)
+#. https://bugzilla.gnome.org/show_bug.cgi?id=769966
+#. Label on new document button
+#: src/app-window.vala:1599
+msgid "Start Again…"
+msgstr "Start igen …"
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: src/app-window.vala:1616
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Rotér siden mod venstre (mod uret)"
+
+#. Tooltip for rotate right (clockwise) button
+#: src/app-window.vala:1623
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Rotér siden mod højre (med uret)"
+
+#. Tooltip for crop button
+#: src/app-window.vala:1633
+msgid "Crop the selected page"
+msgstr "Beskær den markerede side"
+
+#. Tooltip for delete button
+#: src/app-window.vala:1649
+msgid "Delete the selected page"
+msgstr "Slet den markerede side"
+
+#. Text of button for cancelling save
+#: src/app-window.vala:1814
+msgid "Cancel"
+msgstr "Annullér"
+
+#. Button to submit authorization dialog
+#: src/authorize-dialog.ui:25
+msgid "_Authorize"
+msgstr "A_utorisér"
+
+#. Label beside username entry
+#: src/authorize-dialog.ui:99
+msgid "_Username for resource:"
+msgstr "_Brugernavn til ressourcen:"
+
+#. Label beside password entry
+#: src/authorize-dialog.ui:112
+msgid "_Password:"
+msgstr "_Adgangskode:"
+
+#: src/book.vala:331 src/book.vala:337
 #, c-format
-msgid "You need to install the %s package(s)."
-msgstr "Det er nødvendigt at installere pakken eller pakkerne %s."
+msgid "Unable to encode page %i"
+msgstr "Kan ikke kode siden %i"
+
+#: src/help-overlay.ui:12
+msgctxt "shortcut window"
+msgid "Scanning"
+msgstr "Skanner"
+
+#: src/help-overlay.ui:17
+msgctxt "shortcut window"
+msgid "Scan a single page"
+msgstr "Skan en enkelt side"
+
+#: src/help-overlay.ui:24
+msgctxt "shortcut window"
+msgid "Scan all pages from document feeder"
+msgstr "Skan alle sider i arkføderen"
+
+#: src/help-overlay.ui:31
+msgctxt "shortcut window"
+msgid "Scan continuously from a flatbed scanner"
+msgstr "Skan kontinuerligt fra en flatbedskanner"
+
+#: src/help-overlay.ui:38
+msgctxt "shortcut window"
+msgid "Stop scan in progress"
+msgstr "Stop den igangværende skanning"
+
+#: src/help-overlay.ui:46
+msgctxt "shortcut window"
+msgid "Document Modification"
+msgstr "Dokumentændring"
+
+#: src/help-overlay.ui:51
+msgctxt "shortcut window"
+msgid "Move page left"
+msgstr "Flyt siden til venstre"
+
+#: src/help-overlay.ui:58
+msgctxt "shortcut window"
+msgid "Move page right"
+msgstr "Flyt siden til højre"
+
+#: src/help-overlay.ui:65
+msgctxt "shortcut window"
+msgid "Rotate page to the left (anti-clockwise)"
+msgstr "Rotér siden mod venstre (mod uret)"
+
+#: src/help-overlay.ui:72
+msgctxt "shortcut window"
+msgid "Rotate page to the right (clockwise)"
+msgstr "Rotér siden mod højre (med uret)"
+
+#: src/help-overlay.ui:79
+msgctxt "shortcut window"
+msgid "Delete page"
+msgstr "Slet siden"
+
+#: src/help-overlay.ui:87
+msgctxt "shortcut window"
+msgid "Document Management"
+msgstr "Dokumenthåndtering"
+
+#: src/help-overlay.ui:92
+msgctxt "shortcut window"
+msgid "Start new document"
+msgstr "Start et nyt dokument"
+
+#: src/help-overlay.ui:99
+msgctxt "shortcut window"
+msgid "Save scanned document"
+msgstr "Gem det skannede dokument"
+
+#: src/help-overlay.ui:106
+msgctxt "shortcut window"
+msgid "Email scanned document"
+msgstr "E-mail det skannede dokument"
+
+#: src/help-overlay.ui:113
+msgctxt "shortcut window"
+msgid "Print scanned document"
+msgstr "Udskriv det skannede dokument"
+
+#: src/help-overlay.ui:120
+msgctxt "shortcut window"
+msgid "Copy current page to clipboard"
+msgstr "Kopiér den aktuelle side til udklipsholderen"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:113
+msgid "_Scanner"
+msgstr "_Skanner"
+
+#. Label beside scan side combo box
+#: src/preferences-dialog.ui:143
+msgid "Scan Sides"
+msgstr "Skan sider"
+
+#. Label beside page size combo box
+#: src/preferences-dialog.ui:160
+msgid "Page Size"
+msgstr "Sidestørrelse"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:191
+msgid "Front"
+msgstr "Forside"
+
+#. Preferences Dialog: Toggle button to select scanning on the back side of a page
+#: src/preferences-dialog.ui:206
+msgid "Back"
+msgstr "Bagside"
+
+#. Preferences Dialog: Toggle button to select scanning on both sides of a page
+#: src/preferences-dialog.ui:221
+msgid "Both"
+msgstr "Begge"
+
+#. Label beside page delay scale
+#: src/preferences-dialog.ui:260
+msgid "Delay"
+msgstr "Forsinkelse"
+
+#. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
+#: src/preferences-dialog.ui:276
+msgid "Multiple pages from flatbed"
+msgstr "Flere sider fra glaspladen"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:295
+msgid "3"
+msgstr "3"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:310
+msgid "5"
+msgstr "5"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:326
+msgid "7"
+msgstr "7"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:342
+msgid "10"
+msgstr "10"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:358
+msgid "15"
+msgstr "15"
+
+#. Label after page delay radio buttons
+#: src/preferences-dialog.ui:385
+msgid "Seconds"
+msgstr "Sekunder"
+
+#. Preferences Dialog: Tab label for scanning settings
+#: src/preferences-dialog.ui:413
+msgid "Scanning"
+msgstr "Skanning"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:436
+msgid "_Text Resolution"
+msgstr "Tekstopløsning"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:452
+msgid "_Photo Resolution"
+msgstr "Billedopløsning"
+
+#. Label beside brightness scale
+#: src/preferences-dialog.ui:505
+msgid "Brightness"
+msgstr "Lysstyrke"
+
+#. Label beside contrast scale
+#: src/preferences-dialog.ui:521
+msgid "Contrast"
+msgstr "Kontrast"
+
+#. Preferences Dialog: Tab for quality settings
+#: src/preferences-dialog.ui:576
+msgid "Quality"
+msgstr "Kvalitet"
+
+#. Combo box value for automatic paper size
+#: src/preferences-dialog.vala:77
+msgid "Automatic"
+msgstr "Automatisk"
+
+#: src/preferences-dialog.vala:116
+msgid "Darker"
+msgstr "Mørkere"
+
+#: src/preferences-dialog.vala:118
+msgid "Lighter"
+msgstr "Lysere"
+
+#: src/preferences-dialog.vala:126
+msgid "Less"
+msgstr "Mindre"
+
+#: src/preferences-dialog.vala:128
+msgid "More"
+msgstr "Mere"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/preferences-dialog.vala:440
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (standard)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/preferences-dialog.vala:443
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (udkast)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/preferences-dialog.vala:446
 #, 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/preferences-dialog.vala:449
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1835
-msgid "New Document"
-msgstr "Nyt dokument"
+#. Error displayed when no scanners to scan with
+#: src/scanner.vala:844
+msgid "No scanners available.  Please connect a scanner."
+msgstr "Ingen skannere tilgængelig. Tilslut en skanner."
 
-#: ../src/ui.vala:1840
-msgid "Document"
-msgstr "Dokument"
+#. Error displayed when cannot connect to scanner
+#: src/scanner.vala:874
+msgid "Unable to connect to scanner"
+msgstr "Kan ikke forbinde til sḱanneren"
 
-#: ../src/ui.vala:1844
-msgid "Email..."
-msgstr "E-post..."
+#. Error display when unable to start scan
+#: src/scanner.vala:1227
+msgid "Unable to start scan"
+msgstr "Kan ikke starte skanningen"
 
-#: ../src/ui.vala:1845
-msgid "Print..."
-msgstr "Udskriv..."
+#. Error displayed when communication with scanner broken
+#: src/scanner.vala:1240 src/scanner.vala:1340
+msgid "Error communicating with scanner"
+msgstr "Fejl under kommunikation med skanneren"
 
-#: ../src/ui.vala:1853
-msgid "Help"
-msgstr "Hjælp"
+#. Help string for command line --version flag
+#: src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "Vis versionsnummer"
 
-#: ../src/ui.vala:1854
-msgid "About"
-msgstr "Om"
+#. Help string for command line --debug flag
+#: src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Skriv fejlsøgningsbeskeder"
 
-#: ../src/ui.vala:1855
-msgid "Quit"
-msgstr "Afslut"
+#: 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 skanning"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
-msgid "Change _Scanner"
-msgstr "Skift _skanner"
+#. Title of error dialog when scan failed
+#: src/simple-scan.vala:392
+msgid "Failed to scan"
+msgstr "Skanningen mislykkedes"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
-msgid "_Install Drivers"
-msgstr "_Installér drivere"
+#. Attempt to inhibit the screensaver when scanning
+#: src/simple-scan.vala:407
+msgid "Scan in progress"
+msgstr "Igangværende skanning"
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
-msgid "Automatic"
-msgstr "Automatisk"
+#. Arguments and description for --help text
+#: src/simple-scan.vala:584
+msgid "[DEVICE…] — Scanning utility"
+msgstr "[ENHED...] — Skanningsværktøj"
 
-#: ../src/ui.vala:1947
-msgid "Darker"
-msgstr "Mørkere"
+#. Text printed out when an unknown command-line argument provided
+#: src/simple-scan.vala:595
+#, c-format
+msgid "Run “%s --help” to see a full list of available command line options."
+msgstr ""
+"Kør “%s --help” for at se den fulde liste af tilgængelige "
+"kommandolinjetilvalg."
 
-#: ../src/ui.vala:1949
-msgid "Lighter"
-msgstr "Lysere"
+#~ msgid "Front and Back"
+#~ msgstr "For- og bagside"
 
-#: ../src/ui.vala:1957
-msgid "Less"
-msgstr "Mindre"
+#~ msgid "New"
+#~ msgstr "Nyt"
 
-#: ../src/ui.vala:1959
-msgid "More"
-msgstr "Mere"
+#~ msgid "Rotate Left"
+#~ msgstr "Rotér mod venstre"
 
-#: ../src/ui.vala:1967
-msgid "Minimum"
-msgstr "Minimum"
+#~ msgid "Rotate Right"
+#~ msgstr "Rotér mod højre"
 
-#: ../src/ui.vala:1969
-msgid "Maximum"
-msgstr "Maksimum"
+#~ msgid "Crop"
+#~ msgstr "Beskær"
 
-#: ../src/ui.vala:2008
-msgid "Saving document..."
-msgstr "Gemmer dokument ..."
+#~ msgid "Scan S_ource:"
+#~ msgstr "Skanner_kilde:"
 
-#: ../src/ui.vala:2173
-#, c-format
-msgid "Saving page %d out of %d"
-msgstr "Gemmer side %d ud af %d"
+#~ msgid "New Document"
+#~ msgstr "Nyt dokument"
+
+#~ msgid "Document"
+#~ msgstr "Dokument"
+
+#~ msgid "Email..."
+#~ msgstr "E-post..."
+
+#~ msgid "Print..."
+#~ msgstr "Udskriv..."
+
+#~ msgid "_Install Drivers"
+#~ msgstr "_Installér drivere"
+
+#~ msgid "Minimum"
+#~ msgstr "Minimum"
+
+#~ msgid "Maximum"
+#~ msgstr "Maksimum"
+
+#~ msgid "Saving document..."
+#~ msgstr "Gemmer dokument ..."
+
+#~ msgid "Saving page %d out of %d"
+#~ msgstr "Gemmer side %d ud af %d"
 
 #~ msgid "4&#xD7;6"
 #~ msgstr "4&#xD7;6"
@@ -773,19 +1092,17 @@ msgstr "Gemmer side %d ud af %d"
 #~ msgid "Select File _Type"
 #~ msgstr "Vælg fil_type"
 
-#~ msgid "Device to scan from"
-#~ msgstr "Enhed at skanne fra"
-
 #~ msgid "Direction of scan"
 #~ msgstr "Skanneretning"
 
 #~ msgid ""
-#~ "The direction of the scanner across the scanned page. It can be one of the "
-#~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+#~ "The direction of the scanner across the scanned page. It can be one of "
+#~ "the following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-"
+#~ "left'"
 #~ msgstr ""
-#~ "Retningen af skanneren på tværs af siden der skannes. Den kan være én af de "
-#~ "følgende: \"top-to-bottom\" \"bottom-to-top\" \"left-to-right\" \"right-to-"
-#~ "left\""
+#~ "Retningen af skanneren på tværs af siden der skannes. Den kan være én af "
+#~ "de følgende: “top-to-bottom” “bottom-to-top” “left-to-right” “right-to-"
+#~ "left”"
 
 #~ msgid "Height of scanned image in pixels"
 #~ msgstr "Højde af skannet billede i pixel"
@@ -800,40 +1117,21 @@ msgstr "Gemmer side %d ud af %d"
 #~ "Højden af skannede billede i pixel. Denne værdi opdateres svarende til "
 #~ "sidste skannede side."
 
-#~ msgid "SANE device to acquire images from."
-#~ msgstr "SANE-enhed at erhverve billeder fra."
-
-#~ msgid "Resolution for text scans"
-#~ msgstr "Opløsning for tekstskan"
-
-#~ msgid "Resolution for photo scans"
-#~ msgstr "Opløsning for billedskan"
-
 #~ msgid "Resolution of last scanned image"
 #~ msgstr "Opløsningen af det sidste billede der blev skannet"
 
 #~ msgid ""
-#~ "The directory to save files to. Defaults to the documents directory if unset."
-#~ msgstr "Mappen til at gemme filer i. Som standard bruges dokumentmappen."
-
-#~ msgid "Directory to save files to"
-#~ msgstr "Mappe til at gemme filer i"
-
-#~ msgid "Type of document being scanned"
-#~ msgstr "Type af dokument der bliver skannet"
-
-#~ msgid ""
 #~ "Type of document being scanned. 'text' for text documents, 'photo' for "
 #~ "photos. This setting decides on the scan resolution, colors and post-"
 #~ "processing."
 #~ msgstr ""
-#~ "Type af dokument der skannes. \"text\" for tekst dokumenter, \"photo\" for "
-#~ "billeder. Denne indstilling træffer valget for skanningsopløsning, farver og "
-#~ "efterbehandling."
+#~ "Type af dokument der skannes. “text” for tekst dokumenter, “photo” for "
+#~ "billeder. Denne indstilling træffer valget for skanningsopløsning, farver "
+#~ "og efterbehandling."
 
 #~ msgid ""
-#~ "The width of scanned image in pixels. This value is updated to what the last "
-#~ "scanned page was."
+#~ "The width of scanned image in pixels. This value is updated to what the "
+#~ "last scanned page was."
 #~ msgstr ""
 #~ "Bredden af skannede billede i pixel. Denne værdi opdateres svarende til "
 #~ "sidste skannede side."
@@ -841,18 +1139,9 @@ msgstr "Gemmer side %d ud af %d"
 #~ msgid "The resolution in dots-per-inch of the previously scanned image."
 #~ msgstr "Opløsningen i punkter per tomme, på det forrige skannede billede."
 
-#~ msgid "The resolution in dots-per-inch to use when scanning text."
-#~ msgstr ""
-#~ "Opløsningen i punkter per tomme, der skal bruges når der skannes tekst."
-
-#~ msgid "The resolution in dots-per-inch to use when scanning photos."
-#~ msgstr ""
-#~ "Opløsningen i punkter per tomme, der skal bruges når der skannes foto."
-
 #~ msgid "Width of scanned image in pixels"
 #~ msgstr "Bredde af skannet billede i pixel"
 
-#, c-format
 #~ msgid ""
 #~ "Help Options:\n"
 #~ "  -d, --debug                     Print debugging messages\n"
@@ -868,7 +1157,6 @@ msgstr "Gemmer side %d ud af %d"
 #~ "  --help-all                      Vis hjælp for alle tilvalg\n"
 #~ "  --help-gtk                      Vis tilvalg for GTK+"
 
-#, c-format
 #~ msgid ""
 #~ "Usage:\n"
 #~ "  %s [DEVICE...] - Scanning utility"
@@ -876,7 +1164,6 @@ msgstr "Gemmer side %d ud af %d"
 #~ "Brug:\n"
 #~ "  %s [ENHED...] - Skanningsværktøj"
 
-#, c-format
 #~ msgid ""
 #~ "GTK+ Options:\n"
 #~ "  --class=CLASS                   Program class as used by the window "
@@ -898,69 +1185,17 @@ msgstr "Gemmer side %d ud af %d"
 #~ "  --gtk-module=MODULER            Indlæs ekstra GTK+-moduler\n"
 #~ "  --g-fatal-warnings              Gør alle advarsler fatale"
 
-#~ msgid "Scanned Document"
-#~ msgstr "Skannet dokument"
-
 #~ msgid ""
-#~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+#~ "The page side to scan. It can be one of the following: 'both' 'front' "
+#~ "'back'"
 #~ msgstr ""
 #~ "Papirside der skal skannes. Den kan være følgende: 'both' 'front' 'back'"
 
-#~ msgid "Page side to scan"
-#~ msgstr "Papirside der skal skannes"
-
-#~ msgid ""
-#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
-#~ msgstr ""
-#~ "Højde af papir tiendedele millimeter (eller 0 for automatisk papirstørelse)."
-
-#~ msgid "Height of paper in tenths of a mm"
-#~ msgstr "Højde af papir i tiendedele millimeter"
-
-#~ msgid ""
-#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
-#~ msgstr ""
-#~ "Bredde af papir i tiendedele millimeter (eller 0 for automatisk "
-#~ "papirstørelse)"
-
-#~ msgid "Width of paper in tenths of a mm"
-#~ msgstr "Bredde af papir i tiendedele millimeter"
-
 #~ msgid "Window height in pixels"
 #~ msgstr "Vindueshøjde i pixel"
 
 #~ msgid "Window width in pixels"
 #~ msgstr "Vinduesbredde i pixel"
 
-#~ msgid "The page side to scan."
-#~ msgstr "Hvilken side af papiret der skal skannes."
-
-#~ msgid ""
-#~ "Type of document being scanned. This setting decides on the scan resolution, "
-#~ "colors and post-processing."
-#~ msgstr ""
-#~ "Hvilken slags dokument der skal skannes. Denne indstilling bestemmer "
-#~ "opløsningen, farver og efterbehandling."
-
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "Skannerens retning hen over siden."
-
-#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
-#~ msgstr "Kontrastjusteringen mellem -100 og 100 (hvor 0 betyder ingen)."
-
-#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
-#~ msgstr "Lysstyrkejusteringen mellem -100 og 100 (hvor 0 betyder ingen)."
-
-#~ msgid "Quality value to use for JPEG compression."
-#~ msgstr "Kvalitetsværdi der bruges til JPEG-komprimering."
-
-#~ msgid "Quality value to use for JPEG compression"
-#~ msgstr "Kvalitetsværdi der bruges til JPEG-komprimering"
-
-#~ msgid "Brightness of scan"
-#~ msgstr "Lysstyrke for skanning"
-
-#~ msgid "Contrast of scan"
-#~ msgstr "Kontrast for skanning"
diff --git a/po/de.gmo b/po/de.gmo
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..ba318d6 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,525 +1,574 @@
 # German translation for simple-scan
 # Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
 # This file is distributed under the same license as the simple-scan package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
+#
+# Launchpad Contributions:
+# .daniel. https://launchpad.net/~faessje
+# Alexander Wilms https://launchpad.net/~alexander-wilms
+# Alvaro Aleman https://launchpad.net/~alvaroaleman
+# Charon https://launchpad.net/~markus-lobedann
+# Daniel Schury https://launchpad.net/~surst
+# Daniel Winzen https://launchpad.net/~q-d
+# Dennis Baudys https://launchpad.net/~thecondordb
+# Dennisgamer https://launchpad.net/~dennis-ertelt
+# Dominik Grafenhofer https://launchpad.net/~dpjg
+# EgLe https://launchpad.net/~egle1
+# Ettore Atalan https://launchpad.net/~atalanttore
+# Felix https://launchpad.net/~apoapo
+# Franz E. https://launchpad.net/~franzellendorff
+# Funky Future https://launchpad.net/~funky-future
+# Ghenrik https://launchpad.net/~ghenrik-deactivatedaccount
+# HOMBRESINIESTRO https://launchpad.net/~hombre
+# Hendrik Brandt https://launchpad.net/~heb
+# Hendrik Knackstedt https://launchpad.net/~hennekn
+# Jan https://launchpad.net/~jancborchardt-deactivatedaccount
+# John Doe https://launchpad.net/~jodo-deactivatedaccount
+# Julian Gehring https://launchpad.net/~julian-gehring
+# Jörg BUCHMANN https://launchpad.net/~jorg-buchmann
+# Lars Vopicka https://launchpad.net/~lars+vopicka-deactivatedaccount
+# Marcel Schmücker https://launchpad.net/~versus666-deactivatedaccount
+# Martin Lettner https://launchpad.net/~m.lettner
+# Mathias Dietrich https://launchpad.net/~theghost
+# Moritz Baumann https://launchpad.net/~mo42
+# Phillip Sz https://launchpad.net/~phillip-sz
+# Raphael J. Schmid https://launchpad.net/~raphael-j-schmid
+# Scherbruch https://launchpad.net/~scherbruch
+# Stefan Buchholz https://launchpad.net/~stef-buchholz
+# Steve G. https://launchpad.net/~sgo.ger
+# Thomas Heidrich https://launchpad.net/~gnuheidix
+# Tobias Bannert https://launchpad.net/~toba
+# Torsten Franz https://launchpad.net/~torsten.franz
+# UweS https://launchpad.net/~uwes
+# Webschiff https://launchpad.net/~webschiff
+# William Glover https://launchpad.net/~williamglover
+# schuko24 https://launchpad.net/~gerd-saenger
+# staedtler-przyborski https://launchpad.net/~staedtler-przyborski
+# tlue https://launchpad.net/~tlueber"
+#
+# Mario Blättermann <mario.blaettermann@gmail.com>, 2017.
 #
 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"
-"Language-Team: German <de@li.org>\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
+"product=simple-scan&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-08-13 21:51+0000\n"
+"PO-Revision-Date: 2017-08-19 13:54+0200\n"
+"Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
+"Language-Team: German <gnome-de@gnome.org>\n"
+"Language: de\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-25 06:10+0000\n"
+"X-Generator: Poedit 2.0.3\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. Button to submit authorization dialog
-#: data/simple-scan.ui:24
-msgid "_Authorize"
-msgstr "_Legitimieren"
+#: data/org.gnome.SimpleScan.gschema.xml:11
+msgid "Device to scan from"
+msgstr "Scangerät"
 
-#. Label beside username entry
-#: data/simple-scan.ui:102
-msgid "_Username for resource:"
-msgstr "_Benutzername für Quelle:"
+#: data/org.gnome.SimpleScan.gschema.xml:12
+msgid "SANE device to acquire images from."
+msgstr "SANE-Gerät, von dem Bilder angefordert werden."
 
-#. Label beside password entry
-#: data/simple-scan.ui:117
-msgid "_Password:"
-msgstr "_Passwort:"
+#: data/org.gnome.SimpleScan.gschema.xml:20
+msgid "Type of document being scanned"
+msgstr "Typ des zu scannenden Dokuments"
 
-#. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
-msgid "Front and Back"
-msgstr "Vorder- und Rückseite"
+#: data/org.gnome.SimpleScan.gschema.xml:21
+msgid ""
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+msgstr ""
+"Typ des zu scannenden Dokuments. Diese Einstellung entscheidet über die "
+"Auflösung, Farben und Nachbearbeitung."
 
-#. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
-msgid "Front"
-msgstr "Vorderseite"
+#: data/org.gnome.SimpleScan.gschema.xml:25
+msgid "Width of paper in tenths of a mm"
+msgstr "Seitenbreite in Zehntelmillimetern"
 
-#. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
-msgid "Back"
-msgstr "Rückseite"
+#: data/org.gnome.SimpleScan.gschema.xml:26
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"Seitenbreite in Zehntelmillimetern (oder 0 für automatische Papiererkennung)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:30
+msgid "Height of paper in tenths of a mm"
+msgstr "Papierhöhe in Zehntelmillimetern"
+
+#: data/org.gnome.SimpleScan.gschema.xml:31
+msgid ""
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"Papierhöhe in Zehntelmillimetern (oder 0 für automatische Papiererkennung)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:35
+msgid "Brightness of scan"
+msgstr "Helligkeit des Scans"
+
+#: data/org.gnome.SimpleScan.gschema.xml:36
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr "Helligkeitseinstellung von -100 bis 100 (0 keine)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:40
+msgid "Contrast of scan"
+msgstr "Kontrast des Scans"
+
+#: data/org.gnome.SimpleScan.gschema.xml:41
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr "Kontrasteinstellung von -100 bis 100 (0 keine)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:45
+msgid "Resolution for text scans"
+msgstr "Auflösung von Text-Scans"
+
+#: data/org.gnome.SimpleScan.gschema.xml:46
+msgid "The resolution in dots-per-inch to use when scanning text."
+msgstr "Die für Text zu verwendende Auflösung in DPI (Punkte pro Zoll)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:50
+msgid "Resolution for photo scans"
+msgstr "Auflösung von Foto-Scans"
+
+#: data/org.gnome.SimpleScan.gschema.xml:51
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr "Die für Fotos zu verwendende Auflösung in DPI (Punkte pro Zoll)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:55
+msgid "Page side to scan"
+msgstr "Zu scannende Seite des Blattes"
 
+#: data/org.gnome.SimpleScan.gschema.xml:56
+msgid "The page side to scan."
+msgstr "Die zu scannende Seite."
+
+#: data/org.gnome.SimpleScan.gschema.xml:60
+msgid "Directory to save files to"
+msgstr "Ordner, in dem die Dateien gespeichert werden"
+
+#: data/org.gnome.SimpleScan.gschema.xml:61
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+"Der Ordner, in dem die Dateien gespeichert werden. Vorgabe ist der "
+"»Dokumente«-Ordner, wenn nichts eingestellt ist."
+
+#: data/org.gnome.SimpleScan.gschema.xml:66
+msgid "Quality value to use for JPEG compression"
+msgstr "Qualitätswert für die JPEG-Komprimierung"
+
+#: data/org.gnome.SimpleScan.gschema.xml:67
+msgid "Quality value to use for JPEG compression."
+msgstr "Qualitätswert, der für die JPEG-Komprimierung verwendet werden soll."
+
+#: data/org.gnome.SimpleScan.gschema.xml:72
+msgid "Delay in millisecond between pages"
+msgstr "Verzögerung zwischen Seiten in Millisekunden"
+
+#: data/org.gnome.SimpleScan.gschema.xml:73
+msgid "Delay in millisecond between pages."
+msgstr "Verzögerung zwischen Seiten in Millisekunden."
+
+#. Title of scan window
+#. Set HeaderBar title here because Glade doesn't keep it translated
+#. https://bugzilla.gnome.org/show_bug.cgi?id=782753
 #. 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
+#: data/simple-scan.appdata.xml.in:6 data/simple-scan.desktop.in:3
+#: src/app-window.ui:76 src/app-window.vala:1560
 msgid "Simple Scan"
 msgstr "Simple Scan"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
-msgid "_Document"
-msgstr "_Dokument"
+#: data/simple-scan.appdata.xml.in:7 data/simple-scan.desktop.in:5
+msgid "Scan Documents"
+msgstr "Dokumente scannen"
 
-#. Scan menu item
-#: data/simple-scan.ui:260
-msgid "Sc_an"
-msgstr "Sc_annen"
+#: 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 "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+"Eine ganz einfache Methode, um sowohl Dokumente als auch Fotos zu scannen. "
+"Unbrauchbare Teile eines Fotos können abgeschnitten werden, es kann gedreht "
+"werden, falls es verkehrt herum liegt. Die Scans können gedruckt, als PDF-"
+"Dokument exportiert oder in einer Anzahl verschiedener Bildformate "
+"gespeichert werden."
+
+#: data/simple-scan.appdata.xml.in:14
+msgid "Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+"Simple Scan verwendet das SANE-Framework für die Unterstützung der meisten "
+"verfügbaren Scanner."
 
+#: data/simple-scan.desktop.in:4
+msgid "Document Scanner"
+msgstr "Dokument-Scanner"
+
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: data/simple-scan.desktop.in:7
+msgid "scan;scanner;flatbed;adf;"
+msgstr "scan;einlesen;scanner;Flachbett;flatbed;AVW;Vorlagenwechsler;adf;"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: data/simple-scan.desktop.in:10
+msgid "scanner"
+msgstr "scanner"
+
+#. Toolbar scan menu item to scan a single page from the scanner
 #. 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/app-window.ui:22 src/app-window.ui:123 src/app-window.ui:820
 msgid "Single _Page"
 msgstr "_Einzelne Seite"
 
+#. Toolbar scan menu item to scan all pages from a document feeder
 #. 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/app-window.ui:31 src/app-window.ui:133 src/app-window.ui:829
 msgid "All Pages From _Feeder"
 msgstr "Alle Seiten aus dem _Papiereinzug"
 
-#. Menu entry to stop current scan
-#: data/simple-scan.ui:294
-msgid "_Stop Scan"
-msgstr "_Scanvorgang anhalten"
+#. Toolbar scan menu item to scan continuously from the flatbed
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/app-window.ui:40 src/app-window.ui:143 src/app-window.ui:838
+msgid "_Multiple Pages From Flatbed"
+msgstr "_Mehrere Seiten aus Flachbett"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:853
 msgid "Text"
 msgstr "Text"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:863
 msgid "Photo"
 msgstr "Foto"
 
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: src/app-window.ui:91
+msgid "_Document"
+msgstr "_Dokument"
+
+#. Scan menu item
+#: src/app-window.ui:110
+msgid "Sc_an"
+msgstr "Sc_annen"
+
+#. Menu entry to stop current scan
+#: src/app-window.ui:154
+msgid "_Stop Scan"
+msgstr "_Scanvorgang anhalten"
+
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/app-window.ui:196 src/app-window.vala:967 src/app-window.vala:1590
 msgid "Reorder Pages"
 msgstr "Seiten umsortieren"
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/app-window.ui:215
 msgid "_Email"
 msgstr "_E-Mail"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/app-window.ui:280
 msgid "_Page"
 msgstr "_Seite"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/app-window.ui:290
 msgid "Rotate _Left"
 msgstr "_Links herum drehen"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/app-window.ui:300
 msgid "Rotate _Right"
 msgstr "_Rechts herum drehen"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/app-window.ui:310
 msgid "_Crop"
 msgstr "_Zuschneiden"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/app-window.ui:320
 msgid "_None"
 msgstr "_Nicht zuschneiden"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/app-window.ui:331
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/app-window.ui:342
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/app-window.ui:353
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/app-window.ui:364
 msgid "_Letter"
 msgstr "US _Letter"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/app-window.ui:375
 msgid "Le_gal"
 msgstr "US _Legal"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/app-window.ui:386
 msgid "4×6"
 msgstr "4×6 Zoll"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/app-window.ui:397
 msgid "_Custom"
 msgstr "_Benutzerdefiniert"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/app-window.ui:415
 msgid "_Rotate Crop"
 msgstr "Zuschneideauswahl _drehen"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/app-window.ui:428
 msgid "Move Left"
 msgstr "Nach links schieben"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/app-window.ui:437
 msgid "Move Right"
 msgstr "Nach rechts schieben"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/app-window.ui:474
 msgid "_Help"
 msgstr "_Hilfe"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/app-window.ui:482
 msgid "_Contents"
 msgstr "I_nhalt"
 
-#. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
-msgid "Start a new document"
-msgstr "Neues Dokument erstellen"
-
-#: data/simple-scan.ui:675
-msgid "New"
-msgstr "Neu"
-
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/app-window.ui:520 src/app-window.ui:720
 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/app-window.ui:522 src/app-window.ui:716
 msgid "Scan"
 msgstr "Scannen"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/app-window.ui:538 src/app-window.ui:787
 msgid "Save document to a file"
-msgstr "Als Datei speichern"
+msgstr "Dokument als Datei speichern"
 
-#: ../src/ui.vala:1842
+#: src/app-window.ui:540
 msgid "Save"
 msgstr "Speichern"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/app-window.ui:555 src/app-window.ui:700
 msgid "Stop the current scan"
 msgstr "Aktuellen Scanvorgang unterbrechen"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/app-window.ui:556 src/app-window.ui:697
 msgid "Stop"
 msgstr "Anhalten"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "Die Seite links herum drehen (Gegen den Uhrzeigersinn)"
-
-#. Label on rotate page left (anti-clockwise) item
-#: data/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
-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
-msgid "Rotate Right"
-msgstr "Rechts herum drehen"
-
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
-msgid "Crop the selected page"
-msgstr "Die gewählte Seite zurechtschneiden"
-
-#: data/simple-scan.ui:781
-msgid "Crop"
-msgstr "Zuschneiden"
-
-#: ../src/ui.vala:1849
-msgid "Preferences"
-msgstr "Einstellungen"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1048
-msgid "Scan S_ource:"
-msgstr "Scan-_Quelle:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1079
-msgid "_Text Resolution:"
-msgstr "_Textauflösung:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1095
-msgid "_Photo Resolution:"
-msgstr "_Fotoauflösung:"
-
-#. Label beside scan side combo box
-#: data/simple-scan.ui:1139
-msgid "Scan Side:"
-msgstr "Zu scannende Seite:"
-
-#. Label beside page size combo box
-#: data/simple-scan.ui:1169
-msgid "Page Size:"
-msgstr "Seitengröße:"
-
-#. Label beside brightness scale
-#: data/simple-scan.ui:1199
-msgid "Brightness:"
-msgstr "Helligkeit:"
-
-#. Label beside contrast scale
-#: data/simple-scan.ui:1229
-msgid "Contrast:"
-msgstr "Kontrast:"
-
-#. Label beside quality scale
-#: data/simple-scan.ui:1260
-msgid "Quality:"
-msgstr "Qualität:"
-
-#: data/simple-scan.desktop.in:4
-msgid "Document Scanner"
-msgstr "Dokument-Scanner"
-
-#: data/simple-scan.desktop.in:5
-msgid "Scan Documents"
-msgstr "Dokumente scannen"
+#. Label shown when searching for scanners
+#: src/app-window.ui:611
+msgid "Searching for Scanners…"
+msgstr "Nach Scannern wird gesucht …"
 
-#: data/simple-scan.desktop.in:6
-msgid "scan;scanner;flatbed;adf;"
-msgstr "scan;einlesen;scanner;Flachbrett;flatbed;AVW;Vorlagenwechsler;adf;"
-
-#: data/simple-scan.desktop.in:8
-msgid "scanner"
-msgstr ""
-
-#: data/simple-scan.appdata.xml.in:8
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-"Eine ganz einfache Methode, um sowohl Dokumente als auch Fotos zu scannen. "
-"Unbrauchbare Teile eines Fotos können abgeschnitten werden, es kann gedreht "
-"werden, falls es verkehrt herum liegt. Die Scans können gedruckt, als PDF-"
-"Dokument exportiert oder in einer Anzahl verschiedener Bildformate "
-"gespeichert werden."
-
-#: data/simple-scan.appdata.xml.in:13
-msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
-"Simple Scan verwendet das SANE-Programmiergerüst für die Unterstützung der "
-"meisten verfügbaren Scanner."
-
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
-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
-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
-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
-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
-msgid "Show release version"
-msgstr "Versionsinformation anzeigen"
-
-#. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
-msgid "Print debugging messages"
-msgstr "Fehlerdiagnosemeldungen anzeigen"
-
-#: ../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
-msgid "Failed to scan"
-msgstr "Scannen fehlgeschlagen"
-
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
-msgid "[DEVICE...] - Scanning utility"
-msgstr "[GERÄT …] - Scan-Werkzeug"
-
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
-#, 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/app-window.vala:237 src/app-window.vala:1380
 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
+#. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
+#: src/app-window.vala:246
 #, c-format
-msgid "Username and password required to access '%s'"
+msgid "Username and password required to access “%s”"
 msgstr ""
 "Für den Zugriff auf »%s« werden ein Benutzername und ein Passwort benötigt"
 
+#. Label shown when detected a scanner
+#: src/app-window.vala:266 src/app-window.vala:584
+msgid "Ready to Scan"
+msgstr "Bereit zum Scannen"
+
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: src/app-window.vala:273
+msgid "Additional software needed"
+msgstr "Zusätzliche Software wird benötigt"
+
+#. Instructions to install driver software
+#: src/app-window.vala:275
+msgid ""
+"You need to <a href=\"install-firmware\">install driver software</a> for "
+"your scanner."
+msgstr ""
+"Sie müssen die <a href=\"install-firmware\">Treibersoftware</a für Ihren "
+"Scanner installieren."
+
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/app-window.vala:281
 msgid "No scanners detected"
 msgstr "Kein Scanner gefunden"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/app-window.vala:283
 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
-msgid "Additional software needed"
-msgstr "Zusätzliche Software wird benötigt"
-
-#. Instructions to install driver software
-#: ../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
-msgid "Save As..."
+#: src/app-window.vala:298
+msgid "Save As…"
 msgstr "Speichern unter …"
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/app-window.vala:301 src/app-window.vala:471 src/app-window.vala:552
 msgid "_Cancel"
 msgstr "Abbre_chen"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/app-window.vala:302 src/app-window.vala:553
 msgid "_Save"
 msgstr "_Speichern"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/app-window.vala:310
 msgid "Scanned Document.pdf"
 msgstr "Gescanntes Dokument.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#. Save dialog: Filter name to show only supported image files
+#: src/app-window.vala:316
 msgid "Image Files"
 msgstr "Bilddateien"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/app-window.vala:326
 msgid "All Files"
 msgstr "Alle Dateitypen"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/app-window.vala:335
 msgid "PDF (multi-page document)"
 msgstr "PDF (Mehrseitiges Dokument)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/app-window.vala:341
 msgid "JPEG (compressed)"
 msgstr "JPEG (Verlustbehaftet)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/app-window.vala:347
 msgid "PNG (lossless)"
 msgstr "PNG (Verlustfrei)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#. Save dialog: Label for sabing in WEBP format
+#: src/app-window.vala:354
+msgid "WebP (compressed)"
+msgstr "WebP (komprimiert)"
+
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
+#: src/app-window.vala:364
 msgid "File format:"
 msgstr "Dateiformat:"
 
+#. Label in save dialog beside compression slider
+#: src/app-window.vala:376
+msgid "Compression:"
+msgstr "Kompression:"
+
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/app-window.vala:470
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr "Eine Datei namens »%s« existiert bereits. Möchten Sie diese ersetzen?"
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/app-window.vala:473
+msgid "_Replace"
+msgstr "E_rsetzen"
+
+#: src/app-window.vala:512
+msgid "Saving"
+msgstr "Wird gespeichert"
+
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/app-window.vala:527
 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
-msgid "If you don't save, changes will be permanently lost."
+#: src/app-window.vala:550
+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/app-window.vala:591
 msgid "Save current document?"
 msgstr "Aktuelles Dokument speichern?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/app-window.vala:593
 msgid "Discard Changes"
 msgstr "Änderungen verwerfen"
 
+#. Label shown when scan started
+#: src/app-window.vala:692
+msgid "Contacting scanner…"
+msgstr "Scanner wird kontaktiert …"
+
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/app-window.vala:800
 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/app-window.vala:812
 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/app-window.vala:990
 msgid "Combine sides"
 msgstr "Seiten zusammenfügen"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/app-window.vala:1000
 msgid "Combine sides (reverse)"
 msgstr "Seiten zusammenfügen (umgekehrte Reihenfolge)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/app-window.vala:1010
 msgid "Reverse"
 msgstr "Vertauschen"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/app-window.vala:1020
 msgid "Keep unchanged"
 msgstr "Unverändert lassen"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/app-window.vala:1250
 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/app-window.vala:1271
 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 +602,16 @@ msgstr ""
 "<http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/app-window.vala:1274
 msgid "About Simple Scan"
 msgstr "Über Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/app-window.vala:1277
 msgid "Simple document scanning tool"
 msgstr "Einfaches Werkzeug zum Scannen von Dokumenten"
 
-#: ../src/ui.vala:1487
+#: src/app-window.vala:1286
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -609,400 +658,464 @@ msgstr ""
 "  tlue https://launchpad.net/~tlueber"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/app-window.vala:1308
 msgid "Save document before quitting?"
 msgstr "Dokument vor dem Beenden speichern?"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:1310
 msgid "Quit without Saving"
 msgstr "Beenden ohne zu speichern"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/app-window.vala:1357
 msgid "You appear to have a Brother scanner."
-msgstr "Scheinbar ist ein Brother Scanner angeschlossen."
+msgstr "Scheinbar ist ein Brother-Scanner angeschlossen."
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/app-window.vala:1359
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.brother.com\">Brother website</a>."
+"Drivers for this are available on the <a href=\"http://support.brother.com"
+"\">Brother website</a>."
 msgstr ""
-"Treiber hierfür sind verfügbar auf der <a "
-"href=\"http://support.brother.com\">Brother Webseite</a>."
+"Treiber hierfür sind verfügbar auf der <a href=\"http://support.brother.com"
+"\">Brother Webseite</a>."
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/app-window.vala:1363
 msgid "You appear to have a Samsung scanner."
-msgstr "Scheinbar ist ein Samsung Scanner angeschlossen."
+msgstr "Scheinbar ist ein Samsung-Scanner angeschlossen."
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/app-window.vala:1365
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://samsung.com/support\">Samsung website</a>."
+"Drivers for this are available on the <a href=\"http://samsung.com/support"
+"\">Samsung website</a>."
 msgstr ""
-"Treiber hierfür sind verfügbar auf der <a "
-"href=\"http://samsung.com/support\">Samsung Webseite</a>."
+"Treiber hierfür sind verfügbar auf der <a href=\"http://samsung.com/support"
+"\">Samsung Webseite</a>."
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/app-window.vala:1369
 msgid "You appear to have an HP scanner."
-msgstr "Scheinbar ist ein HP Scanner angeschlossen."
+msgstr "Scheinbar ist ein HP-Scanner angeschlossen."
 
 #. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/app-window.vala:1374
 msgid "You appear to have an Epson scanner."
-msgstr "Scheinbar ist ein Epson Scanner angeschlossen."
+msgstr "Scheinbar ist ein Epson-Scanner angeschlossen."
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/app-window.vala:1376
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.epson.com\">Epson website</a>."
+"Drivers for this are available on the <a href=\"http://support.epson.com"
+"\">Epson website</a>."
 msgstr ""
 "Treiber hierfür sind auf der <a href=\"http://support.epson.com\">Epson "
 "Webseite</a> verfügbar."
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/app-window.vala:1380
 msgid "Install drivers"
 msgstr "Treiber installieren"
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/app-window.vala:1411
 msgid "Once installed you will need to restart Simple Scan."
-msgstr "Nach der Installation müssen Simple Scan erneut starten."
+msgstr "Nach der Installation müssen Sie Simple Scan erneut starten."
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
-msgid "Installing drivers..."
-msgstr "Treiber werden installiert…"
+#: src/app-window.vala:1423
+msgid "Installing drivers…"
+msgstr "Treiber werden installiert …"
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/app-window.vala:1431
 msgid "Drivers installed successfully!"
 msgstr "Treiber wurden erfolgreich installiert!"
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/app-window.vala:1441
 #, 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/app-window.vala:1447
 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/app-window.vala:1454
 #, c-format
-msgid "You need to install the %s package(s)."
-msgstr "Sie müssen %s Paket(e) installieren."
+msgid "You need to install the %s package."
+msgid_plural "You need to install the %s packages."
+msgstr[0] "Sie müssen das Paket %s installieren."
+msgstr[1] "Sie müssen die Pakete %s installieren."
+
+#. Title of preferences dialog
+#: src/app-window.vala:1568 src/app-window.vala:1591
+#: src/preferences-dialog.ui:53
+msgid "Preferences"
+msgstr "Einstellungen"
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
-#, c-format
-msgid "%d dpi (default)"
-msgstr "%d dpi (Vorgabe)"
+#: src/app-window.vala:1572
+msgid "Keyboard Shortcuts"
+msgstr "Tastenkombinationen"
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
-#, c-format
-msgid "%d dpi (draft)"
-msgstr "%d dpi (Entwurf)"
+#: src/app-window.vala:1573
+msgid "Help"
+msgstr "Hilfe"
 
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
-#, c-format
-msgid "%d dpi (high resolution)"
-msgstr "%d dpi (Hohe Auflösung)"
+#: src/app-window.vala:1574
+msgid "About"
+msgstr "Info"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/app-window.vala:1575
+msgid "Quit"
+msgstr "Beenden"
+
+#: src/app-window.vala:1589
+msgid "Email"
+msgstr "E-Mail"
+
+#. Populate ActionBar (not supported in Glade)
+#. https://bugzilla.gnome.org/show_bug.cgi?id=769966
+#. Label on new document button
+#: src/app-window.vala:1599
+msgid "Start Again…"
+msgstr "Erneut starten …"
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: src/app-window.vala:1616
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Die Seite links herum drehen (gegen den Uhrzeigersinn)"
+
+#. Tooltip for rotate right (clockwise) button
+#: src/app-window.vala:1623
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Die Seite rechts herum drehen (im Uhrzeigersinn)"
+
+#. Tooltip for crop button
+#: src/app-window.vala:1633
+msgid "Crop the selected page"
+msgstr "Die gewählte Seite zurechtschneiden"
+
+#. Tooltip for delete button
+#: src/app-window.vala:1649
+msgid "Delete the selected page"
+msgstr "Die gewählte Seite löschen"
+
+#. Text of button for cancelling save
+#: src/app-window.vala:1814
+msgid "Cancel"
+msgstr "Abbrechen"
+
+#. Button to submit authorization dialog
+#: src/authorize-dialog.ui:25
+msgid "_Authorize"
+msgstr "_Legitimieren"
+
+#. Label beside username entry
+#: src/authorize-dialog.ui:99
+msgid "_Username for resource:"
+msgstr "_Benutzername für Quelle:"
+
+#. Label beside password entry
+#: src/authorize-dialog.ui:112
+msgid "_Password:"
+msgstr "_Passwort:"
+
+#: src/book.vala:331 src/book.vala:337
 #, c-format
-msgid "%d dpi"
-msgstr "%d dpi"
+msgid "Unable to encode page %i"
+msgstr "Seite %i konnte nicht kodiert werden"
 
-#: ../src/ui.vala:1835
-msgid "New Document"
-msgstr "Neues Dokument"
+#: src/help-overlay.ui:12
+msgctxt "shortcut window"
+msgid "Scanning"
+msgstr "Scannen"
 
-#: ../src/ui.vala:1840
-msgid "Document"
-msgstr "Dokument"
+#: src/help-overlay.ui:17
+msgctxt "shortcut window"
+msgid "Scan a single page"
+msgstr "Eine einzelne Seite vom Scanner einscannen"
 
-#: ../src/ui.vala:1844
-msgid "Email..."
-msgstr "E-Mail …"
+#: src/help-overlay.ui:24
+msgctxt "shortcut window"
+msgid "Scan all pages from document feeder"
+msgstr "Alle Seiten aus dem Dokumenteneinzug einscannen"
+
+#: src/help-overlay.ui:31
+msgctxt "shortcut window"
+msgid "Scan continuously from a flatbed scanner"
+msgstr "Fortlaufend vom Flachbett-Scanner einscannen"
+
+#: src/help-overlay.ui:38
+msgctxt "shortcut window"
+msgid "Stop scan in progress"
+msgstr "Laufenden Scanvorgang anhalten"
+
+#: src/help-overlay.ui:46
+msgctxt "shortcut window"
+msgid "Document Modification"
+msgstr "Dokumentbearbeitung"
+
+#: src/help-overlay.ui:51
+msgctxt "shortcut window"
+msgid "Move page left"
+msgstr "Nach links schieben"
 
-#: ../src/ui.vala:1845
-msgid "Print..."
-msgstr "Drucken …"
+#: src/help-overlay.ui:58
+msgctxt "shortcut window"
+msgid "Move page right"
+msgstr "Nach rechts schieben"
 
-#: ../src/ui.vala:1853
-msgid "Help"
-msgstr "Hilfe"
+#: src/help-overlay.ui:65
+msgctxt "shortcut window"
+msgid "Rotate page to the left (anti-clockwise)"
+msgstr "Die Seite links herum drehen (gegen den Uhrzeigersinn)"
+
+#: src/help-overlay.ui:72
+msgctxt "shortcut window"
+msgid "Rotate page to the right (clockwise)"
+msgstr "Die Seite rechts herum drehen (im Uhrzeigersinn)"
+
+#: src/help-overlay.ui:79
+msgctxt "shortcut window"
+msgid "Delete page"
+msgstr "Seite löschen"
+
+#: src/help-overlay.ui:87
+msgctxt "shortcut window"
+msgid "Document Management"
+msgstr "Dokumentenverwaltung"
+
+#: src/help-overlay.ui:92
+msgctxt "shortcut window"
+msgid "Start new document"
+msgstr "Neues Dokument beginnen"
+
+#: src/help-overlay.ui:99
+msgctxt "shortcut window"
+msgid "Save scanned document"
+msgstr "Gescanntes Dokument speichern"
+
+#: src/help-overlay.ui:106
+msgctxt "shortcut window"
+msgid "Email scanned document"
+msgstr "Gescanntes Dokument per E-Mail versenden"
+
+#: src/help-overlay.ui:113
+msgctxt "shortcut window"
+msgid "Print scanned document"
+msgstr "Gescanntes Dokument drucken"
+
+#: src/help-overlay.ui:120
+msgctxt "shortcut window"
+msgid "Copy current page to clipboard"
+msgstr "Aktuelle Seite in die Zwischenablage kopieren"
 
-#: ../src/ui.vala:1854
-msgid "About"
-msgstr "Über"
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:113
+msgid "_Scanner"
+msgstr "_Scanner"
 
-#: ../src/ui.vala:1855
-msgid "Quit"
-msgstr "Beenden"
+#. Label beside scan side combo box
+#: src/preferences-dialog.ui:143
+msgid "Scan Sides"
+msgstr "Zu scannende Seiten"
+
+#. Label beside page size combo box
+#: src/preferences-dialog.ui:160
+msgid "Page Size"
+msgstr "Seitengröße"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:191
+msgid "Front"
+msgstr "Vorderseite"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
-msgid "Change _Scanner"
-msgstr "_Scanner wechseln"
+#. Preferences Dialog: Toggle button to select scanning on the back side of a page
+#: src/preferences-dialog.ui:206
+msgid "Back"
+msgstr "Rückseite"
+
+#. Preferences Dialog: Toggle button to select scanning on both sides of a page
+#: src/preferences-dialog.ui:221
+msgid "Both"
+msgstr "Beide"
+
+#. Label beside page delay scale
+#: src/preferences-dialog.ui:260
+msgid "Delay"
+msgstr "Verzögerung"
+
+#. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
+#: src/preferences-dialog.ui:276
+msgid "Multiple pages from flatbed"
+msgstr "Mehrere Seiten aus Flachbett"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:295
+msgid "3"
+msgstr "3"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:310
+msgid "5"
+msgstr "5"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:326
+msgid "7"
+msgstr "7"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:342
+msgid "10"
+msgstr "10"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:358
+msgid "15"
+msgstr "15"
+
+#. Label after page delay radio buttons
+#: src/preferences-dialog.ui:385
+msgid "Seconds"
+msgstr "Sekunden"
+
+#. Preferences Dialog: Tab label for scanning settings
+#: src/preferences-dialog.ui:413
+msgid "Scanning"
+msgstr "Scannen"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:436
+msgid "_Text Resolution"
+msgstr "_Textauflösung"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
-msgid "_Install Drivers"
-msgstr "_Treiber installieren"
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:452
+msgid "_Photo Resolution"
+msgstr "_Fotoauflösung"
+
+#. Label beside brightness scale
+#: src/preferences-dialog.ui:505
+msgid "Brightness"
+msgstr "Helligkeit"
+
+#. Label beside contrast scale
+#: src/preferences-dialog.ui:521
+msgid "Contrast"
+msgstr "Kontrast"
+
+#. Preferences Dialog: Tab for quality settings
+#: src/preferences-dialog.ui:576
+msgid "Quality"
+msgstr "Qualität"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/preferences-dialog.vala:77
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: ../src/ui.vala:1947
+#: src/preferences-dialog.vala:116
 msgid "Darker"
 msgstr "Dunkler"
 
-#: ../src/ui.vala:1949
+#: src/preferences-dialog.vala:118
 msgid "Lighter"
 msgstr "Heller"
 
-#: ../src/ui.vala:1957
+#: src/preferences-dialog.vala:126
 msgid "Less"
 msgstr "Weniger"
 
-#: ../src/ui.vala:1959
+#: src/preferences-dialog.vala:128
 msgid "More"
 msgstr "Mehr"
 
-#: ../src/ui.vala:1967
-msgid "Minimum"
-msgstr "Niedrig"
+#. Preferences dialog: Label for default resolution in resolution list
+#: src/preferences-dialog.vala:440
+#, c-format
+msgid "%d dpi (default)"
+msgstr "%d dpi (Vorgabe)"
 
-#: ../src/ui.vala:1969
-msgid "Maximum"
-msgstr "Hoch"
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: src/preferences-dialog.vala:443
+#, c-format
+msgid "%d dpi (draft)"
+msgstr "%d dpi (Entwurf)"
 
-#: ../src/ui.vala:2008
-msgid "Saving document..."
-msgstr "Dokument wird gespeichert …"
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: src/preferences-dialog.vala:446
+#, c-format
+msgid "%d dpi (high resolution)"
+msgstr "%d dpi (Hohe Auflösung)"
 
-#: ../src/ui.vala:2173
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: src/preferences-dialog.vala:449
 #, c-format
-msgid "Saving page %d out of %d"
-msgstr "Seite %d von %d wird gespeichert"
+msgid "%d dpi"
+msgstr "%d dpi"
 
-#~ msgid "4&#xD7;6"
-#~ msgstr "4&#xD7;6"
+#. Error displayed when no scanners to scan with
+#: src/scanner.vala:844
+msgid "No scanners available.  Please connect a scanner."
+msgstr "Keine Scanner verfügbar. Bitte schließen Sie einen Scanner an."
 
-#~ msgid "Files missing"
-#~ msgstr "Dateien nicht gefunden"
+#. Error displayed when cannot connect to scanner
+#: src/scanner.vala:874
+msgid "Unable to connect to scanner"
+msgstr "Verbindung zum Scanner konnte nicht hergestellt werden"
 
-#, c-format
-#~ msgid ""
-#~ "GTK+ Options:\n"
-#~ "  --class=CLASS                   Program class as used by the window "
-#~ "manager\n"
-#~ "  --name=NAME                     Program name as used by the window "
-#~ "manager\n"
-#~ "  --screen=SCREEN                 X screen to use\n"
-#~ "  --sync                          Make X calls synchronous\n"
-#~ "  --gtk-module=MODULES            Load additional GTK+ modules\n"
-#~ "  --g-fatal-warnings              Make all warnings fatal"
-#~ msgstr ""
-#~ "GTK+-Optionen:\n"
-#~ "  --class=KLASSE                   Die vom Fensterverwalter verwendete "
-#~ "Programmklasse\n"
-#~ "  --name=NAME                     Der vom Fensterverwalter verwendete "
-#~ "Programmname\n"
-#~ "  --screen=ANZEIGE                 Zu verwendende X-Anzeige\n"
-#~ "  --sync                          X-Aufrufe synchron durchführen\n"
-#~ "  --gtk-module=MODULE            Zusätzliche GTK+-Module laden\n"
-#~ "  --g-fatal-warnings              All Warnungen werden zu fatalen"
-
-#~ msgid "Please check your installation"
-#~ msgstr "Bitte überprüfen Sie Ihre Installation"
-
-#~ msgid "Window height in pixels"
-#~ msgstr "Fensterhöhe in Pixel"
-
-#~ msgid "Window width in pixels"
-#~ msgstr "Fensterbreite in Pixel"
-
-#~ msgid "Scanned Document"
-#~ msgstr "Gescanntes Dokument"
-
-#~ msgid "Height of scanned image in pixels"
-#~ msgstr "Höhe des gescannten Bilds in Pixel"
-
-#~ msgid "Device to scan from"
-#~ msgstr "Scangerät"
-
-#~ msgid "SANE device to acquire images from."
-#~ msgstr "SANE-Gerät, von dem Bilder angefordert werden."
-
-#~ msgid "Direction of scan"
-#~ msgstr "Scanverzeichnis"
-
-#~ msgid "Resolution for text scans"
-#~ msgstr "Auflösung von Text-Scans"
-
-#~ msgid "Resolution for photo scans"
-#~ msgstr "Auflösung von Foto-Scans"
-
-#~ msgid "Resolution of last scanned image"
-#~ msgstr "Auflösung des zuletzt gescannten Bildes"
-
-#~ msgid "Directory to save files to"
-#~ msgstr "Verzeichnis, in dem die Dateien gespeichert werden"
-
-#~ msgid ""
-#~ "The direction of the scanner across the scanned page. It can be one of the "
-#~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
-#~ msgstr ""
-#~ "Die Scanrichtung im Verhältnis zur zu gescannten Seite. Kann eins der "
-#~ "folgenden sein: »Oben nach Unten«, »Unten nach Oben«, »Links nach Rechts« "
-#~ "oder »Rechts nach Links«"
-
-#~ msgid "Type of document being scanned"
-#~ msgstr "Typ des zu scannenden Dokuments"
-
-#~ msgid ""
-#~ "The width of scanned image in pixels. This value is updated to what the last "
-#~ "scanned page was."
-#~ msgstr ""
-#~ "Die Breite des gescannten Fotos in Pixeln. Der Wert wird entsprechend der "
-#~ "zuletzt gescannten Seite übernommen."
-
-#~ msgid ""
-#~ "The height of scanned image in pixels. This value is updated to what the "
-#~ "last scanned page was."
-#~ msgstr ""
-#~ "Die Höhe des gescannten Bilds in Pixel. Der Wert wird entsprechend der "
-#~ "zuletzt gescannten Seite übernommen."
-
-#~ msgid "TRUE if the application window is maximized"
-#~ msgstr "TRUE wenn das Anwendungsfenster maximiert ist"
-
-#~ msgid "The resolution in dots-per-inch of the previously scanned image."
-#~ msgstr ""
-#~ "Die Auflösung in DPI (Punkte pro Zoll) des zuletzt eingescannten Bildes."
-
-#~ msgid "The resolution in dots-per-inch to use when scanning text."
-#~ msgstr "Die für Text zu verwendende Auflösung in DPI (Punkte pro Zoll)"
-
-#~ msgid "The resolution in dots-per-inch to use when scanning photos."
-#~ msgstr "Die für Fotos zu verwendende Auflösung in DPI (Punkte pro Zoll)"
-
-#~ msgid "Width of scanned image in pixels"
-#~ msgstr "Breite des gescannten Bilds in Pixel"
+#. Error display when unable to start scan
+#: src/scanner.vala:1227
+msgid "Unable to start scan"
+msgstr "Scanvorgang konnte nicht gestartet werden"
 
-#, c-format
-#~ msgid ""
-#~ "Help Options:\n"
-#~ "  -d, --debug                     Print debugging messages\n"
-#~ "  -v, --version                   Show release version\n"
-#~ "  -h, --help                      Show help options\n"
-#~ "  --help-all                      Show all help options\n"
-#~ "  --help-gtk                      Show GTK+ options"
-#~ msgstr ""
-#~ "Hilfeoptionen:\n"
-#~ "  -d, --debug                     Zeigt Debug-Nachrichten\n"
-#~ "  -v, --version                   Zeigt Versionsnummer\n"
-#~ "  -h, --help                      Zeigt die Hilfeoptionen\n"
-#~ "  --help-all                      Zeigt alle Hilfeoptionen\n"
-#~ "  --help-gtk                      Zeigt GTK+-Optionen"
+#. Error displayed when communication with scanner broken
+#: src/scanner.vala:1240 src/scanner.vala:1340
+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
+msgid "Show release version"
+msgstr "Versionsinformation anzeigen"
+
+#. Help string for command line --debug flag
+#: src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Fehlerdiagnosemeldungen anzeigen"
+
+#: src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+msgstr ""
+"PDF-Dateien reparieren, die mit einer älteren Version von Simpe Scan "
+"erstellt wurden"
+
+#. Title of error dialog when scan failed
+#: src/simple-scan.vala:392
+msgid "Failed to scan"
+msgstr "Scannen fehlgeschlagen"
+
+#. Attempt to inhibit the screensaver when scanning
+#: src/simple-scan.vala:407
+msgid "Scan in progress"
+msgstr "Scanvorgang läuft"
+
+#. Arguments and description for --help text
+#: src/simple-scan.vala:584
+msgid "[DEVICE…] — Scanning utility"
+msgstr "[GERÄT …] — Scan-Werkzeug"
+
+#. Text printed out when an unknown command-line argument provided
+#: src/simple-scan.vala:595
 #, c-format
-#~ msgid ""
-#~ "Usage:\n"
-#~ "  %s [DEVICE...] - Scanning utility"
-#~ msgstr ""
-#~ "Verwendung:\n"
-#~ "  %s [GERÄT...] - Scanwerkzeug"
-
-#~ msgid "Page side to scan"
-#~ msgstr "Zu scannende Seite des Blattes"
-
-#~ msgid ""
-#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
-#~ msgstr ""
-#~ "Papierhöhe in Zehntelmillimetern (oder 0 für automatische Papiererkennung)"
-
-#~ msgid "Height of paper in tenths of a mm"
-#~ msgstr "Papierhöhe in Zehntelmillimetern"
-
-#~ msgid ""
-#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
-#~ msgstr ""
-#~ "Seitenbreite in Zehntelmillimetern (oder 0 für automatische Papiererkennung)"
-
-#~ msgid "Width of paper in tenths of a mm"
-#~ msgstr "Seitenbreite in Zehntelmillimetern"
-
-#~ msgid ""
-#~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
-#~ msgstr ""
-#~ "Die zu scannende Seite des Papiers. Mögliche Werte sind: »Beide«, "
-#~ "»Vorderseite« und »Rückseite«."
-
-#~ msgid ""
-#~ "Type of document being scanned. 'text' for text documents, 'photo' for "
-#~ "photos. This setting decides on the scan resolution, colors and post-"
-#~ "processing."
-#~ msgstr ""
-#~ "Typ des zu scannenden Dokuments. »text« steht für Textdokumente, »photo« für "
-#~ "Fotos. Die Einstellungen bestimmen die Scan-Auflösung, -Farbe und -"
-#~ "Nachbearbeitung."
-
-#~ msgid ""
-#~ "Type of document being scanned. This setting decides on the scan resolution, "
-#~ "colors and post-processing."
-#~ msgstr ""
-#~ "Typ des zu scannenden Dokuments. Diese Einstellung entscheidet über die "
-#~ "Auflösung, Farben und Nachbearbeitung."
-
-#~ msgid "The page side to scan."
-#~ msgstr "Die zu scannende Seite."
-
-#~ msgid "The direction of the scanner across the scanned page."
-#~ msgstr "Die Richtung des Scanners über die gescannte Seite."
-
-#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
-#~ msgstr "Kontrasteinstellung von -100 bis 100 (0 keine)."
-
-#~ msgid "Contrast of scan"
-#~ msgstr "Kontrast des Scans"
-
-#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
-#~ msgstr "Helligkeitseinstellung von -100 bis 100 (0 keine)."
-
-#~ msgid "Brightness of scan"
-#~ msgstr "Helligkeit des Scans"
-
-#~ msgid "Quality value to use for JPEG compression."
-#~ msgstr "Qualitätswert, der für die JPEG-Komprimierung verwendet werden soll."
-
-#~ msgid "Quality value to use for JPEG compression"
-#~ msgstr "Qualitätswert für die JPEG-Komprimierung"
-
-#~ msgid ""
-#~ "The directory to save files to. Defaults to the documents directory if unset."
-#~ msgstr ""
-#~ "Das Verzeichnis, in dem die Dateien gespeichert werden. Vorgabe ist der "
-#~ "»Dokumente«-Ordner, wenn nichts eingestellt ist."
-
-#~ msgid "Select File _Type"
-#~ msgstr "_Dateityp auswählen"
+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 "
+"Befehlszeilenoptionen zu erhalten."
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..54752ad 100644
--- a/po/el.po
+++ b/po/el.po
@@ -5,513 +5,529 @@
 #
 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"
-"Language-Team: Greek <el@li.org>\n"
+"Project-Id-Version: simple-scan:el\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
+"product=simple-scan&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-09-23 13:09+0000\n"
+"PO-Revision-Date: 2017-10-05 12:19+0300\n"
+"Last-Translator: Tom Tryfonidis <tomtryf@gnome.org>\n"
+"Language-Team: Greek <team@gnome.gr>\n"
+"Language: el\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-25 06:10+0000\n"
+"X-Generator: Poedit 2.0.3\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. Button to submit authorization dialog
-#: data/simple-scan.ui:24
-msgid "_Authorize"
-msgstr "_Εξουσιοδότηση"
+#: data/org.gnome.SimpleScan.gschema.xml:11
+msgid "Device to scan from"
+msgstr "Συσκευή που χρησιμοποιείται για σάρωση"
 
-#. Label beside username entry
-#: data/simple-scan.ui:102
-msgid "_Username for resource:"
-msgstr "Όνομα _χρήστη για πόρο:"
+#: data/org.gnome.SimpleScan.gschema.xml:12
+msgid "SANE device to acquire images from."
+msgstr "Συσκευή SANE που χρησιμοποιείται για την λήψη εικόνων."
 
-#. Label beside password entry
-#: data/simple-scan.ui:117
-msgid "_Password:"
-msgstr "_Κωδικός:"
+#: data/org.gnome.SimpleScan.gschema.xml:20
+msgid "Type of document being scanned"
+msgstr "Ο τύπος του εγγράφου που σαρώνεται"
 
-#. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
-msgid "Front and Back"
-msgstr "Πρόσοψη και πίσω όψη"
+#: data/org.gnome.SimpleScan.gschema.xml:21
+msgid ""
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+msgstr ""
+"Ο τύπος του έγγραφου που σαρώνεται.  Αυτή η ρύθμιση καθορίζει την ανάλυση, "
+"το χρώμα και την μετα-επεξεργασία της σάρωσης."
 
-#. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
-msgid "Front"
-msgstr "Πρόσοψη"
+#: data/org.gnome.SimpleScan.gschema.xml:25
+msgid "Width of paper in tenths of a mm"
+msgstr "Πλάτος του χαρτιού σε δέκατα του χιλιοστού (mm)"
 
-#. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
-msgid "Back"
-msgstr "Πίσω όψη"
+#: data/org.gnome.SimpleScan.gschema.xml:26
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"Πλάτος του χαρτιού σε δέκατα του χιλιοστού (mm) (ή 0 για την αυτόματη "
+"ανίχνευση χαρτιού)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:30
+msgid "Height of paper in tenths of a mm"
+msgstr "Ύψος σελίδας σε δέκατα του χιλιοστού (mm)"
+
+#: data/org.gnome.SimpleScan.gschema.xml:31
+msgid ""
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"Ύψος του χαρτιού σε δέκατα του χιλιοστού (mm) (ή 0 για την αυτόματη "
+"ανίχνευση χαρτιού)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:35
+msgid "Brightness of scan"
+msgstr "Φωτεινότητα σάρωσης"
+
+#: data/org.gnome.SimpleScan.gschema.xml:36
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr "Προσαρμογή της φωτεινότητας από -100 έως 100 (0 χωρίς προσαρμογή)"
+
+#: data/org.gnome.SimpleScan.gschema.xml:40
+msgid "Contrast of scan"
+msgstr "Αντίθεση σάρωσης"
+
+#: data/org.gnome.SimpleScan.gschema.xml:41
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr "Προσαρμογή της αντίθεσης από -100 έως 100 (0 χωρίς προσαρμογή)"
 
+#: data/org.gnome.SimpleScan.gschema.xml:45
+msgid "Resolution for text scans"
+msgstr "Ανάλυση για σάρωση κειμένου"
+
+#: data/org.gnome.SimpleScan.gschema.xml:46
+msgid "The resolution in dots-per-inch to use when scanning text."
+msgstr ""
+"Η ανάλυση σε κουκκίδες ανά ίντσα που θα χρησιμοποιηθεί στην σάρωση κειμένων."
+
+#: data/org.gnome.SimpleScan.gschema.xml:50
+msgid "Resolution for photo scans"
+msgstr "Ανάλυση για σάρωση φωτογραφιών"
+
+#: data/org.gnome.SimpleScan.gschema.xml:51
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr ""
+"Η ανάλυση σε κουκκίδες ανά ίντσα που θα χρησιμοποιηθεί στην σάρωση "
+"φωτογραφιών."
+
+#: data/org.gnome.SimpleScan.gschema.xml:55
+msgid "Page side to scan"
+msgstr "Πλευρά σελίδας για σάρωση"
+
+#: data/org.gnome.SimpleScan.gschema.xml:56
+msgid "The page side to scan."
+msgstr "Η πλευρά της σελίδας για σάρωση."
+
+#: data/org.gnome.SimpleScan.gschema.xml:60
+msgid "Directory to save files to"
+msgstr "Κατάλογος στον οποίο θα αποθηκευτούν τα αρχεία"
+
+#: data/org.gnome.SimpleScan.gschema.xml:61
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+"Ο κατάλογος στον οποίο θα αποθηκευτούν τα αρχεία. Αν δεν ορισθεί, προεπιλογή "
+"είναι ο κατάλογος εγγράφων."
+
+#: data/org.gnome.SimpleScan.gschema.xml:66
+msgid "Quality value to use for JPEG compression"
+msgstr "Τιμή της ποιότητας που θα χρησιμοποιηθεί για τη συμπίεση JPEG"
+
+#: data/org.gnome.SimpleScan.gschema.xml:67
+msgid "Quality value to use for JPEG compression."
+msgstr "Τιμή της ποιότητας που θα χρησιμοποιηθεί για τη συμπίεση JPEG."
+
+#: data/org.gnome.SimpleScan.gschema.xml:72
+msgid "Delay in millisecond between pages"
+msgstr "Καθυστέρηση ανάμεσα στις σελίδες, σε χιλιοστά του δευτερολέπτου"
+
+#: data/org.gnome.SimpleScan.gschema.xml:73
+msgid "Delay in millisecond between pages."
+msgstr "Καθυστέρηση ανάμεσα στις σελίδες, σε χιλιοστά του δευτερολέπτου."
+
+#. Title of scan window
+#. Set HeaderBar title here because Glade doesn't keep it translated
+#. https://bugzilla.gnome.org/show_bug.cgi?id=782753
 #. 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
+#: data/simple-scan.appdata.xml.in:6 data/simple-scan.desktop.in:3
+#: src/app-window.ui:76 src/app-window.vala:1560
 msgid "Simple Scan"
 msgstr "Σάρωση"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
-msgid "_Document"
-msgstr "_Έγγραφο"
+#: data/simple-scan.appdata.xml.in:7 data/simple-scan.desktop.in:5
+msgid "Scan Documents"
+msgstr "Σάρωση εγγράφων"
 
-#. Scan menu item
-#: data/simple-scan.ui:260
-msgid "Sc_an"
-msgstr "_Σάρωση"
+#: 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 "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+"Ένας πραγματικά εύκολος τρόπος σάρωσης εγγράφων και εικόνων. Μπορείτε να "
+"κάνετε περικοπή των κακών κομματιων μιας φωτογραφίας και  να την "
+"περιστρέψετε εφόσον χρειάζεται. Μπορείτε να εκτυπώσετε τις σαρώσεις σας, να "
+"τις εξάγετε ως pdf, ή να τις σώσετε ως αρχειο εικόνας."
+
+#: data/simple-scan.appdata.xml.in:14
+msgid "Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+"Το Simple Scan χρησιμοποιεί το πλαίσιο SANE ώστε να υποστηρίζει τους "
+"περισσότερους σαρωτές."
+
+#: data/simple-scan.desktop.in:4
+msgid "Document Scanner"
+msgstr "Σαρωτής εγγράφων"
 
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: data/simple-scan.desktop.in:7
+msgid "scan;scanner;flatbed;adf;"
+msgstr "scan;scanner;flatbed;adf;σάρωση;σαρωτής;"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: data/simple-scan.desktop.in:10
+msgid "scanner"
+msgstr "scanner"
+
+#. Toolbar scan menu item to scan a single page from the scanner
 #. 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/app-window.ui:22 src/app-window.ui:123 src/app-window.ui:820
 msgid "Single _Page"
 msgstr "Μια_σελίδα"
 
+#. Toolbar scan menu item to scan all pages from a document feeder
 #. 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/app-window.ui:31 src/app-window.ui:133 src/app-window.ui:829
 msgid "All Pages From _Feeder"
 msgstr "Όλες τις σελίδες από την _τροφοδοσία"
 
-#. Menu entry to stop current scan
-#: data/simple-scan.ui:294
-msgid "_Stop Scan"
-msgstr "_Διακοπή σάρωσης"
+#. Toolbar scan menu item to scan continuously from the flatbed
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/app-window.ui:40 src/app-window.ui:143 src/app-window.ui:838
+msgid "_Multiple Pages From Flatbed"
+msgstr "_Πολλαπλές σελίδες από την επιφάνεια σάρωσης"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:853
 msgid "Text"
 msgstr "ΚΕΙΜΕΝΟ"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:863
 msgid "Photo"
 msgstr "Φωτογραφία"
 
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: src/app-window.ui:91
+msgid "_Document"
+msgstr "_Έγγραφο"
+
+#. Scan menu item
+#: src/app-window.ui:110
+msgid "Sc_an"
+msgstr "_Σάρωση"
+
+#. Menu entry to stop current scan
+#: src/app-window.ui:154
+msgid "_Stop Scan"
+msgstr "_Διακοπή σάρωσης"
+
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/app-window.ui:196 src/app-window.vala:967 src/app-window.vala:1590
 msgid "Reorder Pages"
 msgstr "Επαναδιάταξη σελίδων"
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/app-window.ui:215
 msgid "_Email"
-msgstr "_Email"
+msgstr "Ηλ. _αλληλογγραφία"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/app-window.ui:280
 msgid "_Page"
 msgstr "_Σελίδα"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/app-window.ui:290
 msgid "Rotate _Left"
 msgstr "Περιστροφή _αριστερά"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/app-window.ui:300
 msgid "Rotate _Right"
 msgstr "Περιστροφή _δεξιά"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/app-window.ui:310
 msgid "_Crop"
 msgstr "_Περικοπή"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/app-window.ui:320
 msgid "_None"
 msgstr "_Κανένα"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/app-window.ui:331
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/app-window.ui:342
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/app-window.ui:353
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/app-window.ui:364
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/app-window.ui:375
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/app-window.ui:386
 msgid "4×6"
 msgstr "4×6 ίντσες"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/app-window.ui:397
 msgid "_Custom"
 msgstr "_Προσαρμοσμένο"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/app-window.ui:415
 msgid "_Rotate Crop"
 msgstr "_Περιστροφή περικοπής"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/app-window.ui:428
 msgid "Move Left"
 msgstr "Μετακίνηση αριστερά"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/app-window.ui:437
 msgid "Move Right"
 msgstr "Μετακίνηση δεξιά"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/app-window.ui:474
 msgid "_Help"
 msgstr "_Βοήθεια"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/app-window.ui:482
 msgid "_Contents"
 msgstr "_Περιεχόμενα"
 
-#. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
-msgid "Start a new document"
-msgstr "Δημιουργία νέου εγγράφου"
-
-#: data/simple-scan.ui:675
-msgid "New"
-msgstr "Νέο"
-
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/app-window.ui:520 src/app-window.ui:720
 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/app-window.ui:522 src/app-window.ui:716
 msgid "Scan"
 msgstr "Σάρωση"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/app-window.ui:538 src/app-window.ui:787
 msgid "Save document to a file"
 msgstr "Αποθήκευση εγγράφου σε αρχείο"
 
-#: ../src/ui.vala:1842
+#: src/app-window.ui:540
 msgid "Save"
 msgstr "Αποθήκευση"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/app-window.ui:555 src/app-window.ui:700
 msgid "Stop the current scan"
 msgstr "Διακοπή τρέχουσας σάρωσης"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/app-window.ui:556 src/app-window.ui:697
 msgid "Stop"
 msgstr "Διακοπή"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "Περιστροφή της σελίδας αριστερά"
-
-#. Label on rotate page left (anti-clockwise) item
-#: data/simple-scan.ui:750
-msgid "Rotate Left"
-msgstr "Περιστροφή αριστερά"
-
-#. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
-msgid "Rotate the page to the right (clockwise)"
-msgstr "Περιστροφή της σελίδας δεξιά"
-
-#. Label on rotate page right (clockwise) item
-#: data/simple-scan.ui:765
-msgid "Rotate Right"
-msgstr "Περιστροφή δεξιά"
-
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
-msgid "Crop the selected page"
-msgstr "Περικοπή της επιλεγμένης σελίδας"
-
-#: data/simple-scan.ui:781
-msgid "Crop"
-msgstr "Περικοπή"
-
-#: ../src/ui.vala:1849
-msgid "Preferences"
-msgstr "Προτιμήσεις"
+#. Label shown when searching for scanners
+#: src/app-window.ui:611
+msgid "Searching for Scanners…"
+msgstr "Αναζήτηση για σαρωτές…"
 
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1048
-msgid "Scan S_ource:"
-msgstr "_Πηγή σάρωσης:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1079
-msgid "_Text Resolution:"
-msgstr "Ανάλυση _κειμένου:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1095
-msgid "_Photo Resolution:"
-msgstr "Ανάλυση _φωτογραφίας:"
-
-#. Label beside scan side combo box
-#: data/simple-scan.ui:1139
-msgid "Scan Side:"
-msgstr "Πλευρά σάρωσης"
-
-#. Label beside page size combo box
-#: data/simple-scan.ui:1169
-msgid "Page Size:"
-msgstr "Μέγεθος σελίδας:"
-
-#. Label beside brightness scale
-#: data/simple-scan.ui:1199
-msgid "Brightness:"
-msgstr "Φωτεινότητα:"
-
-#. Label beside contrast scale
-#: data/simple-scan.ui:1229
-msgid "Contrast:"
-msgstr "Αντίθεση:"
-
-#. Label beside quality scale
-#: data/simple-scan.ui:1260
-msgid "Quality:"
-msgstr "Ποιότητα:"
-
-#: data/simple-scan.desktop.in:4
-msgid "Document Scanner"
-msgstr "Σαρωτής εγγράφων"
-
-#: data/simple-scan.desktop.in:5
-msgid "Scan Documents"
-msgstr "Σάρωση εγγράφων"
+#: src/app-window.vala:237 src/app-window.vala:1380
+msgid "_Close"
+msgstr "_Κλείσιμο"
 
-#: data/simple-scan.desktop.in:6
-msgid "scan;scanner;flatbed;adf;"
-msgstr ""
+#. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
+#: src/app-window.vala:246
+#, c-format
+msgid "Username and password required to access “%s”"
+msgstr "Απαιτείται όνομα χρήστη και κωδικός για την πρόσβαση στο «%s»"
 
-#: data/simple-scan.desktop.in:8
-msgid "scanner"
-msgstr ""
+#. Label shown when detected a scanner
+#: src/app-window.vala:266 src/app-window.vala:584
+msgid "Ready to Scan"
+msgstr "Έτοιμο για σάρωση"
 
-#: data/simple-scan.appdata.xml.in:8
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: src/app-window.vala:273
+msgid "Additional software needed"
+msgstr "Απαιτείται επιπρόσθετο λογισμικό"
 
-#: data/simple-scan.appdata.xml.in:13
+#. Instructions to install driver software
+#: src/app-window.vala:275
 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
-msgid "No scanners available.  Please connect a scanner."
-msgstr "Δεν υπάρχουν διαθέσιμοι σαρωτές. Παρακαλούμε συνδέστε ένα σαρωτή."
-
-#. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
-msgid "Unable to connect to scanner"
-msgstr "Αδύνατη η σύνδεση με τον σαρωτή"
-
-#. Error display when unable to start scan
-#: ../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
-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 "Εμφάνιση μηνυμάτων εντοπισμού σφαλμάτων"
-
-#: ../src/simple-scan.vala:26
-msgid "Fix PDF files generated with older versions of Simple Scan"
+"You need to <a href=\"install-firmware\">install driver software</a> for "
+"your scanner."
 msgstr ""
-"Διόρθωση αρχείων PDF που δημιουργήθηκαν με παλαιότερες εκδόσεις του "
-"λογισμικού Simple Scan"
-
-#. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:391
-msgid "Failed to scan"
-msgstr "Η σάρωση απέτυχε"
-
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
-msgid "[DEVICE...] - Scanning utility"
-msgstr "[ΣΥΣΚΕΥΗ…] - Εφαρμογή σάρωσης"
-
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
-#, c-format
-msgid "Run '%s --help' to see a full list of available command line options."
-msgstr ""
-"Εκτελέστε «%s --help» για να δείτε την πλήρη λίστα των διαθέσιμων επιλογών "
-"εντολής γραμμής."
-
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
-msgid "_Close"
-msgstr "_Κλείσιμο"
-
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
-#, c-format
-msgid "Username and password required to access '%s'"
-msgstr "Απαιτείται όνομα χρήστη και κωδικός για την πρόσβαση στο '%s'"
+"Χρειάζεται να <a href=\"install-firmware\">εγκαταστήσετε οδηγό υλικού</a> "
+"για τον σαρωτή σας."
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/app-window.vala:281
 msgid "No scanners detected"
 msgstr "Δεν ανιχνεύθηκαν σαρωτές"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/app-window.vala:283
 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
-msgid "Additional software needed"
-msgstr ""
-
-#. Instructions to install driver software
-#: ../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
-msgid "Save As..."
-msgstr "Αποθήκευση ως..."
+#: src/app-window.vala:298
+msgid "Save As…"
+msgstr "Αποθήκευση ως…"
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/app-window.vala:301 src/app-window.vala:471 src/app-window.vala:552
 msgid "_Cancel"
 msgstr "_Ακύρωση"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/app-window.vala:302 src/app-window.vala:553
 msgid "_Save"
 msgstr "Απο_θήκευση"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/app-window.vala:310
 msgid "Scanned Document.pdf"
 msgstr "Σαρωμένο.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#. Save dialog: Filter name to show only supported image files
+#: src/app-window.vala:316
 msgid "Image Files"
 msgstr "Αρχεία εικόνων"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/app-window.vala:326
 msgid "All Files"
 msgstr "Όλα τα αρχεία"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/app-window.vala:335
 msgid "PDF (multi-page document)"
 msgstr "PDF (έγγραφο πολλαπλών σελίδων)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/app-window.vala:341
 msgid "JPEG (compressed)"
 msgstr "JPEG (συμπιεσμένο)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/app-window.vala:347
 msgid "PNG (lossless)"
 msgstr "PNG (δίχως συμπίεση)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#. Save dialog: Label for sabing in WEBP format
+#: src/app-window.vala:354
+msgid "WebP (compressed)"
+msgstr "WebP (συμπιεσμένο)"
+
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
+#: src/app-window.vala:364
 msgid "File format:"
-msgstr ""
+msgstr "Τύπος αρχείου:"
+
+#. Label in save dialog beside compression slider
+#: src/app-window.vala:376
+msgid "Compression:"
+msgstr "Συμπίεση:"
+
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/app-window.vala:470
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr "Υπάρχει ήδη αρχείο με το όνομα «%s». Θέλετε να αντικατασταθεί;"
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/app-window.vala:473
+msgid "_Replace"
+msgstr "_Αντικατάσταση"
+
+#: src/app-window.vala:512
+msgid "Saving"
+msgstr "Γίνεται αποθήκευση…"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/app-window.vala:527
 msgid "Failed to save file"
 msgstr "Αποτυχία αποθήκευσης του αρχείου"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
-msgid "If you don't save, changes will be permanently lost."
+#: src/app-window.vala:550
+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/app-window.vala:591
 msgid "Save current document?"
 msgstr "Αποθήκευση του τρέχοντος εγγράφου;"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/app-window.vala:593
 msgid "Discard Changes"
 msgstr "Απόρριψη αλλαγών"
 
+#. Label shown when scan started
+#: src/app-window.vala:692
+msgid "Contacting scanner…"
+msgstr "Αναζήτηση σαρωτή…"
+
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/app-window.vala:800
 msgid "Unable to save image for preview"
 msgstr "Αδυναμία αποθήκευσης σελίδας για προεπισκόπηση"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/app-window.vala:812
 msgid "Unable to open image preview application"
 msgstr "Αδύνατο το άνοιγμα της εφαρμογής προβολής εικόνων"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/app-window.vala:990
 msgid "Combine sides"
-msgstr ""
+msgstr "Συνδυασμός πλευρών"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/app-window.vala:1000
 msgid "Combine sides (reverse)"
-msgstr ""
+msgstr "Συνδυασμός πλευρών (αντιστροφή)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/app-window.vala:1010
 msgid "Reverse"
-msgstr ""
+msgstr "Αντιστροφή"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/app-window.vala:1020
 msgid "Keep unchanged"
 msgstr "Διατήρηση αμετάβλητων"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/app-window.vala:1250
 msgid "Unable to open help file"
 msgstr "Αδύνατο το άνοιγμα του αρχείου βοήθειας"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/app-window.vala:1271
 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 +559,16 @@ msgstr ""
 "εδώ: <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/app-window.vala:1274
 msgid "About Simple Scan"
 msgstr "Περί Σάρωσης"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/app-window.vala:1277
 msgid "Simple document scanning tool"
 msgstr "Απλό εργαλείο σάρωσης εγγράφων"
 
-#: ../src/ui.vala:1487
+#: src/app-window.vala:1286
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -573,192 +589,509 @@ msgstr ""
 "  trix https://launchpad.net/~panelc"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/app-window.vala:1308
 msgid "Save document before quitting?"
 msgstr "Αποθήκευση του εγγράφου πριν την έξοδο;"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:1310
 msgid "Quit without Saving"
-msgstr "Έξοδος χωρίς Αποθήκευση"
+msgstr "Έξοδος χωρίς αποθήκευση"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/app-window.vala:1357
 msgid "You appear to have a Brother scanner."
-msgstr ""
+msgstr "Φαίνεται να έχετε έναν σαρωτή Brother"
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/app-window.vala:1359
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.brother.com\">Brother website</a>."
+"Drivers for this are available on the <a href=\"http://support.brother.com"
+"\">Brother website</a>."
 msgstr ""
+"Οι οδηγοί για αυτόν είναι διαθέσιμοι στον <a href=\"http://support.brother."
+"com\">ιστότοπο της Brother</a>."
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/app-window.vala:1363
 msgid "You appear to have a Samsung scanner."
-msgstr ""
+msgstr "Φαίνεται να έχετε έναν σαρωτή Samsung."
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/app-window.vala:1365
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://samsung.com/support\">Samsung website</a>."
+"Drivers for this are available on the <a href=\"http://samsung.com/support"
+"\">Samsung website</a>."
 msgstr ""
+"Οι οδηγοί για αυτόν είναι διαθέσιμοι στον <a href=\"http://samsung.com/"
+"support\">ιστότοπο της Samsung </a>."
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/app-window.vala:1369
 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/app-window.vala:1374
 msgid "You appear to have an Epson scanner."
-msgstr ""
+msgstr "Φαίνεται να έχετε έναν σαρωτή Epson."
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/app-window.vala:1376
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.epson.com\">Epson website</a>."
+"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/app-window.vala:1380
 msgid "Install drivers"
-msgstr ""
+msgstr "Εγκατάσταση οδηγών"
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/app-window.vala:1411
 msgid "Once installed you will need to restart Simple Scan."
-msgstr ""
+msgstr "Όταν εγκατασταθούν θα πρέπει να γίνει επανεκκίνηση του Simple Scan."
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
-msgid "Installing drivers..."
-msgstr ""
+#: src/app-window.vala:1423
+msgid "Installing drivers…"
+msgstr "Εγκαθίστανται οι οδηγοί…"
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/app-window.vala:1431
 msgid "Drivers installed successfully!"
-msgstr ""
+msgstr "Οι οδηγοί εγκαταστάθηκαν επιτυχώς!"
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/app-window.vala:1441
 #, 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/app-window.vala:1447
 msgid "Failed to install drivers."
-msgstr ""
+msgstr "Αποτυχία εγκατάστασης οδηγών."
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/app-window.vala:1454
 #, c-format
-msgid "You need to install the %s package(s)."
-msgstr ""
+msgid "You need to install the %s package."
+msgid_plural "You need to install the %s packages."
+msgstr[0] "Χρειάζεται να εγκαταστήσετε το %s πακέτο."
+msgstr[1] "Χρειάζεται να εγκαταστήσετε τα %s πακέτα."
+
+#. Title of preferences dialog
+#: src/app-window.vala:1568 src/app-window.vala:1591
+#: src/preferences-dialog.ui:53
+msgid "Preferences"
+msgstr "Προτιμήσεις"
+
+#: src/app-window.vala:1572
+msgid "Keyboard Shortcuts"
+msgstr "Συντομεύσεις πληκτρολογίου"
+
+#: src/app-window.vala:1573
+msgid "Help"
+msgstr "Βοήθεια"
+
+#: src/app-window.vala:1574
+msgid "About"
+msgstr "Περί"
+
+#: src/app-window.vala:1575
+msgid "Quit"
+msgstr "'Εξοδος"
+
+#: src/app-window.vala:1589
+msgid "Email"
+msgstr "Ηλεκτρονική αλληλογραφία"
+
+#. Populate ActionBar (not supported in Glade)
+#. https://bugzilla.gnome.org/show_bug.cgi?id=769966
+#. Label on new document button
+#: src/app-window.vala:1599
+msgid "Start Again…"
+msgstr "Εκκίνηση πάλι…"
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: src/app-window.vala:1616
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Περιστροφή της σελίδας αριστερά"
+
+#. Tooltip for rotate right (clockwise) button
+#: src/app-window.vala:1623
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Περιστροφή της σελίδας δεξιά"
+
+#. Tooltip for crop button
+#: src/app-window.vala:1633
+msgid "Crop the selected page"
+msgstr "Περικοπή της επιλεγμένης σελίδας"
+
+#. Tooltip for delete button
+#: src/app-window.vala:1649
+msgid "Delete the selected page"
+msgstr "Διαγραφή της επιλεγμένης σελίδας"
+
+#. Text of button for cancelling save
+#: src/app-window.vala:1814
+msgid "Cancel"
+msgstr "Ακύρωση"
+
+#. Button to submit authorization dialog
+#: src/authorize-dialog.ui:25
+msgid "_Authorize"
+msgstr "_Εξουσιοδότηση"
+
+#. Label beside username entry
+#: src/authorize-dialog.ui:99
+msgid "_Username for resource:"
+msgstr "Όνομα _χρήστη για πόρο:"
+
+#. Label beside password entry
+#: src/authorize-dialog.ui:112
+msgid "_Password:"
+msgstr "_Κωδικός:"
+
+#: src/book.vala:331 src/book.vala:337
+#, c-format
+msgid "Unable to encode page %i"
+msgstr "Αδύνατη η κωδικοποίηση της σελίδας %i"
+
+#: src/help-overlay.ui:12
+msgctxt "shortcut window"
+msgid "Scanning"
+msgstr "Γίνεται σάρωση"
+
+#: src/help-overlay.ui:17
+msgctxt "shortcut window"
+msgid "Scan a single page"
+msgstr "Σάρωση μίας σελίδας "
+
+#: src/help-overlay.ui:24
+msgctxt "shortcut window"
+msgid "Scan all pages from document feeder"
+msgstr "Σάρωση όλων των σελίδων από την τροφοδοσία εγγράφων"
+
+#: src/help-overlay.ui:31
+msgctxt "shortcut window"
+msgid "Scan continuously from a flatbed scanner"
+msgstr "Σάρωση συνεχώς από έναν σαρωτή επίπεδης επιφάνειας"
+
+#: src/help-overlay.ui:38
+msgctxt "shortcut window"
+msgid "Stop scan in progress"
+msgstr "Διακοπή σάρωσης σε πρόοδο"
+
+#: src/help-overlay.ui:46
+msgctxt "shortcut window"
+msgid "Document Modification"
+msgstr "τροποποίηση εγγράφων"
+
+#: src/help-overlay.ui:51
+msgctxt "shortcut window"
+msgid "Move page left"
+msgstr "Μετακίνηση σελίδας αριστερά"
+
+#: src/help-overlay.ui:58
+msgctxt "shortcut window"
+msgid "Move page right"
+msgstr "Μετακίνηση σελίδας δεξιά"
+
+#: src/help-overlay.ui:65
+msgctxt "shortcut window"
+msgid "Rotate page to the left (anti-clockwise)"
+msgstr "Περιστροφή της σελίδας αριστερά (ανάποδα από τη φορά του ρολογιού)"
+
+#: src/help-overlay.ui:72
+msgctxt "shortcut window"
+msgid "Rotate page to the right (clockwise)"
+msgstr "Περιστροφή της σελίδας δεξιά (φορά του ρολογιού)"
+
+#: src/help-overlay.ui:79
+msgctxt "shortcut window"
+msgid "Delete page"
+msgstr "Διαγραφή σελίδας"
+
+#: src/help-overlay.ui:87
+msgctxt "shortcut window"
+msgid "Document Management"
+msgstr "Διαχείριση εγγράφων"
+
+#: src/help-overlay.ui:92
+msgctxt "shortcut window"
+msgid "Start new document"
+msgstr "Δημιουργία νέου εγγράφου"
+
+#: src/help-overlay.ui:99
+msgctxt "shortcut window"
+msgid "Save scanned document"
+msgstr "Αποθήκευση σαρωμένου εγγράφου"
+
+#: src/help-overlay.ui:106
+msgctxt "shortcut window"
+msgid "Email scanned document"
+msgstr "Αποστολή σαρωμένου εγγράφου με ηλ. αλληλογραφία"
+
+#: src/help-overlay.ui:113
+msgctxt "shortcut window"
+msgid "Print scanned document"
+msgstr "Εκτύπωση σαρωμένου εγγράφου"
+
+#: src/help-overlay.ui:120
+msgctxt "shortcut window"
+msgid "Copy current page to clipboard"
+msgstr "Αντιγραφή της τρέχουσας σελίδας στο παρασκήνιο"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:113
+msgid "_Scanner"
+msgstr "_Σαρωτής"
+
+#. Label beside scan side combo box
+#: src/preferences-dialog.ui:143
+msgid "Scan Sides"
+msgstr "Πλευρές σάρωσης"
+
+#. Label beside page size combo box
+#: src/preferences-dialog.ui:160
+msgid "Page Size"
+msgstr "Μέγεθος σελίδας"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:191
+msgid "Front"
+msgstr "Πρόσοψη"
+
+#. Preferences Dialog: Toggle button to select scanning on the back side of a page
+#: src/preferences-dialog.ui:206
+msgid "Back"
+msgstr "Πίσω όψη"
+
+#. Preferences Dialog: Toggle button to select scanning on both sides of a page
+#: src/preferences-dialog.ui:221
+msgid "Both"
+msgstr "Μπρος - πίσω"
+
+#. Label beside page delay scale
+#: src/preferences-dialog.ui:260
+msgid "Delay"
+msgstr "Καθυστέρηση"
+
+#. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
+#: src/preferences-dialog.ui:276
+msgid "Multiple pages from flatbed"
+msgstr "Πολλαπλές σελίδες από την επιφάνεια σάρωσης"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:295
+msgid "3"
+msgstr "3"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:310
+msgid "5"
+msgstr "5"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:326
+msgid "7"
+msgstr "7"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:342
+msgid "10"
+msgstr "10"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:358
+msgid "15"
+msgstr "15"
+
+#. Label after page delay radio buttons
+#: src/preferences-dialog.ui:385
+msgid "Seconds"
+msgstr "Δευτερόλεπτα"
+
+#. Preferences Dialog: Tab label for scanning settings
+#: src/preferences-dialog.ui:413
+msgid "Scanning"
+msgstr "Σάρωση"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:436
+msgid "_Text Resolution"
+msgstr "Ανάλυση _κειμένου"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:452
+msgid "_Photo Resolution"
+msgstr "Ανάλυση _φωτογραφίας"
+
+#. Label beside brightness scale
+#: src/preferences-dialog.ui:505
+msgid "Brightness"
+msgstr "Φωτεινότητα"
+
+#. Label beside contrast scale
+#: src/preferences-dialog.ui:521
+msgid "Contrast"
+msgstr "Αντίθεση"
+
+#. Preferences Dialog: Tab for quality settings
+#: src/preferences-dialog.ui:576
+msgid "Quality"
+msgstr "Ποιότητα"
+
+#. Combo box value for automatic paper size
+#: src/preferences-dialog.vala:77
+msgid "Automatic"
+msgstr "Αυτόματο"
+
+#: src/preferences-dialog.vala:116
+msgid "Darker"
+msgstr "Σκοτεινότερο"
+
+#: src/preferences-dialog.vala:118
+msgid "Lighter"
+msgstr "Φωτεινότερο"
+
+#: src/preferences-dialog.vala:126
+msgid "Less"
+msgstr "Λιγότερο"
+
+#: src/preferences-dialog.vala:128
+msgid "More"
+msgstr "Περισσότερο"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/preferences-dialog.vala:440
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (προεπιλογή)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/preferences-dialog.vala:443
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (πρόχειρο)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/preferences-dialog.vala:446
 #, 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/preferences-dialog.vala:449
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1835
-msgid "New Document"
-msgstr "Νέο έγγραφο"
+#. Error displayed when no scanners to scan with
+#: src/scanner.vala:844
+msgid "No scanners available.  Please connect a scanner."
+msgstr "Δεν υπάρχουν διαθέσιμοι σαρωτές. Παρακαλούμε συνδέστε ένα σαρωτή."
 
-#: ../src/ui.vala:1840
-msgid "Document"
-msgstr "Έγγραφο"
+#. Error displayed when cannot connect to scanner
+#: src/scanner.vala:874
+msgid "Unable to connect to scanner"
+msgstr "Αδύνατη η σύνδεση με τον σαρωτή"
 
-#: ../src/ui.vala:1844
-msgid "Email..."
-msgstr "Ηλεκτρονική αλληλογραφία..."
+#. Error display when unable to start scan
+#: src/scanner.vala:1227
+msgid "Unable to start scan"
+msgstr "Αδύνατη η εκκίνηση της σάρωσης"
 
-#: ../src/ui.vala:1845
-msgid "Print..."
-msgstr "Εκτύπωση..."
+#. Error displayed when communication with scanner broken
+#: src/scanner.vala:1240 src/scanner.vala:1340
+msgid "Error communicating with scanner"
+msgstr "Σφάλμα κατά την επικοινωνία με τον σαρωτή"
 
-#: ../src/ui.vala:1853
-msgid "Help"
-msgstr "Βοήθεια"
+#. Help string for command line --version flag
+#: src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "Προβολή αριθμού έκδοσης"
 
-#: ../src/ui.vala:1854
-msgid "About"
-msgstr "Περί"
+#. Help string for command line --debug flag
+#: src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Εμφάνιση μηνυμάτων εντοπισμού σφαλμάτων"
 
-#: ../src/ui.vala:1855
-msgid "Quit"
-msgstr "'Εξοδος"
+#: 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:392
+msgid "Failed to scan"
+msgstr "Η σάρωση απέτυχε"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
-msgid "Change _Scanner"
-msgstr "Αλλαγή _σαρωτή"
+#. Attempt to inhibit the screensaver when scanning
+#: src/simple-scan.vala:407
+msgid "Scan in progress"
+msgstr "Γίνεται σάρωση"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
-msgid "_Install Drivers"
+#. Arguments and description for --help text
+#: src/simple-scan.vala:584
+msgid "[DEVICE…] — Scanning utility"
+msgstr "[ΣΥΣΚΕΥΗ…] — Εργαλείο σάρωσης"
+
+#. Text printed out when an unknown command-line argument provided
+#: src/simple-scan.vala:595
+#, c-format
+msgid "Run “%s --help” to see a full list of available command line options."
 msgstr ""
+"Εκτελέστε «%s --help» για να δείτε την πλήρη λίστα των διαθέσιμων επιλογών "
+"της γραμμής εντολών."
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
-msgid "Automatic"
-msgstr "Αυτόματο"
+#~ msgid "Front and Back"
+#~ msgstr "Πρόσοψη και πίσω όψη"
 
-#: ../src/ui.vala:1947
-msgid "Darker"
-msgstr "Σκοτεινότερο"
+#~ msgid "New"
+#~ msgstr "Νέο"
 
-#: ../src/ui.vala:1949
-msgid "Lighter"
-msgstr "Φωτεινότερο"
+#~ msgid "Rotate Left"
+#~ msgstr "Περιστροφή αριστερά"
 
-#: ../src/ui.vala:1957
-msgid "Less"
-msgstr "Λιγότερο"
+#~ msgid "Rotate Right"
+#~ msgstr "Περιστροφή δεξιά"
 
-#: ../src/ui.vala:1959
-msgid "More"
-msgstr "Περισσότερο"
+#~ msgid "Crop"
+#~ msgstr "Περικοπή"
 
-#: ../src/ui.vala:1967
-msgid "Minimum"
-msgstr "Ελάχιστο"
+#~ msgid "Scan S_ource:"
+#~ msgstr "_Πηγή σάρωσης:"
 
-#: ../src/ui.vala:1969
-msgid "Maximum"
-msgstr "Μέγιστο"
+#~ msgid "New Document"
+#~ msgstr "Νέο έγγραφο"
 
-#: ../src/ui.vala:2008
-msgid "Saving document..."
-msgstr "Αποθήκευση εγγράφου..."
+#~ msgid "Document"
+#~ msgstr "Έγγραφο"
 
-#: ../src/ui.vala:2173
-#, c-format
-msgid "Saving page %d out of %d"
-msgstr "Αποθήκευση σελίδας %d από %d"
+#~ msgid "Email..."
+#~ msgstr "Ηλεκτρονική αλληλογραφία..."
+
+#~ msgid "Print..."
+#~ msgstr "Εκτύπωση..."
+
+#~ msgid "Minimum"
+#~ msgstr "Ελάχιστο"
+
+#~ msgid "Maximum"
+#~ msgstr "Μέγιστο"
+
+#~ msgid "Saving document..."
+#~ msgstr "Αποθήκευση εγγράφου..."
+
+#~ msgid "Saving page %d out of %d"
+#~ msgstr "Αποθήκευση σελίδας %d από %d"
 
 #~ msgid "4&#xD7;6"
 #~ msgstr "4&#xD7;6"
@@ -772,52 +1105,34 @@ msgstr "Αποθήκευση σελίδας %d από %d"
 #~ msgid "Direction of scan"
 #~ msgstr "Κατεύθυνση σάρωσης"
 
-#~ msgid "Resolution for text scans"
-#~ msgstr "Ανάλυση για σάρωση κειμένου"
-
-#~ msgid "Resolution for photo scans"
-#~ msgstr "Ανάλυση για σάρωση φωτογραφιών"
-
 #~ msgid "Resolution of last scanned image"
 #~ msgstr "Ανάλυση τελευταίας σαρωμένης εικόνας"
 
-#~ msgid "Type of document being scanned"
-#~ msgstr "Ο τύπος του εγγράφου που σαρώνεται"
-
 #~ msgid ""
 #~ "Type of document being scanned. 'text' for text documents, 'photo' for "
 #~ "photos. This setting decides on the scan resolution, colors and post-"
 #~ "processing."
 #~ msgstr ""
-#~ "Ο τύπος του εγγράφου που σαρώνεται. 'text' για έγγραφα κειμένου, 'photo' για "
-#~ "φωτογραφίες. Αυτή η ρύθμιση καθορίζει την ανάλυση σάρωσης, τα χρώματα και τη "
-#~ "μετέπειτα επεξεργασία."
+#~ "Ο τύπος του εγγράφου που σαρώνεται. 'text' για έγγραφα κειμένου, 'photo' "
+#~ "για φωτογραφίες. Αυτή η ρύθμιση καθορίζει την ανάλυση σάρωσης, τα χρώματα "
+#~ "και τη μετέπειτα επεξεργασία."
 
 #~ msgid "Window height in pixels"
 #~ msgstr "Ύψος παραθύρου σε εικονοστοιχεία"
 
 #~ msgid ""
-#~ "The width of scanned image in pixels. This value is updated to what the last "
-#~ "scanned page was."
+#~ "The width of scanned image in pixels. This value is updated to what the "
+#~ "last scanned page was."
 #~ msgstr ""
-#~ "Το πλάτος της σαρωμένης εικόνας σε εικονοστοιχεία. Η τιμή αυτή ενημερώνεται "
-#~ "με το πλάτος της τελευταίας σαρωμένης σελίδας."
+#~ "Το πλάτος της σαρωμένης εικόνας σε εικονοστοιχεία. Η τιμή αυτή "
+#~ "ενημερώνεται με το πλάτος της τελευταίας σαρωμένης σελίδας."
 
 #~ msgid ""
 #~ "The height of scanned image in pixels. This value is updated to what the "
 #~ "last scanned page was."
 #~ msgstr ""
-#~ "Το ύψος της σαρωμένης εικόνας σε εικονοστοιχεία. Η τιμή αυτή ενημερώνεται με "
-#~ "το ύψος της τελευταίας σαρωμένης σελίδας."
-
-#~ msgid "The resolution in dots-per-inch to use when scanning text."
-#~ msgstr ""
-#~ "Η ανάλυση σε κουκκίδες ανά ίντσα που θα χρησιμοποιηθεί στην σάρωση κειμένων."
-
-#~ msgid "The resolution in dots-per-inch to use when scanning photos."
-#~ msgstr ""
-#~ "Η ανάλυση σε κουκκίδες ανά ίντσα που θα χρησιμοποιηθεί στην σάρωση "
-#~ "φωτογραφιών."
+#~ "Το ύψος της σαρωμένης εικόνας σε εικονοστοιχεία. Η τιμή αυτή ενημερώνεται "
+#~ "με το ύψος της τελευταίας σαρωμένης σελίδας."
 
 #~ msgid "Width of scanned image in pixels"
 #~ msgstr "Πλάτος της σαρωμένης εικόνας σε εικονοστοιχεία"
@@ -825,7 +1140,6 @@ msgstr "Αποθήκευση σελίδας %d από %d"
 #~ msgid "Window width in pixels"
 #~ msgstr "Πλάτος παραθύρου σε εικονοστοιχεία"
 
-#, c-format
 #~ msgid ""
 #~ "Usage:\n"
 #~ "  %s [DEVICE...] - Scanning utility"
@@ -833,7 +1147,6 @@ msgstr "Αποθήκευση σελίδας %d από %d"
 #~ "Χρήση:\n"
 #~ "  %s [ΣΥΣΚΕΥΗ...] - Εφαρμογή σάρωσης"
 
-#, c-format
 #~ msgid ""
 #~ "Help Options:\n"
 #~ "  -d, --debug                     Print debugging messages\n"
@@ -859,24 +1172,19 @@ msgstr "Αποθήκευση σελίδας %d από %d"
 #~ msgstr "Παρακαλούμε ελέγξτε την εγκατάσταση σας"
 
 #~ msgid ""
-#~ "The direction of the scanner across the scanned page. It can be one of the "
-#~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+#~ "The direction of the scanner across the scanned page. It can be one of "
+#~ "the following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-"
+#~ "left'"
 #~ msgstr ""
 #~ "Η κατεύθυνση του σαρωτή κατά μήκος της σαρωμένης σελίδας. Μπορεί να είναι "
-#~ "κάποιο από τα εξής: 'top-to-bottom' (από πάνω προς τα κάτω) 'bottom-to-top' "
-#~ "(από κάτω προς τα πάνω) 'left-to-right' (από αριστερά προς δεξιά) 'right-to-"
-#~ "left' (από δεξιά προς αριστερά)"
-
-#~ msgid "SANE device to acquire images from."
-#~ msgstr "Συσκευή SANE που χρησιμοποιείται για την λήψη εικόνων."
-
-#~ msgid "Device to scan from"
-#~ msgstr "Συσκευή που χρησιμοποιείται για σάρωση"
+#~ "κάποιο από τα εξής: 'top-to-bottom' (από πάνω προς τα κάτω) 'bottom-to-"
+#~ "top' (από κάτω προς τα πάνω) 'left-to-right' (από αριστερά προς δεξιά) "
+#~ "'right-to-left' (από δεξιά προς αριστερά)"
 
 #~ msgid "The resolution in dots-per-inch of the previously scanned image."
-#~ msgstr "Η ανάλυση σε κουκκίδες ανά ίντσα της προηγούμενης σαρωμένης εικόνας."
+#~ msgstr ""
+#~ "Η ανάλυση σε κουκκίδες ανά ίντσα της προηγούμενης σαρωμένης εικόνας."
 
-#, c-format
 #~ msgid ""
 #~ "GTK+ Options:\n"
 #~ "  --class=CLASS                   Program class as used by the window "
@@ -889,77 +1197,15 @@ msgstr "Αποθήκευση σελίδας %d από %d"
 #~ "  --g-fatal-warnings              Make all warnings fatal"
 #~ msgstr ""
 #~ "Επιλογές GTK+:\n"
-#~ "  --class=CLASS                   Κλάση προγράμματος χρησιμοποιούμενη από το "
-#~ "διαχειριστή παραθύρων\n"
-#~ "  --name=NAME                     Όνομα προγράμματος χρησιμοποιούμενο από το "
-#~ "διαχειριστή παραθύρων\n"
+#~ "  --class=CLASS                   Κλάση προγράμματος χρησιμοποιούμενη από "
+#~ "το διαχειριστή παραθύρων\n"
+#~ "  --name=NAME                     Όνομα προγράμματος χρησιμοποιούμενο από "
+#~ "το διαχειριστή παραθύρων\n"
 #~ "  --screen=SCREEN                 Οθόνη X προς χρήση\n"
 #~ "  --sync                          Να είναι σύγχρονες οι κλήσεις στο X\n"
 #~ "  --gtk-module=MODULES            Φόρτωση πρόσθετων αρθρωμάτων GTK+\n"
-#~ "  --g-fatal-warnings              Να είναι όλες οι προειδοποιήσεις μοιραίες"
-
-#~ msgid "Scanned Document"
-#~ msgstr "Σαρωμένο"
-
-#~ msgid ""
-#~ "The directory to save files to. Defaults to the documents directory if unset."
-#~ msgstr ""
-#~ "Ο κατάλογος στον οποίο θα αποθηκευτούν τα αρχεία. Αν δεν ορισθεί, προεπιλογή "
-#~ "είναι ο κατάλογος εγγράφων."
-
-#~ msgid "Directory to save files to"
-#~ msgstr "Κατάλογος στον οποίο θα αποθηκευτούν τα αρχεία"
-
-#~ msgid "Page side to scan"
-#~ msgstr "Πλευρά σελίδας για σάρωση"
-
-#~ msgid "The page side to scan."
-#~ msgstr "Η πλευρά της σελίδας για σάρωση."
-
-#~ msgid ""
-#~ "Type of document being scanned. This setting decides on the scan resolution, "
-#~ "colors and post-processing."
-#~ msgstr ""
-#~ "Ο τύπος του έγγραφου που σαρώνεται.  Αυτή η ρύθμιση καθορίζει την ανάλυση, "
-#~ "το χρώμα και την μετα-επεξεργασία της σάρωσης."
+#~ "  --g-fatal-warnings              Να είναι όλες οι προειδοποιήσεις "
+#~ "μοιραίες"
 
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "Ο προσανατολισμός του σαρωτή  στη σαρωμένη σελίδα"
-
-#~ msgid ""
-#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
-#~ msgstr ""
-#~ "Πλάτος του χαρτιού σε δέκατα του χιλιοστού (mm) (ή 0 για την αυτόματη "
-#~ "ανίχνευση χαρτιού)."
-
-#~ msgid "Width of paper in tenths of a mm"
-#~ msgstr "Πλάτος του χαρτιού σε δέκατα του χιλιοστού (mm)"
-
-#~ msgid ""
-#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
-#~ msgstr ""
-#~ "Ύψος του χαρτιού σε δέκατα του χιλιοστού (mm) (ή 0 για την αυτόματη "
-#~ "ανίχνευση χαρτιού)."
-
-#~ msgid "Height of paper in tenths of a mm"
-#~ msgstr "Ύψος σελίδας σε δέκατα του χιλιοστού (mm)"
-
-#~ msgid "Contrast of scan"
-#~ msgstr "Αντίθεση σάρωσης"
-
-#~ msgid "Brightness of scan"
-#~ msgstr "Φωτεινότητα σάρωσης"
-
-#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
-#~ msgstr "Προσαρμογή της αντίθεσης από -100 έως 100 (0 χωρίς προσαρμογή)"
-
-#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
-#~ msgstr "Προσαρμογή της φωτεινότητας από -100 έως 100 (0 χωρίς προσαρμογή)"
-
-#~ msgid "Quality value to use for JPEG compression."
-#~ msgstr "Τιμή της ποιότητας που θα χρησιμοποιηθεί για τη συμπίεση JPEG."
-
-#~ msgid "Quality value to use for JPEG compression"
-#~ msgstr "Τιμή της ποιότητας που θα χρησιμοποιηθεί για τη συμπίεση JPEG"
diff --git a/po/en@boldquot.header b/po/en@boldquot.header
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..7b79d00 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -2,516 +2,532 @@
 # Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
 # This file is distributed under the same license as the simple-scan package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
+# Bruce Cowan <bruce@bcowan.eu>, 2017.
 #
 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:58+0000\n"
-"Last-Translator: James Thorrold <j.thorrold@virgin.net>\n"
-"Language-Team: English (United Kingdom) <en_GB@li.org>\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
+"product=simple-scan&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-09-07 03:20+0000\n"
+"PO-Revision-Date: 2017-09-08 11:58+0100\n"
+"Last-Translator: Bruce Cowan <bruce@bcowan.eu>\n"
+"Language-Team: British English <en@li.org>\n"
+"Language: en_GB\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-25 06:10+0000\n"
+"X-Generator: Gtranslator 2.91.7\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. Button to submit authorization dialog
-#: data/simple-scan.ui:24
-msgid "_Authorize"
-msgstr "_Authorise"
+#: data/org.gnome.SimpleScan.gschema.xml:11
+msgid "Device to scan from"
+msgstr "Device to scan from"
 
-#. Label beside username entry
-#: data/simple-scan.ui:102
-msgid "_Username for resource:"
-msgstr "_Username for resource:"
+#: data/org.gnome.SimpleScan.gschema.xml:12
+msgid "SANE device to acquire images from."
+msgstr "SANE device to acquire images from."
 
-#. Label beside password entry
-#: data/simple-scan.ui:117
-msgid "_Password:"
-msgstr "_Password:"
+#: data/org.gnome.SimpleScan.gschema.xml:20
+msgid "Type of document being scanned"
+msgstr "Type of document being scanned"
 
-#. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
-msgid "Front and Back"
-msgstr "Front and Back"
+#: data/org.gnome.SimpleScan.gschema.xml:21
+msgid ""
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+msgstr ""
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colours and post-processing."
 
-#. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
-msgid "Front"
-msgstr "Front"
+#: data/org.gnome.SimpleScan.gschema.xml:25
+msgid "Width of paper in tenths of a mm"
+msgstr "Width of paper (in tenths of a mm)"
 
-#. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
-msgid "Back"
-msgstr "Back"
+#: data/org.gnome.SimpleScan.gschema.xml:26
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:30
+msgid "Height of paper in tenths of a mm"
+msgstr "Height of paper (in tenths of a mm)"
+
+#: data/org.gnome.SimpleScan.gschema.xml:31
+msgid ""
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:35
+msgid "Brightness of scan"
+msgstr "Brightness of scan"
+
+#: data/org.gnome.SimpleScan.gschema.xml:36
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr "The brightness adjustment from -100 to 100 (0 being none)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:40
+msgid "Contrast of scan"
+msgstr "Contrast of scan"
 
+#: data/org.gnome.SimpleScan.gschema.xml:41
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr "The contrast adjustment from -100 to 100 (0 being none)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:45
+msgid "Resolution for text scans"
+msgstr "Resolution for text scans"
+
+#: data/org.gnome.SimpleScan.gschema.xml:46
+msgid "The resolution in dots-per-inch to use when scanning text."
+msgstr "The resolution in dots-per-inch to use when scanning text."
+
+#: data/org.gnome.SimpleScan.gschema.xml:50
+msgid "Resolution for photo scans"
+msgstr "Resolution for photo scans"
+
+#: data/org.gnome.SimpleScan.gschema.xml:51
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr "The resolution in dots-per-inch to use when scanning photos."
+
+#: data/org.gnome.SimpleScan.gschema.xml:55
+msgid "Page side to scan"
+msgstr "Page side to scan"
+
+#: data/org.gnome.SimpleScan.gschema.xml:56
+msgid "The page side to scan."
+msgstr "The page side to scan."
+
+#: data/org.gnome.SimpleScan.gschema.xml:60
+msgid "Directory to save files to"
+msgstr "Directory to save files to"
+
+#: data/org.gnome.SimpleScan.gschema.xml:61
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr "The folder where files are saved. Default is the Documents folder."
+
+#: data/org.gnome.SimpleScan.gschema.xml:66
+msgid "Quality value to use for JPEG compression"
+msgstr "Quality value to use for JPEG compression"
+
+#: data/org.gnome.SimpleScan.gschema.xml:67
+msgid "Quality value to use for JPEG compression."
+msgstr "Quality value to use for JPEG compression."
+
+#: data/org.gnome.SimpleScan.gschema.xml:72
+msgid "Delay in millisecond between pages"
+msgstr "Delay in millisecond between pages"
+
+#: data/org.gnome.SimpleScan.gschema.xml:73
+msgid "Delay in millisecond between pages."
+msgstr "Delay in millisecond between pages."
+
+#. Title of scan window
+#. Set HeaderBar title here because Glade doesn't keep it translated
+#. https://bugzilla.gnome.org/show_bug.cgi?id=782753
 #. 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
+#: data/simple-scan.appdata.xml.in:6 data/simple-scan.desktop.in:3
+#: src/app-window.ui:76 src/app-window.vala:1560
 msgid "Simple Scan"
 msgstr "Simple Scan"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
-msgid "_Document"
-msgstr "_Document"
+#: data/simple-scan.appdata.xml.in:7 data/simple-scan.desktop.in:5
+msgid "Scan Documents"
+msgstr "Scan Documents"
 
-#. Scan menu item
-#: data/simple-scan.ui:260
-msgid "Sc_an"
-msgstr "Sc_an"
+#: 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 "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to PDF or save them in a range of image "
+"formats."
 
+#: 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."
+
+#: data/simple-scan.desktop.in:4
+msgid "Document Scanner"
+msgstr "Document Scanner"
+
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: data/simple-scan.desktop.in:7
+msgid "scan;scanner;flatbed;adf;"
+msgstr "scan;scanner;flatbed;adf;"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: data/simple-scan.desktop.in:10
+msgid "scanner"
+msgstr "scanner"
+
+#. Toolbar scan menu item to scan a single page from the scanner
 #. 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/app-window.ui:22 src/app-window.ui:123 src/app-window.ui:820
 msgid "Single _Page"
 msgstr "Single _Page"
 
+#. Toolbar scan menu item to scan all pages from a document feeder
 #. 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/app-window.ui:31 src/app-window.ui:133 src/app-window.ui:829
 msgid "All Pages From _Feeder"
 msgstr "All Pages From _Feeder"
 
-#. Menu entry to stop current scan
-#: data/simple-scan.ui:294
-msgid "_Stop Scan"
-msgstr "_Stop Scan"
+#. Toolbar scan menu item to scan continuously from the flatbed
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/app-window.ui:40 src/app-window.ui:143 src/app-window.ui:838
+msgid "_Multiple Pages From Flatbed"
+msgstr "_Multiple Pages From Flatbed"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:853
 msgid "Text"
 msgstr "Text"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:863
 msgid "Photo"
 msgstr "Photo"
 
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: src/app-window.ui:91
+msgid "_Document"
+msgstr "_Document"
+
+#. Scan menu item
+#: src/app-window.ui:110
+msgid "Sc_an"
+msgstr "Sc_an"
+
+#. Menu entry to stop current scan
+#: src/app-window.ui:154
+msgid "_Stop Scan"
+msgstr "_Stop Scan"
+
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/app-window.ui:196 src/app-window.vala:967 src/app-window.vala:1590
 msgid "Reorder Pages"
 msgstr "Reorder Pages"
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/app-window.ui:215
 msgid "_Email"
 msgstr "_E-mail"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/app-window.ui:280
 msgid "_Page"
 msgstr "_Page"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/app-window.ui:290
 msgid "Rotate _Left"
 msgstr "Rotate _Left"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/app-window.ui:300
 msgid "Rotate _Right"
 msgstr "Rotate _Right"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/app-window.ui:310
 msgid "_Crop"
 msgstr "_Crop"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/app-window.ui:320
 msgid "_None"
 msgstr "_None"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/app-window.ui:331
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/app-window.ui:342
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/app-window.ui:353
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/app-window.ui:364
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/app-window.ui:375
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/app-window.ui:386
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/app-window.ui:397
 msgid "_Custom"
 msgstr "_Custom"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/app-window.ui:415
 msgid "_Rotate Crop"
 msgstr "_Rotate Crop"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/app-window.ui:428
 msgid "Move Left"
 msgstr "Move Left"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/app-window.ui:437
 msgid "Move Right"
 msgstr "Move Right"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/app-window.ui:474
 msgid "_Help"
 msgstr "_Help"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/app-window.ui:482
 msgid "_Contents"
 msgstr "_Contents"
 
-#. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
-msgid "Start a new document"
-msgstr "Start a new document"
-
-#: data/simple-scan.ui:675
-msgid "New"
-msgstr "New"
-
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/app-window.ui:520 src/app-window.ui:720
 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/app-window.ui:522 src/app-window.ui:716
 msgid "Scan"
 msgstr "Scan"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/app-window.ui:538 src/app-window.ui:787
 msgid "Save document to a file"
 msgstr "Save document to a file"
 
-#: ../src/ui.vala:1842
+#: src/app-window.ui:540
 msgid "Save"
 msgstr "Save"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/app-window.ui:555 src/app-window.ui:700
 msgid "Stop the current scan"
 msgstr "Stop the current scan"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/app-window.ui:556 src/app-window.ui:697
 msgid "Stop"
 msgstr "Stop"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "Rotate the page to the left (anti-clockwise)"
-
-#. Label on rotate page left (anti-clockwise) item
-#: data/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
-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
-msgid "Rotate Right"
-msgstr "Rotate Right"
-
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
-msgid "Crop the selected page"
-msgstr "Crop the selected page"
-
-#: data/simple-scan.ui:781
-msgid "Crop"
-msgstr "Crop"
-
-#: ../src/ui.vala:1849
-msgid "Preferences"
-msgstr "Preferences"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1048
-msgid "Scan S_ource:"
-msgstr "Scan S_ource:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1079
-msgid "_Text Resolution:"
-msgstr "_Text Resolution:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1095
-msgid "_Photo Resolution:"
-msgstr "_Photo Resolution:"
-
-#. Label beside scan side combo box
-#: data/simple-scan.ui:1139
-msgid "Scan Side:"
-msgstr "Scan Side:"
-
-#. Label beside page size combo box
-#: data/simple-scan.ui:1169
-msgid "Page Size:"
-msgstr "Page Size:"
+#. Label shown when searching for scanners
+#: src/app-window.ui:611
+msgid "Searching for Scanners…"
+msgstr "Searching for Scanners…"
 
-#. Label beside brightness scale
-#: data/simple-scan.ui:1199
-msgid "Brightness:"
-msgstr "Brightness:"
-
-#. Label beside contrast scale
-#: data/simple-scan.ui:1229
-msgid "Contrast:"
-msgstr "Contrast:"
-
-#. Label beside quality scale
-#: data/simple-scan.ui:1260
-msgid "Quality:"
-msgstr "Quality:"
-
-#: data/simple-scan.desktop.in:4
-msgid "Document Scanner"
-msgstr "Document Scanner"
-
-#: data/simple-scan.desktop.in:5
-msgid "Scan Documents"
-msgstr "Scan Documents"
+#: src/app-window.vala:237 src/app-window.vala:1380
+msgid "_Close"
+msgstr "_Close"
 
-#: data/simple-scan.desktop.in:6
-msgid "scan;scanner;flatbed;adf;"
-msgstr "scan;scanner;flatbed;adf;"
+#. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
+#: src/app-window.vala:246
+#, c-format
+#| msgid "Username and password required to access '%s'"
+msgid "Username and password required to access “%s”"
+msgstr "Username and password required to access “%s”"
 
-#: data/simple-scan.desktop.in:8
-msgid "scanner"
-msgstr ""
+#. Label shown when detected a scanner
+#: src/app-window.vala:266 src/app-window.vala:584
+#| msgid "Failed to scan"
+msgid "Ready to Scan"
+msgstr "Ready to Scan"
 
-#: data/simple-scan.appdata.xml.in:8
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to PDF or save them in a range of image "
-"formats."
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: src/app-window.vala:273
+msgid "Additional software needed"
+msgstr "Additional software needed"
 
-#: data/simple-scan.appdata.xml.in:13
+#. Instructions to install driver software
+#: src/app-window.vala:275
+#| msgid "You need to install driver software for your scanner."
 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
-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
-msgid "Unable to connect to scanner"
-msgstr "Unable to connect to scanner"
-
-#. Error display when unable to start scan
-#: ../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
-msgid "Error communicating with scanner"
-msgstr "Error communicating with scanner"
-
-#. Help string for command line --version flag
-#: ../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
-msgid "Print debugging messages"
-msgstr "Print debugging messages"
-
-#: ../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
-msgid "Failed to scan"
-msgstr "Failed to scan"
-
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
-msgid "[DEVICE...] - Scanning utility"
-msgstr "[DEVICE...] - Scanning utility"
-
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
-#, c-format
-msgid "Run '%s --help' to see a full list of available command line options."
+"You need to <a href=\"install-firmware\">install driver software</a> for "
+"your scanner."
 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
-msgid "_Close"
-msgstr "_Close"
-
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
-#, c-format
-msgid "Username and password required to access '%s'"
-msgstr "Username and password required to access '%s'"
+"You need to <a href=\"install-firmware\">install driver software</a> for "
+"your scanner."
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/app-window.vala:281
 msgid "No scanners detected"
 msgstr "No scanners detected"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/app-window.vala:283
 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
-msgid "Additional software needed"
-msgstr "Additional software needed"
-
-#. Instructions to install driver software
-#: ../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
-msgid "Save As..."
-msgstr "Save As..."
+#: src/app-window.vala:298
+#| msgid "Save As..."
+msgid "Save As…"
+msgstr "Save As…"
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/app-window.vala:301 src/app-window.vala:471 src/app-window.vala:552
 msgid "_Cancel"
 msgstr "_Cancel"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/app-window.vala:302 src/app-window.vala:553
 msgid "_Save"
 msgstr "_Save"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/app-window.vala:310
 msgid "Scanned Document.pdf"
 msgstr "Scanned Document.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#. Save dialog: Filter name to show only supported image files
+#: src/app-window.vala:316
 msgid "Image Files"
 msgstr "Image Files"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/app-window.vala:326
 msgid "All Files"
 msgstr "All Files"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/app-window.vala:335
 msgid "PDF (multi-page document)"
 msgstr "PDF (multi-page document)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/app-window.vala:341
 msgid "JPEG (compressed)"
 msgstr "JPEG (compressed)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/app-window.vala:347
 msgid "PNG (lossless)"
 msgstr "PNG (lossless)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#. Save dialog: Label for sabing in WEBP format
+#: src/app-window.vala:354
+#| msgid "JPEG (compressed)"
+msgid "WebP (compressed)"
+msgstr "WebP (compressed)"
+
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
+#: src/app-window.vala:364
 msgid "File format:"
 msgstr "File format:"
 
+#. Label in save dialog beside compression slider
+#: src/app-window.vala:376
+msgid "Compression:"
+msgstr "Compression:"
+
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/app-window.vala:470
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr "A file named “%s” already exists.  Do you want to replace it?"
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/app-window.vala:473
+msgid "_Replace"
+msgstr "_Replace"
+
+#: src/app-window.vala:512
+msgid "Saving"
+msgstr "Saving"
+
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/app-window.vala:527
 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
-msgid "If you don't save, changes will be permanently lost."
-msgstr "If you don't save, changes will be permanently lost."
+#: src/app-window.vala:550
+#| msgid "If you don't save, changes will be permanently lost."
+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/app-window.vala:591
 msgid "Save current document?"
 msgstr "Save current document?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/app-window.vala:593
 msgid "Discard Changes"
 msgstr "Discard Changes"
 
+#. Label shown when scan started
+#: src/app-window.vala:692
+#| msgid "Change _Scanner"
+msgid "Contacting scanner…"
+msgstr "Contacting scanner…"
+
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/app-window.vala:800
 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/app-window.vala:812
 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/app-window.vala:990
 msgid "Combine sides"
 msgstr "Combine sides"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/app-window.vala:1000
 msgid "Combine sides (reverse)"
 msgstr "Combine sides (reverse)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/app-window.vala:1010
 msgid "Reverse"
 msgstr "Reverse"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/app-window.vala:1020
 msgid "Keep unchanged"
 msgstr "Keep unchanged"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/app-window.vala:1250
 msgid "Unable to open help file"
 msgstr "Unable to open help file"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/app-window.vala:1271
 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,18 +556,20 @@ msgstr ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/app-window.vala:1274
 msgid "About Simple Scan"
 msgstr "About Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/app-window.vala:1277
 msgid "Simple document scanning tool"
 msgstr "Simple document scanning tool"
 
-#: ../src/ui.vala:1487
+#: src/app-window.vala:1286
 msgid "translator-credits"
 msgstr ""
+"Bruce Cowan <bruce@bcowan.eu>\n"
+"\n"
 "Launchpad Contributions:\n"
 "  Alex Denvir https://launchpad.net/~coldfff\n"
 "  Andi Chandler https://launchpad.net/~bing\n"
@@ -564,198 +582,541 @@ 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/app-window.vala:1308
 msgid "Save document before quitting?"
 msgstr "Save document before quitting?"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:1310
 msgid "Quit without Saving"
 msgstr "Quit without Saving"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/app-window.vala:1357
 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/app-window.vala:1359
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.brother.com\">Brother website</a>."
+"Drivers for this are available on the <a href=\"http://support.brother.com"
+"\">Brother website</a>."
 msgstr ""
-"Drivers for this are available on the <a "
-"href=\"http://support.brother.com\">Brother website</a>."
+"Drivers for this are available on the <a href=\"http://support.brother.com"
+"\">Brother website</a>."
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/app-window.vala:1363
 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/app-window.vala:1365
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://samsung.com/support\">Samsung website</a>."
+"Drivers for this are available on the <a href=\"http://samsung.com/support"
+"\">Samsung website</a>."
 msgstr ""
-"Drivers for this are available on the <a "
-"href=\"http://samsung.com/support\">Samsung website</a>."
+"Drivers for this are available on the <a href=\"http://samsung.com/support"
+"\">Samsung website</a>."
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/app-window.vala:1369
 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/app-window.vala:1374
 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/app-window.vala:1376
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.epson.com\">Epson website</a>."
+"Drivers for this are available on the <a href=\"http://support.epson.com"
+"\">Epson website</a>."
 msgstr ""
-"Drivers for this are available on the <a "
-"href=\"http://support.epson.com\">Epson website</a>."
+"Drivers for this are available on the <a href=\"http://support.epson.com"
+"\">Epson website</a>."
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/app-window.vala:1380
 msgid "Install drivers"
 msgstr "Install drivers"
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/app-window.vala:1411
 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
-msgid "Installing drivers..."
-msgstr "Installing drivers..."
+#: src/app-window.vala:1423
+#| msgid "Installing drivers..."
+msgid "Installing drivers…"
+msgstr "Installing drivers…"
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/app-window.vala:1431
 msgid "Drivers installed successfully!"
 msgstr "Drivers installed successfully!"
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/app-window.vala:1441
 #, 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/app-window.vala:1447
 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/app-window.vala:1454
 #, c-format
-msgid "You need to install the %s package(s)."
-msgstr "You need to install the %s package(s)."
+#| msgid "You need to install the %s package(s)."
+msgid "You need to install the %s package."
+msgid_plural "You need to install the %s packages."
+msgstr[0] "You need to install the %s package."
+msgstr[1] "You need to install the %s packages."
+
+#. Title of preferences dialog
+#: src/app-window.vala:1568 src/app-window.vala:1591
+#: src/preferences-dialog.ui:53
+msgid "Preferences"
+msgstr "Preferences"
+
+#: src/app-window.vala:1572
+msgid "Keyboard Shortcuts"
+msgstr "Keyboard Shortcuts"
+
+#: src/app-window.vala:1573
+msgid "Help"
+msgstr "Help"
+
+#: src/app-window.vala:1574
+msgid "About"
+msgstr "About"
+
+#: src/app-window.vala:1575
+msgid "Quit"
+msgstr "Quit"
+
+#: src/app-window.vala:1589
+#| msgid "_Email"
+msgid "Email"
+msgstr "E-mail"
+
+#. Populate ActionBar (not supported in Glade)
+#. https://bugzilla.gnome.org/show_bug.cgi?id=769966
+#. Label on new document button
+#: src/app-window.vala:1599
+msgid "Start Again…"
+msgstr "Start Again…"
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: src/app-window.vala:1616
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Rotate the page to the left (anti-clockwise)"
+
+#. Tooltip for rotate right (clockwise) button
+#: src/app-window.vala:1623
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Rotate the page to the right (clockwise)"
+
+#. Tooltip for crop button
+#: src/app-window.vala:1633
+msgid "Crop the selected page"
+msgstr "Crop the selected page"
+
+#. Tooltip for delete button
+#: src/app-window.vala:1649
+#| msgid "Crop the selected page"
+msgid "Delete the selected page"
+msgstr "Delete the selected page"
+
+#. Text of button for cancelling save
+#: src/app-window.vala:1814
+#| msgid "_Cancel"
+msgid "Cancel"
+msgstr "Cancel"
+
+#. Button to submit authorization dialog
+#: src/authorize-dialog.ui:25
+msgid "_Authorize"
+msgstr "_Authorise"
+
+#. Label beside username entry
+#: src/authorize-dialog.ui:99
+msgid "_Username for resource:"
+msgstr "_Username for resource:"
+
+#. Label beside password entry
+#: src/authorize-dialog.ui:112
+msgid "_Password:"
+msgstr "_Password:"
+
+#: src/book.vala:331 src/book.vala:337
+#, c-format
+#| msgid "Unable to open help file"
+msgid "Unable to encode page %i"
+msgstr "Unable to encode page %i"
+
+#: src/help-overlay.ui:12
+#| msgid "Scan"
+msgctxt "shortcut window"
+msgid "Scanning"
+msgstr "Scanning"
+
+#: src/help-overlay.ui:17
+#| msgid "Scan a single page from the scanner"
+msgctxt "shortcut window"
+msgid "Scan a single page"
+msgstr "Scan a single page"
+
+#: src/help-overlay.ui:24
+#| msgid "Scan a single page from the scanner"
+msgctxt "shortcut window"
+msgid "Scan all pages from document feeder"
+msgstr "Scan all pages from document feeder"
+
+#: src/help-overlay.ui:31
+#| msgid "Scan a single page from the scanner"
+msgctxt "shortcut window"
+msgid "Scan continuously from a flatbed scanner"
+msgstr "Scan continuously from a flatbed scanner"
+
+#: src/help-overlay.ui:38
+msgctxt "shortcut window"
+msgid "Stop scan in progress"
+msgstr "Stop scan in progress"
+
+#: src/help-overlay.ui:46
+#| msgid "Document Scanner"
+msgctxt "shortcut window"
+msgid "Document Modification"
+msgstr "Document Modification"
+
+#: src/help-overlay.ui:51
+#| msgid "Move Left"
+msgctxt "shortcut window"
+msgid "Move page left"
+msgstr "Move page left"
+
+#: src/help-overlay.ui:58
+#| msgid "Move Right"
+msgctxt "shortcut window"
+msgid "Move page right"
+msgstr "Move page right"
+
+#: src/help-overlay.ui:65
+#| msgid "Rotate the page to the left (counter-clockwise)"
+msgctxt "shortcut window"
+msgid "Rotate page to the left (anti-clockwise)"
+msgstr "Rotate page to the left (anti-clockwise)"
+
+#: src/help-overlay.ui:72
+#| msgid "Rotate the page to the right (clockwise)"
+msgctxt "shortcut window"
+msgid "Rotate page to the right (clockwise)"
+msgstr "Rotate page to the right (clockwise)"
+
+#: src/help-overlay.ui:79
+#| msgid "Crop the selected page"
+msgctxt "shortcut window"
+msgid "Delete page"
+msgstr "Delete page"
+
+#: src/help-overlay.ui:87
+#| msgid "Document Scanner"
+msgctxt "shortcut window"
+msgid "Document Management"
+msgstr "Document Management"
+
+#: src/help-overlay.ui:92
+#| msgid "Start a new document"
+msgctxt "shortcut window"
+msgid "Start new document"
+msgstr "Start new document"
+
+#: src/help-overlay.ui:99
+#| msgid "Scanned Document"
+msgctxt "shortcut window"
+msgid "Save scanned document"
+msgstr "Save scanned document"
+
+#: src/help-overlay.ui:106
+#| msgid "Scanned Document"
+msgctxt "shortcut window"
+msgid "Email scanned document"
+msgstr "E-mail scanned document"
+
+#: src/help-overlay.ui:113
+#| msgid "Scanned Document"
+msgctxt "shortcut window"
+msgid "Print scanned document"
+msgstr "Print scanned document"
+
+#: src/help-overlay.ui:120
+msgctxt "shortcut window"
+msgid "Copy current page to clipboard"
+msgstr "Copy current page to clipboard"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:113
+#| msgid "Change _Scanner"
+msgid "_Scanner"
+msgstr "_Scanner"
+
+#. Label beside scan side combo box
+#: src/preferences-dialog.ui:143
+#| msgid "Scan Side:"
+msgid "Scan Sides"
+msgstr "Scan Sides"
+
+#. Label beside page size combo box
+#: src/preferences-dialog.ui:160
+#| msgid "Page Size:"
+msgid "Page Size"
+msgstr "Page Size"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:191
+msgid "Front"
+msgstr "Front"
+
+#. Preferences Dialog: Toggle button to select scanning on the back side of a page
+#: src/preferences-dialog.ui:206
+msgid "Back"
+msgstr "Back"
+
+#. Preferences Dialog: Toggle button to select scanning on both sides of a page
+#: src/preferences-dialog.ui:221
+msgid "Both"
+msgstr "Both"
+
+#. Label beside page delay scale
+#: src/preferences-dialog.ui:260
+msgid "Delay"
+msgstr "Delay"
+
+#. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
+#: src/preferences-dialog.ui:276
+msgid "Multiple pages from flatbed"
+msgstr "Multiple pages from flatbed"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:295
+msgid "3"
+msgstr "3"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:310
+msgid "5"
+msgstr "5"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:326
+msgid "7"
+msgstr "7"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:342
+msgid "10"
+msgstr "10"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:358
+msgid "15"
+msgstr "15"
+
+#. Label after page delay radio buttons
+#: src/preferences-dialog.ui:385
+msgid "Seconds"
+msgstr "Seconds"
+
+#. Preferences Dialog: Tab label for scanning settings
+#: src/preferences-dialog.ui:413
+#| msgid "Scan"
+msgid "Scanning"
+msgstr "Scanning"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:436
+#| msgid "_Text Resolution:"
+msgid "_Text Resolution"
+msgstr "_Text Resolution"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:452
+#| msgid "_Photo Resolution:"
+msgid "_Photo Resolution"
+msgstr "_Photo Resolution"
+
+#. Label beside brightness scale
+#: src/preferences-dialog.ui:505
+#| msgid "Brightness:"
+msgid "Brightness"
+msgstr "Brightness"
+
+#. Label beside contrast scale
+#: src/preferences-dialog.ui:521
+#| msgid "Contrast:"
+msgid "Contrast"
+msgstr "Contrast"
+
+#. Preferences Dialog: Tab for quality settings
+#: src/preferences-dialog.ui:576
+#| msgid "Quality:"
+msgid "Quality"
+msgstr "Quality"
+
+#. Combo box value for automatic paper size
+#: src/preferences-dialog.vala:77
+msgid "Automatic"
+msgstr "Automatic"
+
+#: src/preferences-dialog.vala:116
+msgid "Darker"
+msgstr "Darker"
+
+#: src/preferences-dialog.vala:118
+msgid "Lighter"
+msgstr "Lighter"
+
+#: src/preferences-dialog.vala:126
+msgid "Less"
+msgstr "Less"
+
+#: src/preferences-dialog.vala:128
+msgid "More"
+msgstr "More"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/preferences-dialog.vala:440
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (default)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/preferences-dialog.vala:443
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (draft)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/preferences-dialog.vala:446
 #, 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/preferences-dialog.vala:449
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1835
-msgid "New Document"
-msgstr "New Document"
+#. Error displayed when no scanners to scan with
+#: src/scanner.vala:844
+msgid "No scanners available.  Please connect a scanner."
+msgstr "No scanners available.  Please connect a scanner."
 
-#: ../src/ui.vala:1840
-msgid "Document"
-msgstr "Document"
+#. Error displayed when cannot connect to scanner
+#: src/scanner.vala:874
+msgid "Unable to connect to scanner"
+msgstr "Unable to connect to scanner"
 
-#: ../src/ui.vala:1844
-msgid "Email..."
-msgstr "E-mail..."
+#. Error display when unable to start scan
+#: src/scanner.vala:1227
+msgid "Unable to start scan"
+msgstr "Unable to start scan"
 
-#: ../src/ui.vala:1845
-msgid "Print..."
-msgstr "Print..."
+#. Error displayed when communication with scanner broken
+#: src/scanner.vala:1240 src/scanner.vala:1340
+msgid "Error communicating with scanner"
+msgstr "Error communicating with scanner"
 
-#: ../src/ui.vala:1853
-msgid "Help"
-msgstr "Help"
+#. Help string for command line --version flag
+#: src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "Show release version"
 
-#: ../src/ui.vala:1854
-msgid "About"
-msgstr "About"
+#. Help string for command line --debug flag
+#: src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Print debugging messages"
 
-#: ../src/ui.vala:1855
-msgid "Quit"
-msgstr "Quit"
+#: 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"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
-msgid "Change _Scanner"
-msgstr "Change _Scanner"
+#. Title of error dialog when scan failed
+#: src/simple-scan.vala:392
+msgid "Failed to scan"
+msgstr "Failed to scan"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
-msgid "_Install Drivers"
-msgstr "_Install Drivers"
+#. Attempt to inhibit the screensaver when scanning
+#: src/simple-scan.vala:407
+msgid "Scan in progress"
+msgstr "Scan in progress"
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
-msgid "Automatic"
-msgstr "Automatic"
+#. Arguments and description for --help text
+#: src/simple-scan.vala:584
+#| msgid "[DEVICE...] - Scanning utility"
+msgid "[DEVICE…] — Scanning utility"
+msgstr "[DEVICE…] — Scanning utility"
 
-#: ../src/ui.vala:1947
-msgid "Darker"
-msgstr "Darker"
+#. Text printed out when an unknown command-line argument provided
+#: src/simple-scan.vala:595
+#, c-format
+#| msgid ""
+#| "Run '%s --help' to see a full list of available command line options."
+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:1949
-msgid "Lighter"
-msgstr "Lighter"
+#~ msgid "Front and Back"
+#~ msgstr "Front and Back"
 
-#: ../src/ui.vala:1957
-msgid "Less"
-msgstr "Less"
+#~ msgid "New"
+#~ msgstr "New"
 
-#: ../src/ui.vala:1959
-msgid "More"
-msgstr "More"
+#~ msgid "Rotate Left"
+#~ msgstr "Rotate Left"
 
-#: ../src/ui.vala:1967
-msgid "Minimum"
-msgstr "Minimum"
+#~ msgid "Rotate Right"
+#~ msgstr "Rotate Right"
 
-#: ../src/ui.vala:1969
-msgid "Maximum"
-msgstr "Maximum"
+#~ msgid "Crop"
+#~ msgstr "Crop"
 
-#: ../src/ui.vala:2008
-msgid "Saving document..."
-msgstr "Saving document..."
+#~ msgid "Scan S_ource:"
+#~ msgstr "Scan S_ource:"
 
-#: ../src/ui.vala:2173
-#, c-format
-msgid "Saving page %d out of %d"
-msgstr "Saving page %d out of %d"
+#~ msgid "New Document"
+#~ msgstr "New Document"
+
+#~ msgid "Document"
+#~ msgstr "Document"
+
+#~ msgid "Email..."
+#~ msgstr "E-mail..."
+
+#~ msgid "Print..."
+#~ msgstr "Print..."
+
+#~ msgid "_Install Drivers"
+#~ msgstr "_Install Drivers"
+
+#~ msgid "Minimum"
+#~ msgstr "Minimum"
+
+#~ msgid "Maximum"
+#~ msgstr "Maximum"
+
+#~ msgid "Saving document..."
+#~ msgstr "Saving document..."
+
+#~ msgid "Saving page %d out of %d"
+#~ msgstr "Saving page %d out of %d"
 
 #~ msgid "4&#xD7;6"
 #~ msgstr "4&#xD7;6"
@@ -766,7 +1127,6 @@ msgstr "Saving page %d out of %d"
 #~ msgid "Files missing"
 #~ msgstr "Files missing"
 
-#, c-format
 #~ msgid ""
 #~ "Usage:\n"
 #~ "  %s [DEVICE...] - Scanning utility"
@@ -774,7 +1134,6 @@ msgstr "Saving page %d out of %d"
 #~ "Usage:\n"
 #~ "  %s [DEVICE...] - Scanning utility"
 
-#, c-format
 #~ msgid ""
 #~ "GTK+ Options:\n"
 #~ "  --class=CLASS                   Program class as used by the window "
@@ -796,21 +1155,17 @@ msgstr "Saving page %d out of %d"
 #~ "  --gtk-module=MODULES            Load additional GTK+ modules\n"
 #~ "  --g-fatal-warnings              Make all warnings fatal"
 
-#~ msgid "Device to scan from"
-#~ msgstr "Device to scan from"
-
 #~ msgid "Direction of scan"
 #~ msgstr "Direction of scan"
 
-#~ msgid "Directory to save files to"
-#~ msgstr "Directory to save files to"
-
 #~ msgid ""
-#~ "The direction of the scanner across the scanned page. It can be one of the "
-#~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+#~ "The direction of the scanner across the scanned page. It can be one of "
+#~ "the following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-"
+#~ "left'"
 #~ msgstr ""
-#~ "The direction of the scanner across the scanned page. It can be one of the "
-#~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+#~ "The direction of the scanner across the scanned page. It can be one of "
+#~ "the following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-"
+#~ "left'"
 
 #~ msgid "TRUE if the application window is maximized"
 #~ msgstr "TRUE if the application window is maximised"
@@ -819,38 +1174,22 @@ msgstr "Saving page %d out of %d"
 #~ "The height of scanned image in pixels. This value is updated to what the "
 #~ "last scanned page was."
 #~ msgstr ""
-#~ "The height of scanned image in pixels. This value is updated to the height "
-#~ "of the last image scanned."
-
-#~ msgid "SANE device to acquire images from."
-#~ msgstr "SANE device to acquire images from."
-
-#~ msgid "Resolution for text scans"
-#~ msgstr "Resolution for text scans"
-
-#~ msgid "Resolution for photo scans"
-#~ msgstr "Resolution for photo scans"
+#~ "The height of scanned image in pixels. This value is updated to the "
+#~ "height of the last image scanned."
 
 #~ msgid "Resolution of last scanned image"
 #~ msgstr "Resolution of last scanned image"
 
 #~ msgid ""
-#~ "The directory to save files to. Defaults to the documents directory if unset."
-#~ msgstr "The folder where files are saved. Default is the Documents folder."
-
-#~ msgid ""
-#~ "The width of scanned image in pixels. This value is updated to what the last "
-#~ "scanned page was."
+#~ "The width of scanned image in pixels. This value is updated to what the "
+#~ "last scanned page was."
 #~ msgstr ""
-#~ "The width of scanned image in pixels. This value is updated to the width of "
-#~ "the last image scanned."
+#~ "The width of scanned image in pixels. This value is updated to the width "
+#~ "of the last image scanned."
 
 #~ msgid "The resolution in dots-per-inch of the previously scanned image."
 #~ msgstr "The resolution of the last image scanned (in dots-per-inch)."
 
-#~ msgid "Type of document being scanned"
-#~ msgstr "Type of document being scanned"
-
 #~ msgid ""
 #~ "Type of document being scanned. 'text' for text documents, 'photo' for "
 #~ "photos. This setting decides on the scan resolution, colors and post-"
@@ -866,16 +1205,12 @@ msgstr "Saving page %d out of %d"
 #~ msgid "Window width in pixels"
 #~ msgstr "Window width (in pixels)"
 
-#~ msgid "Scanned Document"
-#~ msgstr "Scanned Document"
-
 #~ msgid "Width of scanned image in pixels"
 #~ msgstr "Width of scanned image (in pixels)"
 
 #~ msgid "Select File _Type"
 #~ msgstr "Select File _Type"
 
-#, c-format
 #~ msgid ""
 #~ "Help Options:\n"
 #~ "  -d, --debug                     Print debugging messages\n"
@@ -891,70 +1226,15 @@ msgstr "Saving page %d out of %d"
 #~ "  --help-all                      Show all help options\n"
 #~ "  --help-gtk                      Show GTK+ options"
 
-#~ msgid "The resolution in dots-per-inch to use when scanning text."
-#~ msgstr "The resolution in dots-per-inch to use when scanning text."
-
-#~ msgid "The resolution in dots-per-inch to use when scanning photos."
-#~ msgstr "The resolution in dots-per-inch to use when scanning photos."
-
-#~ msgid ""
-#~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
-#~ msgstr ""
-#~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
-
-#~ msgid ""
-#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
-#~ msgstr ""
-#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
-
-#~ msgid "Page side to scan"
-#~ msgstr "Page side to scan"
-
 #~ msgid ""
-#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
+#~ "The page side to scan. It can be one of the following: 'both' 'front' "
+#~ "'back'"
 #~ msgstr ""
-#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
-
-#~ msgid "The page side to scan."
-#~ msgstr "The page side to scan."
-
-#~ msgid ""
-#~ "Type of document being scanned. This setting decides on the scan resolution, "
-#~ "colors and post-processing."
-#~ msgstr ""
-#~ "Type of document being scanned. This setting decides on the scan resolution, "
-#~ "colours and post-processing."
+#~ "The page side to scan. It can be one of the following: 'both' 'front' "
+#~ "'back'"
 
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "The direction of the scanner across the scanned page."
 
-#~ msgid "Height of paper in tenths of a mm"
-#~ msgstr "Height of paper (in tenths of a mm)"
-
 #~ msgid "Height of scanned image in pixels"
 #~ msgstr "Height of scanned image (in pixels)"
-
-#~ msgid "Width of paper in tenths of a mm"
-#~ msgstr "Width of paper (in tenths of a mm)"
-
-#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
-#~ msgstr "The contrast adjustment from -100 to 100 (0 being none)."
-
-#~ msgid "Contrast of scan"
-#~ msgstr "Contrast of scan"
-
-#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
-#~ msgstr "The brightness adjustment from -100 to 100 (0 being none)."
-
-#~ msgid "Brightness of scan"
-#~ msgstr "Brightness of scan"
-
-#~ msgid "Quality value to use for JPEG compression."
-#~ msgstr "Quality value to use for JPEG compression."
-
-#~ msgid "Quality value to use for JPEG compression"
-#~ msgstr "Quality value to use for JPEG compression"
diff --git a/po/eo.gmo b/po/eo.gmo
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..a2c48da 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -7,297 +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"
+"POT-Creation-Date: 2017-04-16 08:54-0400\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-25 06:10+0000\n"
+"X-Generator: Launchpad (build 18361)\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:231 src/simple-scan.ui:815 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:247
 msgid "_Document"
 msgstr "_Dokumento"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/simple-scan.ui:266
 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:279 src/simple-scan.ui:1343 src/simple-scan.ui:1402
 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:289 src/simple-scan.ui:1352 src/simple-scan.ui:1411
 msgid "All Pages From _Feeder"
 msgstr "Ĉiuj paĝoj el _papero-metilo"
 
+#. 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 "Haltigi _skani"
 
-#: 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 "Teksto"
 
-#: 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 "Foto"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/simple-scan.ui:352 src/ui.vala:1247 src/ui.vala:1891
 msgid "Reorder Pages"
 msgstr "Reordigi paĝojn"
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/simple-scan.ui:371
 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:436
 msgid "_Page"
 msgstr "_Paĝo"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:446
 msgid "Rotate _Left"
 msgstr "Turni _maldekstren"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:456
 msgid "Rotate _Right"
 msgstr "Turni _dekstren"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:466
 msgid "_Crop"
 msgstr "Stu_ci"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:476
 msgid "_None"
 msgstr "_Neniu"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:487
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:498
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:509
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:520
 msgid "_Letter"
 msgstr "US _Letter"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:531
 msgid "Le_gal"
 msgstr "US Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:542
 msgid "4×6"
 msgstr "4 × 6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:553
 msgid "_Custom"
 msgstr "_Propre"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:571
 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:584
 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:593
 msgid "Move Right"
 msgstr "Movi dekstren"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:630
 msgid "_Help"
 msgstr "_Helpo"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:638
 msgid "_Contents"
 msgstr "_Enhavo"
 
 #. 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 "Komenci novan dokumenton"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:681
 msgid "New"
 msgstr "Nova"
 
 #. 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 "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:697 src/simple-scan.ui:843
 msgid "Scan"
 msgstr "Skani"
 
 #. 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 "Konservi dokumenton en dosiero"
 
-#: ../src/ui.vala:1842
+#: src/simple-scan.ui:715 src/ui.vala:1892
 msgid "Save"
 msgstr "Konservi"
 
 #. 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 "Haltigi la aktualan skanon"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:731 src/simple-scan.ui:831
 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:755 src/simple-scan.ui:942
 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:756
 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:770 src/simple-scan.ui:920
 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:771
 msgid "Rotate Right"
 msgstr "Turni dekstren"
 
-#: 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 "Stuci la elektitan paĝon"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:787
 msgid "Crop"
 msgstr "Stuci"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:1003 src/ui.vala:1898
 msgid "Preferences"
 msgstr "Agordoj"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1054
 msgid "Scan S_ource:"
 msgstr "Skano-f_onto:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1085
 msgid "_Text Resolution:"
 msgstr "_Teksta distingivo"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1101
 msgid "_Photo Resolution:"
 msgstr "_Fotaĵa distingivo:"
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1145
 msgid "Scan Side:"
 msgstr "Skano-flanko:"
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1175
 msgid "Page Size:"
 msgstr "Paĝo-grando:"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1205
 msgid "Brightness:"
 msgstr "Brileco:"
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1235
 msgid "Contrast:"
 msgstr "Kontrasto:"
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1266
 msgid "Quality:"
 msgstr "Kvalito:"
 
+#. 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 "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 +322,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 +330,208 @@ 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:844
 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:874
 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:1227
 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:1240 src/scanner.vala:1340
 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:332 src/ui.vala:1655 src/ui.vala:1935
 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:341
 #, 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:389
 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:391
 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:396
 msgid "Additional software needed"
 msgstr ""
 
 #. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:398
 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:510
 msgid "Save As..."
 msgstr "Konservi kiel..."
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:513 src/ui.vala:648 src/ui.vala:723
 msgid "_Cancel"
 msgstr "_Nuligi"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:514 src/ui.vala:724
 msgid "_Save"
 msgstr "Kon_servi"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:522
 msgid "Scanned Document.pdf"
 msgstr "Skanita Dokumento.pdf"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:528
 msgid "Image Files"
 msgstr "Bildo-dosieroj"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:534
 msgid "All Files"
 msgstr "Ĉiuj dosieroj"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:543
 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:549
 msgid "JPEG (compressed)"
 msgstr "JPEG (densigita)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:555
 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: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:650
+#: src/ui.vala:698
 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:721
 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:763
 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:765
 msgid "Discard Changes"
 msgstr "Forlasi Ŝanĝojn"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:1056
 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:1068
 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:1270
 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:1280
 msgid "Combine sides (reverse)"
 msgstr "Kombini flankojn"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1290
 msgid "Reverse"
 msgstr "Inversigi"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1300
 msgid "Keep unchanged"
 msgstr "Konservi senŝanĝa"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1504
 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: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"
@@ -537,16 +561,16 @@ msgstr ""
 "<http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1528
 msgid "About Simple Scan"
 msgstr "Pri simpla skani"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1531
 msgid "Simple document scanning tool"
 msgstr "Simpla ilo por skanantaj dokumentoj"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1540
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -560,189 +584,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:1562
 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:1564
 msgid "Quit without Saving"
 msgstr "Fini sen konservanta"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1632
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1634
 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:1638
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1640
 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:1644
 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:1649
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1651
 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:1655
 msgid "Install drivers"
 msgstr ""
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1686
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1698
 msgid "Installing drivers..."
 msgstr ""
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1706
 msgid "Drivers installed successfully!"
 msgstr ""
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1716
 #, 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:1722
 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:1729
 #, 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:1833
 #, 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:1836
 #, 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:1839
 #, 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:1842
 #, c-format
 msgid "%d dpi"
 msgstr "%d punktoj en colo"
 
-#: ../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 ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1937
 msgid "Change _Scanner"
 msgstr "Ŝanĝi _Skanilo"
 
 #. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1939
 msgid "_Install Drivers"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1945
 msgid "Automatic"
 msgstr "Aŭtomata"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1995
 msgid "Darker"
 msgstr "Pli malhele"
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1997
 msgid "Lighter"
 msgstr "Pli hele"
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:2005
 msgid "Less"
 msgstr "Malpli"
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:2007
 msgid "More"
 msgstr "Pli"
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:2015
 msgid "Minimum"
 msgstr "Minimume"
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:2017
 msgid "Maximum"
 msgstr "Maksimume"
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2068
 msgid "Saving document..."
 msgstr "Konservado de dokumento..."
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2242
 #, 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..3679baa 100644
--- a/po/es.po
+++ b/po/es.po
@@ -2,519 +2,527 @@
 # Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
 # This file is distributed under the same license as the simple-scan package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
+# Daniel Mustieles <daniel.mustieles@gmail.com>, 2017.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-07-29 12:47+1200\n"
-"PO-Revision-Date: 2016-10-27 14:48+0000\n"
-"Last-Translator: Jose Luis Tirado <Unknown>\n"
-"Language-Team: Spanish <es@li.org>\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
+"product=simple-scan&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-09-11 03:50+0000\n"
+"PO-Revision-Date: 2017-09-11 15:53+0200\n"
+"Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
+"Language-Team: es <gnome-es-list@gnome.org>\n"
+"Language: es\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-25 06:10+0000\n"
+"X-Generator: Gtranslator 2.91.6\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. Button to submit authorization dialog
-#: data/simple-scan.ui:24
-msgid "_Authorize"
-msgstr "_Autorizar"
+#: data/org.gnome.SimpleScan.gschema.xml:11
+msgid "Device to scan from"
+msgstr "Para escanear desde el dispositivo"
 
-#. Label beside username entry
-#: data/simple-scan.ui:102
-msgid "_Username for resource:"
-msgstr "Nombre de _usuario para el recurso:"
+#: data/org.gnome.SimpleScan.gschema.xml:12
+msgid "SANE device to acquire images from."
+msgstr "Dispositivo SANE desde donde adquirir las imágenes."
 
-#. Label beside password entry
-#: data/simple-scan.ui:117
-msgid "_Password:"
-msgstr "_Contraseña:"
+#: data/org.gnome.SimpleScan.gschema.xml:20
+msgid "Type of document being scanned"
+msgstr "Tipo de documento que está siendo escaneado"
 
-#. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
-msgid "Front and Back"
-msgstr "Anverso y reverso"
+#: data/org.gnome.SimpleScan.gschema.xml:21
+msgid ""
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+msgstr ""
+"Tipo de documento escaneándose. Esta configuración establece la resolución "
+"de escaneo, colores y post-procesamiento."
 
-#. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
-msgid "Front"
-msgstr "Anverso"
+#: data/org.gnome.SimpleScan.gschema.xml:25
+msgid "Width of paper in tenths of a mm"
+msgstr "Anchura del papel en décimas de mm"
 
-#. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
-msgid "Back"
-msgstr "Reverso"
+#: data/org.gnome.SimpleScan.gschema.xml:26
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"La anchura del papel en décimas de mm (0 para detección automática del "
+"papel)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:30
+msgid "Height of paper in tenths of a mm"
+msgstr "Altura del papel en décimas de mm"
+
+#: data/org.gnome.SimpleScan.gschema.xml:31
+msgid ""
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"La altura del papel en décimas de mm (0 para detección automática del papel)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:35
+msgid "Brightness of scan"
+msgstr "Brillo de escaneo"
+
+#: data/org.gnome.SimpleScan.gschema.xml:36
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr "Ajuste del brillo desde -100 a 100 (siendo 0 sin ajuste)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:40
+msgid "Contrast of scan"
+msgstr "Contraste del escaneo"
+
+#: data/org.gnome.SimpleScan.gschema.xml:41
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr "Ajuste de contraste desde -100 a 100 (siendo 0 sin ajuste)."
 
+#: data/org.gnome.SimpleScan.gschema.xml:45
+msgid "Resolution for text scans"
+msgstr "Resolución para los escaneados de texto"
+
+#: data/org.gnome.SimpleScan.gschema.xml:46
+msgid "The resolution in dots-per-inch to use when scanning text."
+msgstr "La resolución en puntos por pulgada a usar al escanear texto."
+
+#: data/org.gnome.SimpleScan.gschema.xml:50
+msgid "Resolution for photo scans"
+msgstr "Resolución para los escaneados de fotografías"
+
+#: data/org.gnome.SimpleScan.gschema.xml:51
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr "La resolución en puntos por pulgada a usar al escanear fotografías."
+
+#: data/org.gnome.SimpleScan.gschema.xml:55
+msgid "Page side to scan"
+msgstr "Cara a escanear de la página"
+
+#: data/org.gnome.SimpleScan.gschema.xml:56
+msgid "The page side to scan."
+msgstr "El lado de la página a escanear."
+
+#: data/org.gnome.SimpleScan.gschema.xml:60
+msgid "Directory to save files to"
+msgstr "Directorio en el que guardar los archivos"
+
+#: data/org.gnome.SimpleScan.gschema.xml:61
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+"El directorio en el que se guardarán los archivos. Por defecto será el "
+"directorio de documentos."
+
+#: data/org.gnome.SimpleScan.gschema.xml:66
+msgid "Quality value to use for JPEG compression"
+msgstr "Calidad de la compresión de JPEG"
+
+#: data/org.gnome.SimpleScan.gschema.xml:67
+msgid "Quality value to use for JPEG compression."
+msgstr "Calidad de la compresión de JPEG."
+
+#: data/org.gnome.SimpleScan.gschema.xml:72
+msgid "Delay in millisecond between pages"
+msgstr "Retardo entre páginas, en milisegundos"
+
+#: data/org.gnome.SimpleScan.gschema.xml:73
+msgid "Delay in millisecond between pages."
+msgstr "Retardo entre páginas, en milisegundos."
+
+#. Title of scan window
+#. Set HeaderBar title here because Glade doesn't keep it translated
+#. https://bugzilla.gnome.org/show_bug.cgi?id=782753
 #. 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
+#: data/simple-scan.appdata.xml.in:6 data/simple-scan.desktop.in:3
+#: src/app-window.ui:76 src/app-window.vala:1560
 msgid "Simple Scan"
 msgstr "Simple Scan"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
-msgid "_Document"
-msgstr "_Documento"
+#: data/simple-scan.appdata.xml.in:7 data/simple-scan.desktop.in:5
+msgid "Scan Documents"
+msgstr "Escanear documentos"
 
-#. Scan menu item
-#: data/simple-scan.ui:260
-msgid "Sc_an"
-msgstr "Esc_anear"
+#: 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 "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+"Escanee documentos y fotos con suma sencillez. Es posible recortar las "
+"partes no deseadas de una foto y girarla si quedó al revés. Luego podrá "
+"imprimir las digitalizaciones, exportarlas a PDF o guardarlas en diversos "
+"formatos de imagen."
+
+#: data/simple-scan.appdata.xml.in:14
+msgid "Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+"Simple Scan emplea el marco SANE para compatibilidad con la mayoría de los "
+"escáneres existentes."
 
+#: data/simple-scan.desktop.in:4
+msgid "Document Scanner"
+msgstr "Escáner de documentos"
+
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: data/simple-scan.desktop.in:7
+msgid "scan;scanner;flatbed;adf;"
+msgstr "escanear;escáner;plano;adf;"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: data/simple-scan.desktop.in:10
+msgid "scanner"
+msgstr "scanner"
+
+#. Toolbar scan menu item to scan a single page from the scanner
 #. 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/app-window.ui:22 src/app-window.ui:123 src/app-window.ui:820
 msgid "Single _Page"
 msgstr "_Una página"
 
+#. Toolbar scan menu item to scan all pages from a document feeder
 #. 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/app-window.ui:31 src/app-window.ui:133 src/app-window.ui:829
 msgid "All Pages From _Feeder"
 msgstr "Todas las páginas del _alimentador"
 
-#. Menu entry to stop current scan
-#: data/simple-scan.ui:294
-msgid "_Stop Scan"
-msgstr "D_etener escaneado"
+#. Toolbar scan menu item to scan continuously from the flatbed
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/app-window.ui:40 src/app-window.ui:143 src/app-window.ui:838
+msgid "_Multiple Pages From Flatbed"
+msgstr "_Varias páginas del alimentador"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:853
 msgid "Text"
 msgstr "Texto"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:863
 msgid "Photo"
 msgstr "Foto"
 
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: src/app-window.ui:91
+msgid "_Document"
+msgstr "_Documento"
+
+#. Scan menu item
+#: src/app-window.ui:110
+msgid "Sc_an"
+msgstr "Esc_anear"
+
+#. Menu entry to stop current scan
+#: src/app-window.ui:154
+msgid "_Stop Scan"
+msgstr "D_etener escaneado"
+
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/app-window.ui:196 src/app-window.vala:967 src/app-window.vala:1590
 msgid "Reorder Pages"
 msgstr "Reordenar las páginas"
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/app-window.ui:215
 msgid "_Email"
 msgstr "_Correo electrónico"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/app-window.ui:280
 msgid "_Page"
 msgstr "_Página"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/app-window.ui:290
 msgid "Rotate _Left"
 msgstr "Girar a la i_zquierda"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/app-window.ui:300
 msgid "Rotate _Right"
 msgstr "Girar a la _derecha"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/app-window.ui:310
 msgid "_Crop"
 msgstr "_Recortar"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/app-window.ui:320
 msgid "_None"
 msgstr "_Ninguno"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/app-window.ui:331
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/app-window.ui:342
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/app-window.ui:353
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/app-window.ui:364
 msgid "_Letter"
 msgstr "_Carta"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/app-window.ui:375
 msgid "Le_gal"
 msgstr "_Oficio"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/app-window.ui:386
 msgid "4×6"
 msgstr "4 × 6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/app-window.ui:397
 msgid "_Custom"
 msgstr "_Personalizado"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/app-window.ui:415
 msgid "_Rotate Crop"
 msgstr "_Girar recorte"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/app-window.ui:428
 msgid "Move Left"
 msgstr "Mover a la izquierda"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/app-window.ui:437
 msgid "Move Right"
 msgstr "Mover a la derecha"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/app-window.ui:474
 msgid "_Help"
 msgstr "Ay_uda"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/app-window.ui:482
 msgid "_Contents"
 msgstr "_Contenido"
 
-#. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
-msgid "Start a new document"
-msgstr "Crear un documento nuevo"
-
-#: data/simple-scan.ui:675
-msgid "New"
-msgstr "Nuevo"
-
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/app-window.ui:520 src/app-window.ui:720
 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/app-window.ui:522 src/app-window.ui:716
 msgid "Scan"
 msgstr "Escanear"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/app-window.ui:538 src/app-window.ui:787
 msgid "Save document to a file"
 msgstr "Guardar documento a un archivo"
 
-#: ../src/ui.vala:1842
+#: src/app-window.ui:540
 msgid "Save"
 msgstr "Guardar"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/app-window.ui:555 src/app-window.ui:700
 msgid "Stop the current scan"
 msgstr "Detiene el escaneado actual"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/app-window.ui:556 src/app-window.ui:697
 msgid "Stop"
 msgstr "Detener"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "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
-msgid "Rotate Left"
-msgstr "Girar a la izquierda"
-
-#. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
-msgid "Rotate the page to the right (clockwise)"
-msgstr "Girar la página a la derecha (sentido de las agujas del reloj)"
+#. Label shown when searching for scanners
+#: src/app-window.ui:611
+msgid "Searching for Scanners…"
+msgstr "Buscando escáneres…"
 
-#. Label on rotate page right (clockwise) item
-#: data/simple-scan.ui:765
-msgid "Rotate Right"
-msgstr "Girar a la derecha"
-
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
-msgid "Crop the selected page"
-msgstr "Recortar la página seleccionada"
-
-#: data/simple-scan.ui:781
-msgid "Crop"
-msgstr "Recortar"
-
-#: ../src/ui.vala:1849
-msgid "Preferences"
-msgstr "Preferencias"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1048
-msgid "Scan S_ource:"
-msgstr "_Origen de escaneo:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1079
-msgid "_Text Resolution:"
-msgstr "Resolución de _texto:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1095
-msgid "_Photo Resolution:"
-msgstr "Resolución de _fotografía:"
-
-#. Label beside scan side combo box
-#: data/simple-scan.ui:1139
-msgid "Scan Side:"
-msgstr "Cara a escanear:"
-
-#. Label beside page size combo box
-#: data/simple-scan.ui:1169
-msgid "Page Size:"
-msgstr "Tamaño de página:"
-
-#. Label beside brightness scale
-#: data/simple-scan.ui:1199
-msgid "Brightness:"
-msgstr "Brillo:"
-
-#. Label beside contrast scale
-#: data/simple-scan.ui:1229
-msgid "Contrast:"
-msgstr "Contraste:"
-
-#. Label beside quality scale
-#: data/simple-scan.ui:1260
-msgid "Quality:"
-msgstr "Calidad:"
-
-#: data/simple-scan.desktop.in:4
-msgid "Document Scanner"
-msgstr "Escáner de documentos"
-
-#: data/simple-scan.desktop.in:5
-msgid "Scan Documents"
-msgstr "Escanear documentos"
+#: src/app-window.vala:237 src/app-window.vala:1380
+msgid "_Close"
+msgstr "_Cerrar"
 
-#: data/simple-scan.desktop.in:6
-msgid "scan;scanner;flatbed;adf;"
-msgstr "escanear;escáner;plano;adf;"
+#. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
+#: src/app-window.vala:246
+#, c-format
+msgid "Username and password required to access “%s”"
+msgstr "Usuario y contraseña necesarios para acceder a «%s»"
 
-#: data/simple-scan.desktop.in:8
-msgid "scanner"
-msgstr "escáner"
+#. Label shown when detected a scanner
+#: src/app-window.vala:266 src/app-window.vala:584
+msgid "Ready to Scan"
+msgstr "Listo para escanear"
 
-#: data/simple-scan.appdata.xml.in:8
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-"Escanee documentos y fotos con suma sencillez. Es posible recortar las "
-"partes no deseadas de una foto y girarla si quedó al revés. Luego podrá "
-"imprimir las digitalizaciones, exportarlas a PDF o guardarlas en diversos "
-"formatos de imagen."
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: src/app-window.vala:273
+msgid "Additional software needed"
+msgstr "Se necesita software adicional"
 
-#: data/simple-scan.appdata.xml.in:13
+#. Instructions to install driver software
+#: src/app-window.vala:275
 msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
-"Simple Scan emplea el marco SANE para compatibilidad con la mayoría de los "
-"escáneres existentes."
-
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
-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
-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
-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
-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
-msgid "Show release version"
-msgstr "Mostrar el número de versión"
-
-#. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
-msgid "Print debugging messages"
-msgstr "Mostrar mensajes de depuración"
-
-#: ../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
-msgid "Failed to scan"
-msgstr "Falló al escanear"
-
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
-msgid "[DEVICE...] - Scanning utility"
-msgstr "[DISPOSITIVO…] - Utilidad de escaneo"
-
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
-#, c-format
-msgid "Run '%s --help' to see a full list of available command line options."
+"You need to <a href=\"install-firmware\">install driver software</a> for "
+"your scanner."
 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
-msgid "_Close"
-msgstr "_Cerrar"
-
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
-#, c-format
-msgid "Username and password required to access '%s'"
-msgstr "Usuario y contraseña necesarios para acceder a «%s»"
+"Es necesario <a href=\"install-firmware\">instalar controladores software</"
+"a> para el escáner."
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/app-window.vala:281
 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/app-window.vala:283
 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
-msgid "Additional software needed"
-msgstr "Se necesita software adicional"
-
-#. Instructions to install driver software
-#: ../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
-msgid "Save As..."
+#: src/app-window.vala:298
+msgid "Save As…"
 msgstr "Guardar como…"
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/app-window.vala:301 src/app-window.vala:471 src/app-window.vala:552
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/app-window.vala:302 src/app-window.vala:553
 msgid "_Save"
 msgstr "_Guardar"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/app-window.vala:310
 msgid "Scanned Document.pdf"
 msgstr "Documento escaneado.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#. Save dialog: Filter name to show only supported image files
+#: src/app-window.vala:316
 msgid "Image Files"
 msgstr "Archivos de imagen"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/app-window.vala:326
 msgid "All Files"
 msgstr "Todos los archivos"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/app-window.vala:335
 msgid "PDF (multi-page document)"
 msgstr "PDF (documento multipágina)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/app-window.vala:341
 msgid "JPEG (compressed)"
 msgstr "JPEG (comprimido)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/app-window.vala:347
 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
+#. Save dialog: Label for sabing in WEBP format
+#: src/app-window.vala:354
+msgid "WebP (compressed)"
+msgstr "WebP (comprimido)"
+
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
+#: src/app-window.vala:364
 msgid "File format:"
 msgstr "Formato de archivo:"
 
+#. Label in save dialog beside compression slider
+#: src/app-window.vala:376
+msgid "Compression:"
+msgstr "Compresión:"
+
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/app-window.vala:470
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr "Ya existe un archivo llamado «%s». ¿Quiere reemplazarlo?"
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/app-window.vala:473
+msgid "_Replace"
+msgstr "_Reemplazar"
+
+#: src/app-window.vala:512
+msgid "Saving"
+msgstr "Guardando"
+
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/app-window.vala:527
 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
-msgid "If you don't save, changes will be permanently lost."
+#: src/app-window.vala:550
+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/app-window.vala:591
 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/app-window.vala:593
 msgid "Discard Changes"
 msgstr "Descartar cambios"
 
+#. Label shown when scan started
+#: src/app-window.vala:692
+msgid "Contacting scanner…"
+msgstr "Contactando con el escáner…"
+
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/app-window.vala:800
 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/app-window.vala:812
 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/app-window.vala:990
 msgid "Combine sides"
 msgstr "Combinar lados"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/app-window.vala:1000
 msgid "Combine sides (reverse)"
 msgstr "Combinar lados (invertido)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/app-window.vala:1010
 msgid "Reverse"
 msgstr "Invertir"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/app-window.vala:1020
 msgid "Keep unchanged"
 msgstr "Mantener sin cambios"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/app-window.vala:1250
 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/app-window.vala:1271
 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 +553,16 @@ msgstr ""
 "vea  <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/app-window.vala:1274
 msgid "About Simple Scan"
 msgstr "Acerca de Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/app-window.vala:1277
 msgid "Simple document scanning tool"
 msgstr "Herramienta sencilla para escanear documentos"
 
-#: ../src/ui.vala:1487
+#: src/app-window.vala:1286
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -585,200 +593,518 @@ msgstr ""
 "  hhlp https://launchpad.net/~hhlp-deactivatedaccount"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/app-window.vala:1308
 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
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:1310
 msgid "Quit without Saving"
 msgstr "Salir sin guardar"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/app-window.vala:1357
 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/app-window.vala:1359
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.brother.com\">Brother website</a>."
+"Drivers for this are available on the <a href=\"http://support.brother.com"
+"\">Brother website</a>."
 msgstr ""
 "En el <a href=\"http://support.brother.com\">sitio web de Brother</a> "
 "encontrará controladores."
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/app-window.vala:1363
 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/app-window.vala:1365
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://samsung.com/support\">Samsung website</a>."
+"Drivers for this are available on the <a href=\"http://samsung.com/support"
+"\">Samsung website</a>."
 msgstr ""
 "En el <a href=\"http://samsung.com/support\">sitio web de Samsung</a> "
 "encontrará controladores."
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/app-window.vala:1369
 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/app-window.vala:1374
 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/app-window.vala:1376
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.epson.com\">Epson website</a>."
+"Drivers for this are available on the <a href=\"http://support.epson.com"
+"\">Epson website</a>."
 msgstr ""
 "Visite el <a href=\"http://support.epson.com\">sitio web de Epson</a> para "
 "encontrar controladores."
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/app-window.vala:1380
 msgid "Install drivers"
 msgstr "Instalación de controladores"
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/app-window.vala:1411
 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
-msgid "Installing drivers..."
+#: src/app-window.vala:1423
+msgid "Installing drivers…"
 msgstr "Instalando los controladores…"
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/app-window.vala:1431
 msgid "Drivers installed successfully!"
 msgstr "Los controladores se instalaron correctamente."
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/app-window.vala:1441
 #, 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/app-window.vala:1447
 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/app-window.vala:1454
 #, c-format
-msgid "You need to install the %s package(s)."
-msgstr "Necesita instalar el paquete %s."
+msgid "You need to install the %s package."
+msgid_plural "You need to install the %s packages."
+msgstr[0] "Necesita instalar el paquete %s."
+msgstr[1] "Necesita instalar los paquetes %s."
+
+#. Title of preferences dialog
+#: src/app-window.vala:1568 src/app-window.vala:1591
+#: src/preferences-dialog.ui:53
+msgid "Preferences"
+msgstr "Preferencias"
+
+#: src/app-window.vala:1572
+msgid "Keyboard Shortcuts"
+msgstr "Atajos de teclado"
+
+#: src/app-window.vala:1573
+msgid "Help"
+msgstr "Ayuda"
+
+#: src/app-window.vala:1574
+msgid "About"
+msgstr "Acerca de"
+
+#: src/app-window.vala:1575
+msgid "Quit"
+msgstr "Salir"
+
+#: src/app-window.vala:1589
+msgid "Email"
+msgstr "Correo-e"
+
+#. Populate ActionBar (not supported in Glade)
+#. https://bugzilla.gnome.org/show_bug.cgi?id=769966
+#. Label on new document button
+#: src/app-window.vala:1599
+msgid "Start Again…"
+msgstr "Empezar de nuevo…"
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: src/app-window.vala:1616
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Girar la página a la izquierda (contrario a las agujas del reloj)"
+
+#. Tooltip for rotate right (clockwise) button
+#: src/app-window.vala:1623
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Girar la página a la derecha (sentido de las agujas del reloj)"
+
+#. Tooltip for crop button
+#: src/app-window.vala:1633
+msgid "Crop the selected page"
+msgstr "Recortar la página seleccionada"
+
+#. Tooltip for delete button
+#: src/app-window.vala:1649
+msgid "Delete the selected page"
+msgstr "Eliminar la página seleccionada"
+
+#. Text of button for cancelling save
+#: src/app-window.vala:1814
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. Button to submit authorization dialog
+#: src/authorize-dialog.ui:25
+msgid "_Authorize"
+msgstr "_Autorizar"
+
+#. Label beside username entry
+#: src/authorize-dialog.ui:99
+msgid "_Username for resource:"
+msgstr "Nombre de _usuario para el recurso:"
+
+#. Label beside password entry
+#: src/authorize-dialog.ui:112
+msgid "_Password:"
+msgstr "_Contraseña:"
+
+#: src/book.vala:331 src/book.vala:337
+#, c-format
+msgid "Unable to encode page %i"
+msgstr "No se pudo decodificar la página %i"
+
+#: src/help-overlay.ui:12
+msgctxt "shortcut window"
+msgid "Scanning"
+msgstr "Escaneando"
+
+#: src/help-overlay.ui:17
+msgctxt "shortcut window"
+msgid "Scan a single page"
+msgstr "Escanear una sola página"
+
+#: src/help-overlay.ui:24
+msgctxt "shortcut window"
+msgid "Scan all pages from document feeder"
+msgstr "Escanear todas las páginas desde el alimentador"
+
+#: src/help-overlay.ui:31
+msgctxt "shortcut window"
+msgid "Scan continuously from a flatbed scanner"
+msgstr "Escanear de manera continua desde un escáner plano"
+
+#: src/help-overlay.ui:38
+msgctxt "shortcut window"
+msgid "Stop scan in progress"
+msgstr "Detener escaneado en progreso"
+
+#: src/help-overlay.ui:46
+msgctxt "shortcut window"
+msgid "Document Modification"
+msgstr "Modificación de documentos"
+
+#: src/help-overlay.ui:51
+msgctxt "shortcut window"
+msgid "Move page left"
+msgstr "Mover la página a la izquierda"
+
+#: src/help-overlay.ui:58
+msgctxt "shortcut window"
+msgid "Move page right"
+msgstr "Mover la página a la derecha"
+
+#: src/help-overlay.ui:65
+msgctxt "shortcut window"
+msgid "Rotate page to the left (anti-clockwise)"
+msgstr "Girar la página a la izquierda (contrario a las agujas del reloj)"
+
+#: src/help-overlay.ui:72
+msgctxt "shortcut window"
+msgid "Rotate page to the right (clockwise)"
+msgstr "Girar la página a la derecha (sentido de las agujas del reloj)"
+
+#: src/help-overlay.ui:79
+msgctxt "shortcut window"
+msgid "Delete page"
+msgstr "Eliminar la página"
+
+#: src/help-overlay.ui:87
+msgctxt "shortcut window"
+msgid "Document Management"
+msgstr "Gestión de documentos"
+
+#: src/help-overlay.ui:92
+msgctxt "shortcut window"
+msgid "Start new document"
+msgstr "Iniciar un documento nuevo"
+
+#: src/help-overlay.ui:99
+msgctxt "shortcut window"
+msgid "Save scanned document"
+msgstr "Guardar documento escaneado"
+
+#: src/help-overlay.ui:106
+msgctxt "shortcut window"
+msgid "Email scanned document"
+msgstr "Enviar por correo-e el documento escaneado"
+
+#: src/help-overlay.ui:113
+msgctxt "shortcut window"
+msgid "Print scanned document"
+msgstr "Imprimir el documento escaneado"
+
+#: src/help-overlay.ui:120
+msgctxt "shortcut window"
+msgid "Copy current page to clipboard"
+msgstr "Copiar la página actual al portapapeles"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:113
+msgid "_Scanner"
+msgstr "_Escáner"
+
+#. Label beside scan side combo box
+#: src/preferences-dialog.ui:143
+msgid "Scan Sides"
+msgstr "Caras que escanear"
+
+#. Label beside page size combo box
+#: src/preferences-dialog.ui:160
+msgid "Page Size"
+msgstr "Tamaño de página"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:191
+msgid "Front"
+msgstr "Anverso"
+
+#. Preferences Dialog: Toggle button to select scanning on the back side of a page
+#: src/preferences-dialog.ui:206
+msgid "Back"
+msgstr "Reverso"
+
+#. Preferences Dialog: Toggle button to select scanning on both sides of a page
+#: src/preferences-dialog.ui:221
+msgid "Both"
+msgstr "Ambas"
+
+#. Label beside page delay scale
+#: src/preferences-dialog.ui:260
+msgid "Delay"
+msgstr "Retardo"
+
+#. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
+#: src/preferences-dialog.ui:276
+#| msgid "Multiple page from flatbed"
+msgid "Multiple pages from flatbed"
+msgstr "Varias páginas del alimentador"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:295
+msgid "3"
+msgstr "3"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:310
+msgid "5"
+msgstr "5"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:326
+msgid "7"
+msgstr "7"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:342
+msgid "10"
+msgstr "10"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:358
+msgid "15"
+msgstr "15"
+
+#. Label after page delay radio buttons
+#: src/preferences-dialog.ui:385
+msgid "Seconds"
+msgstr "Segundos"
+
+#. Preferences Dialog: Tab label for scanning settings
+#: src/preferences-dialog.ui:413
+msgid "Scanning"
+msgstr "Escaneando"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:436
+msgid "_Text Resolution"
+msgstr "Resolución del _texto"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:452
+msgid "_Photo Resolution"
+msgstr "Resolución de la _fotografía"
+
+#. Label beside brightness scale
+#: src/preferences-dialog.ui:505
+msgid "Brightness"
+msgstr "Brillo"
+
+#. Label beside contrast scale
+#: src/preferences-dialog.ui:521
+msgid "Contrast"
+msgstr "Contraste"
+
+#. Preferences Dialog: Tab for quality settings
+#: src/preferences-dialog.ui:576
+msgid "Quality"
+msgstr "Calidad"
+
+#. Combo box value for automatic paper size
+#: src/preferences-dialog.vala:77
+msgid "Automatic"
+msgstr "Automático"
+
+#: src/preferences-dialog.vala:116
+msgid "Darker"
+msgstr "Más oscuro"
+
+#: src/preferences-dialog.vala:118
+msgid "Lighter"
+msgstr "Más claro"
+
+#: src/preferences-dialog.vala:126
+msgid "Less"
+msgstr "Menos"
+
+#: src/preferences-dialog.vala:128
+msgid "More"
+msgstr "Más"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/preferences-dialog.vala:440
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d ppp (predeterminado)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/preferences-dialog.vala:443
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d ppp (borrador)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/preferences-dialog.vala:446
 #, 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/preferences-dialog.vala:449
 #, c-format
 msgid "%d dpi"
 msgstr "%d ppp"
 
-#: ../src/ui.vala:1835
-msgid "New Document"
-msgstr "Documento nuevo"
+#. Error displayed when no scanners to scan with
+#: src/scanner.vala:844
+msgid "No scanners available.  Please connect a scanner."
+msgstr "No hay escáneres disponibles. Conecte un escáner."
 
-#: ../src/ui.vala:1840
-msgid "Document"
-msgstr "Documento"
+#. Error displayed when cannot connect to scanner
+#: src/scanner.vala:874
+msgid "Unable to connect to scanner"
+msgstr "No se pudo conectar al escáner"
 
-#: ../src/ui.vala:1844
-msgid "Email..."
-msgstr "Correo..."
+#. Error display when unable to start scan
+#: src/scanner.vala:1227
+msgid "Unable to start scan"
+msgstr "Incapaz de iniciar el escaneo"
 
-#: ../src/ui.vala:1845
-msgid "Print..."
-msgstr "Imprimir…"
+#. Error displayed when communication with scanner broken
+#: src/scanner.vala:1240 src/scanner.vala:1340
+msgid "Error communicating with scanner"
+msgstr "Error al comunicarse con el escáner"
 
-#: ../src/ui.vala:1853
-msgid "Help"
-msgstr "Ayuda"
+#. Help string for command line --version flag
+#: src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "Mostrar el número de versión"
 
-#: ../src/ui.vala:1854
-msgid "About"
-msgstr "Acerca de"
+#. Help string for command line --debug flag
+#: src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Mostrar mensajes de depuración"
 
-#: ../src/ui.vala:1855
-msgid "Quit"
-msgstr "Salir"
+#: 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"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
-msgid "Change _Scanner"
-msgstr "Cambiar _escáner"
+#. Title of error dialog when scan failed
+#: src/simple-scan.vala:392
+msgid "Failed to scan"
+msgstr "Falló al escanear"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
-msgid "_Install Drivers"
-msgstr "_Instalar controladores"
+#. Attempt to inhibit the screensaver when scanning
+#: src/simple-scan.vala:407
+msgid "Scan in progress"
+msgstr "Escaneado en progreso"
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
-msgid "Automatic"
-msgstr "Automático"
+#. Arguments and description for --help text
+#: src/simple-scan.vala:584
+msgid "[DEVICE…] — Scanning utility"
+msgstr "[DISPOSITIVO…] - Utilidad de escaneo"
 
-#: ../src/ui.vala:1947
-msgid "Darker"
-msgstr "Más oscuro"
+#. Text printed out when an unknown command-line argument provided
+#: src/simple-scan.vala:595
+#, 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:1949
-msgid "Lighter"
-msgstr "Más claro"
+#~ msgid "Saving document…"
+#~ msgstr "Guardando el documento…"
 
-#: ../src/ui.vala:1957
-msgid "Less"
-msgstr "Menos"
+#~ msgid "Saving page %d out of %d"
+#~ msgstr "Guardando la página %d de %d"
 
-#: ../src/ui.vala:1959
-msgid "More"
-msgstr "Más"
+#~ msgid "Front and Back"
+#~ msgstr "Anverso y reverso"
 
-#: ../src/ui.vala:1967
-msgid "Minimum"
-msgstr "Mínima"
+#~ msgid "New"
+#~ msgstr "Nuevo"
 
-#: ../src/ui.vala:1969
-msgid "Maximum"
-msgstr "Máxima"
+#~ msgid "Rotate Left"
+#~ msgstr "Girar a la izquierda"
 
-#: ../src/ui.vala:2008
-msgid "Saving document..."
-msgstr "Guardando el documento…"
+#~ msgid "Rotate Right"
+#~ msgstr "Girar a la derecha"
 
-#: ../src/ui.vala:2173
-#, c-format
-msgid "Saving page %d out of %d"
-msgstr "Guardando la página %d de %d"
+#~ msgid "Crop"
+#~ msgstr "Recortar"
+
+#~ msgid "Scan S_ource:"
+#~ msgstr "_Origen de escaneo:"
+
+#~ msgid "New Document"
+#~ msgstr "Documento nuevo"
+
+#~ msgid "Document"
+#~ msgstr "Documento"
+
+#~| msgid "_Email"
+#~ msgid "Email…"
+#~ msgstr "Correo electrónico…"
+
+#~| msgid "Print..."
+#~ msgid "Print…"
+#~ msgstr "Imprimir…"
+
+#~ msgid "_Install Drivers"
+#~ msgstr "_Instalar controladores"
+
+#~ msgid "Minimum"
+#~ msgstr "Mínima"
+
+#~ msgid "Maximum"
+#~ msgstr "Máxima"
+
+#~ msgid "Email..."
+#~ msgstr "Correo..."
 
-#, c-format
 #~ msgid ""
 #~ "GTK+ Options:\n"
 #~ "  --class=CLASS                   Program class as used by the window "
@@ -807,7 +1133,6 @@ msgstr "Guardando la página %d de %d"
 #~ msgid "Files missing"
 #~ msgstr "Faltan archivos"
 
-#, c-format
 #~ msgid ""
 #~ "Usage:\n"
 #~ "  %s [DEVICE...] - Scanning utility"
@@ -824,36 +1149,28 @@ msgstr "Guardando la página %d de %d"
 #~ msgid "Height of scanned image in pixels"
 #~ msgstr "Altura de la imagen escaneada en píxeles"
 
-#~ msgid "Device to scan from"
-#~ msgstr "Para escanear desde el dispositivo"
-
 #~ msgid ""
-#~ "The direction of the scanner across the scanned page. It can be one of the "
-#~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+#~ "The direction of the scanner across the scanned page. It can be one of "
+#~ "the following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-"
+#~ "left'"
 #~ msgstr ""
 #~ "La dirección del escáner a través de la página escaneada. Puede ser "
 #~ "cualquiera de los siguientes: 'top-to-bottom' 'bottom-to-top' 'left-to-"
 #~ "right' 'right-to-left'"
 
-#~ msgid "Type of document being scanned"
-#~ msgstr "Tipo de documento que está siendo escaneado"
-
 #~ msgid ""
-#~ "The width of scanned image in pixels. This value is updated to what the last "
-#~ "scanned page was."
+#~ "The width of scanned image in pixels. This value is updated to what the "
+#~ "last scanned page was."
 #~ msgstr ""
-#~ "La anchura de la imagen escaneada. Este valor se actualiza con el que tuvo "
-#~ "la última página escaneada"
+#~ "La anchura de la imagen escaneada. Este valor se actualiza con el que "
+#~ "tuvo la última página escaneada"
 
 #~ msgid ""
 #~ "The height of scanned image in pixels. This value is updated to what the "
 #~ "last scanned page was."
 #~ msgstr ""
-#~ "La altura de la imagen escaneada. Este valor se actualiza con el que tuvo la "
-#~ "última página escaneada"
-
-#~ msgid "SANE device to acquire images from."
-#~ msgstr "Dispositivo SANE desde donde adquirir las imágenes."
+#~ "La altura de la imagen escaneada. Este valor se actualiza con el que tuvo "
+#~ "la última página escaneada"
 
 #~ msgid "Width of scanned image in pixels"
 #~ msgstr "Anchura de la imagen escaneada"
@@ -864,7 +1181,6 @@ msgstr "Guardando la página %d de %d"
 #~ msgid "Window width in pixels"
 #~ msgstr "Anchura de la ventana en píxeles"
 
-#, c-format
 #~ msgid ""
 #~ "Help Options:\n"
 #~ "  -d, --debug                     Print debugging messages\n"
@@ -883,9 +1199,6 @@ msgstr "Guardando la página %d de %d"
 #~ msgid "TRUE if the application window is maximized"
 #~ msgstr "VERDADERO si la ventana de la aplicación está maximizada"
 
-#~ msgid "Resolution for text scans"
-#~ msgstr "Resolución para los escaneados de texto"
-
 #~ msgid "Resolution of last scanned image"
 #~ msgstr "Resolución de la última imagen escaneada"
 
@@ -893,12 +1206,6 @@ msgstr "Guardando la página %d de %d"
 #~ msgstr ""
 #~ "La resolución en puntos por pulgada de la imagen escaneada anteriormente."
 
-#~ msgid "The resolution in dots-per-inch to use when scanning text."
-#~ msgstr "La resolución en puntos por pulgada a usar al escanear texto."
-
-#~ msgid "The resolution in dots-per-inch to use when scanning photos."
-#~ msgstr "La resolución en puntos por pulgada a usar al escanear fotografías."
-
 #~ msgid "Select File _Type"
 #~ msgstr "Seleccione el _tipo de archivo"
 
@@ -907,80 +1214,16 @@ msgstr "Guardando la página %d de %d"
 #~ "photos. This setting decides on the scan resolution, colors and post-"
 #~ "processing."
 #~ msgstr ""
-#~ "Tipo del documento que va a ser escaneado. «Texto» para documentos de texto, "
-#~ "«Fotografía» para fotografías. Esta opción determina la resolución, los "
-#~ "colores y el post-procesamiento del escaneado."
-
-#~ msgid "Resolution for photo scans"
-#~ msgstr "Resolución para los escaneados de fotografías"
-
-#~ msgid "Scanned Document"
-#~ msgstr "Documento escaneado"
-
-#~ msgid ""
-#~ "The directory to save files to. Defaults to the documents directory if unset."
-#~ msgstr ""
-#~ "El directorio en el que se guardarán los archivos. Por defecto será el "
-#~ "directorio de documentos."
-
-#~ msgid "Directory to save files to"
-#~ msgstr "Directorio en el que guardar los archivos"
-
-#~ msgid "Page side to scan"
-#~ msgstr "Cara a escanear de la página"
-
-#~ msgid ""
-#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
-#~ msgstr ""
-#~ "La altura del papel en décimas de mm (0 para detección automática del papel)."
-
-#~ msgid "Height of paper in tenths of a mm"
-#~ msgstr "Altura del papel en décimas de mm"
-
-#~ msgid ""
-#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
-#~ msgstr ""
-#~ "La anchura del papel en décimas de mm (0 para detección automática del "
-#~ "papel)."
-
-#~ msgid "Width of paper in tenths of a mm"
-#~ msgstr "Anchura del papel en décimas de mm"
-
-#~ msgid ""
-#~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
-#~ msgstr ""
-#~ "La cara a escanear de la página. Puede ser uno de los siguientes: «ambas», "
-#~ "«anverso» o «reverso»."
-
-#~ msgid "The page side to scan."
-#~ msgstr "El lado de la página a escanear."
+#~ "Tipo del documento que va a ser escaneado. «Texto» para documentos de "
+#~ "texto, «Fotografía» para fotografías. Esta opción determina la "
+#~ "resolución, los colores y el post-procesamiento del escaneado."
 
 #~ msgid ""
-#~ "Type of document being scanned. This setting decides on the scan resolution, "
-#~ "colors and post-processing."
+#~ "The page side to scan. It can be one of the following: 'both' 'front' "
+#~ "'back'"
 #~ msgstr ""
-#~ "Tipo de documento escaneándose. Esta configuración establece la resolución "
-#~ "de escaneo, colores y post-procesamiento."
+#~ "La cara a escanear de la página. Puede ser uno de los siguientes: "
+#~ "«ambas», «anverso» o «reverso»."
 
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "La dirección del escáner a través de la página escaneada."
-
-#~ msgid "Brightness of scan"
-#~ msgstr "Brillo de escaneo"
-
-#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
-#~ msgstr "Ajuste del brillo desde -100 a 100 (siendo 0 sin ajuste)."
-
-#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
-#~ msgstr "Ajuste de contraste desde -100 a 100 (siendo 0 sin ajuste)."
-
-#~ msgid "Quality value to use for JPEG compression."
-#~ msgstr "Calidad de la compresión de JPEG."
-
-#~ msgid "Quality value to use for JPEG compression"
-#~ msgstr "Calidad de la compresión de JPEG"
-
-#~ msgid "Contrast of scan"
-#~ msgstr "Contraste del escaneo"
diff --git a/po/et.gmo b/po/et.gmo
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..0007d99 100644
--- a/po/et.po
+++ b/po/et.po
@@ -7,296 +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 08:59+0000\n"
+"POT-Creation-Date: 2017-04-16 08:54-0400\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"
+"Language: et\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-25 06:10+0000\n"
+"X-Generator: Launchpad (build 18361)\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:231 src/simple-scan.ui:815 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:247
 msgid "_Document"
 msgstr "_Dokument"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/simple-scan.ui:266
 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:279 src/simple-scan.ui:1343 src/simple-scan.ui:1402
 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:289 src/simple-scan.ui:1352 src/simple-scan.ui:1411
 msgid "All Pages From _Feeder"
 msgstr "Kõik lehed _söötjast"
 
+#. 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 "_Lõpeta skannimine"
 
-#: 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 "Tekst"
 
-#: 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 "Foto"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: 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 "_E-post"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:436
 msgid "_Page"
 msgstr "_Lehekülg"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:446
 msgid "Rotate _Left"
 msgstr "Pööra _vasakule"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:456
 msgid "Rotate _Right"
 msgstr "Pööra _paremale"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:466
 msgid "_Crop"
 msgstr "_Kärbi"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:476
 msgid "_None"
 msgstr "_Puudub"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:487
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:498
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:509
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:520
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:531
 msgid "Le_gal"
 msgstr "US _Legal"
 
 #. 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 "_Kohandatud"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:571
 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:584
 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:593
 msgid "Move Right"
 msgstr ""
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:630
 msgid "_Help"
 msgstr "A_bi"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:638
 msgid "_Contents"
 msgstr "_Sisu"
 
 #. 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 "Uue dokumendi alustamine"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:681
 msgid "New"
 msgstr "Uus"
 
 #. 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 "Ühe lehekülje skannimine skannerist"
 
 #. 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 "Skanni"
 
 #. 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 "Dokumendi salvestamine faili"
 
-#: ../src/ui.vala:1842
+#: src/simple-scan.ui:715 src/ui.vala:1892
 msgid "Save"
 msgstr "Salvesta"
 
 #. 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 "Selle skannimise lõpetamine"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:731 src/simple-scan.ui:831
 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:755 src/simple-scan.ui:942
 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:756
 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:770 src/simple-scan.ui:920
 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:771
 msgid "Rotate Right"
 msgstr "Paremale pööramine"
 
-#: 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 "Valitud lehekülje kärpimine"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:787
 msgid "Crop"
 msgstr "Kärbi"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:1003 src/ui.vala:1898
 msgid "Preferences"
 msgstr "Eelistused"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1054
 msgid "Scan S_ource:"
 msgstr "Skannimise _allikas:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1085
 msgid "_Text Resolution:"
 msgstr "_Teksti eraldusvõime:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1101
 msgid "_Photo Resolution:"
 msgstr "_Foto eraldusvõime:"
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1145
 msgid "Scan Side:"
 msgstr "Slaidi skannimine:"
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1175
 msgid "Page Size:"
 msgstr "Lehekülje suurus:"
 
 #. 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 "Dokumentide skannimine"
 
@@ -308,7 +322,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 +330,207 @@ 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:844
 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:874
 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:1227
 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:1240 src/scanner.vala:1340
 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:332 src/ui.vala:1655 src/ui.vala:1935
 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:341
 #, 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:389
 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:391
 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:396
 msgid "Additional software needed"
 msgstr ""
 
 #. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:398
 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:510
 msgid "Save As..."
 msgstr "Salvesta kui..."
 
-#: ../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 ""
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:522
 msgid "Scanned Document.pdf"
 msgstr "Skannitud dokument.pdf"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:528
 msgid "Image Files"
 msgstr "Pildifailid"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:534
 msgid "All Files"
 msgstr "Kõik failid"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:543
 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:549
 msgid "JPEG (compressed)"
 msgstr "JPEG (tihendatud)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:555
 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: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:650
+#: src/ui.vala:698
 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:721
 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:763
 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:765
 msgid "Discard Changes"
 msgstr "Tühista muudatused"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:1056
 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:1068
 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:1270
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1280
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1290
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1300
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1504
 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: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"
@@ -535,16 +560,16 @@ msgstr ""
 "<http://www.gnu.org/licences/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1528
 msgid "About Simple Scan"
 msgstr "Lihtsast skannijast lähemalt"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1531
 msgid "Simple document scanning tool"
 msgstr "Lihtne dokumendi skaneerimise tööriist"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1540
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -553,189 +578,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:1562
 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:1564
 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:1632
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1634
 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:1638
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1640
 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:1644
 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:1649
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1651
 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:1655
 msgid "Install drivers"
 msgstr ""
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1686
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1698
 msgid "Installing drivers..."
 msgstr ""
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1706
 msgid "Drivers installed successfully!"
 msgstr ""
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1716
 #, 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:1722
 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:1729
 #, 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:1833
 #, 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:1836
 #, 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:1839
 #, 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:1842
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../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 ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1937
 msgid "Change _Scanner"
 msgstr "_Skanneri vahetamine"
 
 #. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1939
 msgid "_Install Drivers"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1945
 msgid "Automatic"
 msgstr "Automaatne"
 
-#: ../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 "Dokumendi salvestamine..."
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2242
 #, 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..79087f1 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -1,517 +1,535 @@
 # Basque translation for simple-scan
 # Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
 # This file is distributed under the same license as the simple-scan package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
 #
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
+# Iñaki Larrañaga Murgoitio <dooteo@zundan.com>, 2017.
 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: 2017-01-25 12:52+0000\n"
-"Last-Translator: Ander Elortondo <ander.elor@gmail.com>\n"
-"Language-Team: Basque <eu@li.org>\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
+"product=simple-scan&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-08-13 21:51+0000\n"
+"PO-Revision-Date: 2017-08-27 17:54+0200\n"
+"Last-Translator: Iñaki Larrañaga Murgoitio <dooteo@zundan.com>\n"
+"Language-Team: Basque <librezale@librezale.eus>\n"
+"Language: eu\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-25 06:09+0000\n"
+"X-Generator: Lokalize 1.5\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#. Button to submit authorization dialog
-#: data/simple-scan.ui:24
-msgid "_Authorize"
-msgstr "_Baimendu"
+#: data/org.gnome.SimpleScan.gschema.xml:11
+msgid "Device to scan from"
+msgstr "Eskaneatze-gailua"
 
-#. Label beside username entry
-#: data/simple-scan.ui:102
-msgid "_Username for resource:"
-msgstr "_Erabiltzaile-izena baliabiderako:"
+#: data/org.gnome.SimpleScan.gschema.xml:12
+msgid "SANE device to acquire images from."
+msgstr "Irudiak eskuratzeko erabiliko den SANE gailua."
 
-#. Label beside password entry
-#: data/simple-scan.ui:117
-msgid "_Password:"
-msgstr "_Pasahitza:"
+#: data/org.gnome.SimpleScan.gschema.xml:20
+msgid "Type of document being scanned"
+msgstr "Eskaneatuko den dokumentu-mota"
+
+#: data/org.gnome.SimpleScan.gschema.xml:21
+msgid ""
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+msgstr ""
+"Eskaneatuko den dokumentu-mota. Ezarpen honek eskaneatzearen bereizmena, "
+"koloreak eta posprozesatzea finkatzen du."
 
-#. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
-msgid "Front and Back"
-msgstr "Aurrealdea eta atzealdea"
+#: data/org.gnome.SimpleScan.gschema.xml:25
+msgid "Width of paper in tenths of a mm"
+msgstr "Paperaren zabalera mm hamarrenetan"
 
-#. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
-msgid "Front"
-msgstr "Aurrealdea"
+#: data/org.gnome.SimpleScan.gschema.xml:26
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"Eskaneatutako paperaren zabalera milimetro hamarrenetan (edo 0 paperaren "
+"detekzio automatikorako)."
 
-#. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
-msgid "Back"
-msgstr "Atzealdea"
+#: data/org.gnome.SimpleScan.gschema.xml:30
+msgid "Height of paper in tenths of a mm"
+msgstr "Paperaren altuera mm hamarrenetan"
+
+#: data/org.gnome.SimpleScan.gschema.xml:31
+msgid ""
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"Eskaneatutako paperaren altuera milimetro hamarrenetan (edo 0 paperaren "
+"detekzio automatikorako)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:35
+msgid "Brightness of scan"
+msgstr "Eskanerraren distira"
 
+#: data/org.gnome.SimpleScan.gschema.xml:36
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr "Distiraren doiketa, -100etik 100era (0 = distirarik ez)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:40
+msgid "Contrast of scan"
+msgstr "Eskanerraren kontrastea"
+
+#: data/org.gnome.SimpleScan.gschema.xml:41
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr "Kontrastearen doiketa, -100etik 100era (0 = kontrasterik ez)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:45
+msgid "Resolution for text scans"
+msgstr "Bereizmena testuen eskaneatzerako"
+
+#: data/org.gnome.SimpleScan.gschema.xml:46
+msgid "The resolution in dots-per-inch to use when scanning text."
+msgstr "Testua eskaneatzen erabiliko den bereizmena (puntuak hazbeteko)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:50
+msgid "Resolution for photo scans"
+msgstr "Bereizmena argazkien eskaneatzerako"
+
+#: data/org.gnome.SimpleScan.gschema.xml:51
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr "Argazkiak eskaneatzen erabiliko den bereizmena (puntuak hazbeteko)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:55
+msgid "Page side to scan"
+msgstr "Eskaneatuko den aldea"
+
+#: data/org.gnome.SimpleScan.gschema.xml:56
+msgid "The page side to scan."
+msgstr "Eskaneatuko den orrialdea."
+
+#: data/org.gnome.SimpleScan.gschema.xml:60
+msgid "Directory to save files to"
+msgstr "Fitxategiak gordetzeko direktorioa"
+
+#: data/org.gnome.SimpleScan.gschema.xml:61
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+"Fitxategiak gordeko diren direktorioa. Ez bada ezer ezartzen, balio "
+"lehenetsia dokumentuen direktorioa da."
+
+#: data/org.gnome.SimpleScan.gschema.xml:66
+msgid "Quality value to use for JPEG compression"
+msgstr "Kalitatearen balioa, JPEG konpresioan erabiltzeko"
+
+#: data/org.gnome.SimpleScan.gschema.xml:67
+msgid "Quality value to use for JPEG compression."
+msgstr "Kalitatearen balioa, JPEG konpresioan erabiltzeko."
+
+#: data/org.gnome.SimpleScan.gschema.xml:72
+msgid "Delay in millisecond between pages"
+msgstr "Orrien arteko atzerapena (milisegundotan)"
+
+#: data/org.gnome.SimpleScan.gschema.xml:73
+msgid "Delay in millisecond between pages."
+msgstr "Orrien arteko atzerapena (milisegundotan)."
+
+#. Title of scan window
+#. Set HeaderBar title here because Glade doesn't keep it translated
+#. https://bugzilla.gnome.org/show_bug.cgi?id=782753
 #. 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
+#: data/simple-scan.appdata.xml.in:6 data/simple-scan.desktop.in:3
+#: src/app-window.ui:76 src/app-window.vala:1560
 msgid "Simple Scan"
 msgstr "Simple Scan"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
-msgid "_Document"
-msgstr "_Dokumentua"
+#: data/simple-scan.appdata.xml.in:7 data/simple-scan.desktop.in:5
+msgid "Scan Documents"
+msgstr "Eskaneatu dokumentuak"
 
-#. Scan menu item
-#: data/simple-scan.ui:260
-msgid "Sc_an"
-msgstr "Es_kaneatu"
+#: 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 "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+"Modu benetan erraza dokumentuak zein argazkiak eskaneatzeko. Argazki baten "
+"parte txarrak ebaki eta"
+
+#: data/simple-scan.appdata.xml.in:14
+msgid "Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+"Simple Scan SANE framework erabiltzen du dauden eskaner gehienei sostengua "
+"emateko."
+
+#: data/simple-scan.desktop.in:4
+msgid "Document Scanner"
+msgstr "Dokumentuen eskanerra"
+
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: data/simple-scan.desktop.in:7
+msgid "scan;scanner;flatbed;adf;"
+msgstr ""
+"eskaneatu;eskanerra;eskanerreko_kristala;Dokumentu_elikatze_automatiko;"
 
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: data/simple-scan.desktop.in:10
+msgid "scanner"
+msgstr "scanner"
+
+#. Toolbar scan menu item to scan a single page from the scanner
 #. 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/app-window.ui:22 src/app-window.ui:123 src/app-window.ui:820
 msgid "Single _Page"
 msgstr "_Orrialde bakarra"
 
+#. Toolbar scan menu item to scan all pages from a document feeder
 #. 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/app-window.ui:31 src/app-window.ui:133 src/app-window.ui:829
 msgid "All Pages From _Feeder"
 msgstr "_Elikagailuko orri guztiak"
 
-#. Menu entry to stop current scan
-#: data/simple-scan.ui:294
-msgid "_Stop Scan"
-msgstr "_Gelditu eskaneatzea"
+#. Toolbar scan menu item to scan continuously from the flatbed
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/app-window.ui:40 src/app-window.ui:143 src/app-window.ui:838
+msgid "_Multiple Pages From Flatbed"
+msgstr "_Hainbat orri eskaner lautik"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:853
 msgid "Text"
 msgstr "Testua"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:863
 msgid "Photo"
 msgstr "Argazkia"
 
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: src/app-window.ui:91
+msgid "_Document"
+msgstr "_Dokumentua"
+
+#. Scan menu item
+#: src/app-window.ui:110
+msgid "Sc_an"
+msgstr "Es_kaneatu"
+
+#. Menu entry to stop current scan
+#: src/app-window.ui:154
+msgid "_Stop Scan"
+msgstr "_Gelditu eskaneatzea"
+
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/app-window.ui:196 src/app-window.vala:967 src/app-window.vala:1590
 msgid "Reorder Pages"
 msgstr "Berrordenatu orrialdeak"
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/app-window.ui:215
 msgid "_Email"
 msgstr "_Posta elektronikoa"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/app-window.ui:280
 msgid "_Page"
 msgstr "_Orrialdea"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/app-window.ui:290
 msgid "Rotate _Left"
 msgstr "Biratu e_zkerrera"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/app-window.ui:300
 msgid "Rotate _Right"
 msgstr "Biratu e_skuinera"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/app-window.ui:310
 msgid "_Crop"
 msgstr "_Moztu"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/app-window.ui:320
 msgid "_None"
 msgstr "_Bat ere ez"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/app-window.ui:331
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/app-window.ui:342
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/app-window.ui:353
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/app-window.ui:364
 msgid "_Letter"
 msgstr "AEBetako gutuna"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/app-window.ui:375
 msgid "Le_gal"
 msgstr "AEBetako le_gala"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/app-window.ui:386
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/app-window.ui:397
 msgid "_Custom"
 msgstr "_Pertsonalizatua"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/app-window.ui:415
 msgid "_Rotate Crop"
 msgstr "_Biratu mozketa"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/app-window.ui:428
 msgid "Move Left"
 msgstr "Mugitu ezkerrera"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/app-window.ui:437
 msgid "Move Right"
 msgstr "Mugitu eskuinera"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/app-window.ui:474
 msgid "_Help"
 msgstr "_Laguntza"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/app-window.ui:482
 msgid "_Contents"
 msgstr "_Edukiak"
 
-#. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
-msgid "Start a new document"
-msgstr "Hasi dokumentu berria"
-
-#: data/simple-scan.ui:675
-msgid "New"
-msgstr "Berria"
-
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/app-window.ui:520 src/app-window.ui:720
 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/app-window.ui:522 src/app-window.ui:716
 msgid "Scan"
 msgstr "Eskaneatu"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/app-window.ui:538 src/app-window.ui:787
 msgid "Save document to a file"
 msgstr "Gorde dokumentua fitxategi batean"
 
-#: ../src/ui.vala:1842
+#: src/app-window.ui:540
 msgid "Save"
 msgstr "Gorde"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/app-window.ui:555 src/app-window.ui:700
 msgid "Stop the current scan"
 msgstr "Gelditu uneko eskaneatzea"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/app-window.ui:556 src/app-window.ui:697
 msgid "Stop"
 msgstr "Gelditu"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "Biratu orrialdea ezkerrera (erlojuaren kontrako noranzkoan)"
-
-#. Label on rotate page left (anti-clockwise) item
-#: data/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
-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
-msgid "Rotate Right"
-msgstr "Biratu eskuinera"
-
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
-msgid "Crop the selected page"
-msgstr "Moztu hautatutako orrialdea"
-
-#: data/simple-scan.ui:781
-msgid "Crop"
-msgstr "Moztu"
-
-#: ../src/ui.vala:1849
-msgid "Preferences"
-msgstr "Hobespenak"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1048
-msgid "Scan S_ource:"
-msgstr "Eskaneatze-_jatorria:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1079
-msgid "_Text Resolution:"
-msgstr "_Testu-bereizmena:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1095
-msgid "_Photo Resolution:"
-msgstr "Ar_gazki-bereizmena:"
-
-#. Label beside scan side combo box
-#: data/simple-scan.ui:1139
-msgid "Scan Side:"
-msgstr "Eskaneatze-aldea:"
+#. Label shown when searching for scanners
+#: src/app-window.ui:611
+msgid "Searching for Scanners…"
+msgstr "Eskanerrak bilatzen…"
 
-#. Label beside page size combo box
-#: data/simple-scan.ui:1169
-msgid "Page Size:"
-msgstr "Orrialde-tamaina:"
-
-#. Label beside brightness scale
-#: data/simple-scan.ui:1199
-msgid "Brightness:"
-msgstr "Distira:"
-
-#. Label beside contrast scale
-#: data/simple-scan.ui:1229
-msgid "Contrast:"
-msgstr "Kontrastea:"
-
-#. Label beside quality scale
-#: data/simple-scan.ui:1260
-msgid "Quality:"
-msgstr "Kalitatea:"
-
-#: data/simple-scan.desktop.in:4
-msgid "Document Scanner"
-msgstr "Dokumentuen eskanerra"
-
-#: data/simple-scan.desktop.in:5
-msgid "Scan Documents"
-msgstr "Eskaneatu dokumentuak"
+#: src/app-window.vala:237 src/app-window.vala:1380
+msgid "_Close"
+msgstr "_Itxi"
 
-#: data/simple-scan.desktop.in:6
-msgid "scan;scanner;flatbed;adf;"
-msgstr ""
-"eskaneatu;eskanerra;eskanerreko_kristala;Dokumentu_elikatze_automatiko;"
+#. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
+#: src/app-window.vala:246
+#, c-format
+#| msgid "Username and password required to access '%s'"
+msgid "Username and password required to access “%s”"
+msgstr "Erabiltzaile-izena eta pasahitza behar dira “%s” atzitzeko"
 
-#: data/simple-scan.desktop.in:8
-msgid "scanner"
-msgstr "eskanerra"
+#. Label shown when detected a scanner
+#: src/app-window.vala:266 src/app-window.vala:584
+#| msgid "Failed to scan"
+msgid "Ready to Scan"
+msgstr "Eskaneatzeko prest"
 
-#: data/simple-scan.appdata.xml.in:8
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-"Modu benetan erraza dokumentuak zein argazkiak eskaneatzeko. Argazki baten "
-"parte txarrak ebaki eta"
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: src/app-window.vala:273
+msgid "Additional software needed"
+msgstr "Software gehiago behar da"
 
-#: data/simple-scan.appdata.xml.in:13
+#. Instructions to install driver software
+#: src/app-window.vala:275
+#| msgid "You need to install driver software for your scanner."
 msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
+"You need to <a href=\"install-firmware\">install driver software</a> for "
+"your scanner."
 msgstr ""
-"Simple Scan SANE framework erabiltzen du dauden eskaner gehienei sostengua "
-"emateko."
-
-#. Error displayed when no scanners to scan with
-#: ../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
-msgid "Unable to connect to scanner"
-msgstr "Ezin da eskanerrarekin konektatu"
-
-#. Error display when unable to start scan
-#: ../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
-msgid "Error communicating with scanner"
-msgstr "Errorea eskanerrarekin komunikatzean"
-
-#. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
-msgid "Show release version"
-msgstr "Erakutsi bertsioa"
-
-#. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
-msgid "Print debugging messages"
-msgstr "Inprimatu arazketa-mezuak"
-
-#: ../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
-msgid "Failed to scan"
-msgstr "Ezin izan da eskaneatu"
-
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
-msgid "[DEVICE...] - Scanning utility"
-msgstr "[DEVICE...] - Eskaneatze-aplikazioa"
-
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
-#, 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
-msgid "_Close"
-msgstr "_Itxi"
-
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
-#, c-format
-msgid "Username and password required to access '%s'"
-msgstr "Erabiltzaile-izena eta pasahitza behar dira '%s' atzitzeko"
+"Zure eskanerrentzako <a href=\"install-firmware\">kontrolatzaile softwarea "
+"instalatu</a> behar duzu."
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/app-window.vala:281
 msgid "No scanners detected"
 msgstr "Ez da eskanerrik detektatu"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/app-window.vala:283
 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
-msgid "Additional software needed"
-msgstr "Software gehiago behar da"
-
-#. Instructions to install driver software
-#: ../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
-msgid "Save As..."
-msgstr "Gorde honela..."
+#: src/app-window.vala:298
+#| msgid "Save As..."
+msgid "Save As…"
+msgstr "Gorde honela…"
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/app-window.vala:301 src/app-window.vala:471 src/app-window.vala:552
 msgid "_Cancel"
 msgstr "_Utzi"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/app-window.vala:302 src/app-window.vala:553
 msgid "_Save"
 msgstr "_Gorde"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/app-window.vala:310
 msgid "Scanned Document.pdf"
-msgstr "Dokumetu eskaneatua.pdf"
+msgstr "Dokumentu eskaneatua.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#. Save dialog: Filter name to show only supported image files
+#: src/app-window.vala:316
 msgid "Image Files"
 msgstr "Irudi-fitxategiak"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/app-window.vala:326
 msgid "All Files"
 msgstr "Fitxategi guztiak"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/app-window.vala:335
 msgid "PDF (multi-page document)"
 msgstr "PDF (orrialde anitzeko dokumentua)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/app-window.vala:341
 msgid "JPEG (compressed)"
 msgstr "JPEG (konprimitua)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/app-window.vala:347
 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
+#. Save dialog: Label for sabing in WEBP format
+#: src/app-window.vala:354
+#| msgid "JPEG (compressed)"
+msgid "WebP (compressed)"
+msgstr "WebP (konprimitua)"
+
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
+#: src/app-window.vala:364
 msgid "File format:"
 msgstr "Fitxategi-formatua:"
 
+#. Label in save dialog beside compression slider
+#: src/app-window.vala:376
+msgid "Compression:"
+msgstr "Konpresioa:"
+
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/app-window.vala:470
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr "“%s” izeneko fitxategia badago lehendik ere. Ordeztea nahi duzu?"
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/app-window.vala:473
+msgid "_Replace"
+msgstr "_Ordeztu"
+
+#: src/app-window.vala:512
+msgid "Saving"
+msgstr "Gordetzen"
+
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/app-window.vala:527
 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
-msgid "If you don't save, changes will be permanently lost."
+#: src/app-window.vala:550
+#| msgid "If you don't save, changes will be permanently lost."
+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/app-window.vala:591
 msgid "Save current document?"
 msgstr "Gorde uneko dokumentua?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/app-window.vala:593
 msgid "Discard Changes"
 msgstr "Baztertu aldaketak"
 
+#. Label shown when scan started
+#: src/app-window.vala:692
+#| msgid "Change _Scanner"
+msgid "Contacting scanner…"
+msgstr "Eskanerrarekin harremanetan jartzen…"
+
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/app-window.vala:800
 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/app-window.vala:812
 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/app-window.vala:990
 msgid "Combine sides"
 msgstr "Konbinatu aldeak"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/app-window.vala:1000
 msgid "Combine sides (reverse)"
 msgstr "Konbinatu aldeak (alderantziz)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/app-window.vala:1010
 msgid "Reverse"
 msgstr "Alderantziz"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/app-window.vala:1020
 msgid "Keep unchanged"
 msgstr "Mantendu aldatu gabe"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/app-window.vala:1250
 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/app-window.vala:1271
 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 +558,16 @@ msgstr ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/app-window.vala:1274
 msgid "About Simple Scan"
 msgstr "Simple Scan-i buruz"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/app-window.vala:1277
 msgid "Simple document scanning tool"
 msgstr "Dokumentuak eskaneatzeko tresna sinplea"
 
-#: ../src/ui.vala:1487
+#: src/app-window.vala:1286
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -566,198 +584,542 @@ msgstr ""
 "  gorkaazk https://launchpad.net/~gorkaazkarate"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/app-window.vala:1308
 msgid "Save document before quitting?"
 msgstr "Gorde dokumentua irten baino lehen?"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:1310
 msgid "Quit without Saving"
 msgstr "Irten gorde gabe"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/app-window.vala:1357
 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/app-window.vala:1359
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.brother.com\">Brother website</a>."
+"Drivers for this are available on the <a href=\"http://support.brother.com"
+"\">Brother website</a>."
 msgstr ""
 "Honentzako kontrolatzaileak  <a href=\"http://support.brother.com\">Brother "
 "webgunean</a> erabilgarri daude."
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/app-window.vala:1363
 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/app-window.vala:1365
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://samsung.com/support\">Samsung website</a>."
+"Drivers for this are available on the <a href=\"http://samsung.com/support"
+"\">Samsung website</a>."
 msgstr ""
 "Honentzako kontrolatzaileak <a href=\"http://samsung.com/support\">Samsung "
 "webgunean</a> erabilgarri daude."
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/app-window.vala:1369
 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/app-window.vala:1374
 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/app-window.vala:1376
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.epson.com\">Epson website</a>."
+"Drivers for this are available on the <a href=\"http://support.epson.com"
+"\">Epson website</a>."
 msgstr ""
 "Honentzako kontrolatzaileak <a href=\"http://support.epson.com\">Epson "
 "webgunean</a> erabilgarri daude."
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/app-window.vala:1380
 msgid "Install drivers"
 msgstr "Instalatu kontrolatzaileak"
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/app-window.vala:1411
 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
-msgid "Installing drivers..."
-msgstr "Kontrolatzaileak instalatzen..."
+#: src/app-window.vala:1423
+#| msgid "Installing drivers..."
+msgid "Installing drivers…"
+msgstr "Kontrolatzaileak instalatzen…"
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/app-window.vala:1431
 msgid "Drivers installed successfully!"
 msgstr "Kontrolatzaileak ondo instalatu dira!"
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/app-window.vala:1441
 #, 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/app-window.vala:1447
 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/app-window.vala:1454
+#, c-format
+#| msgid "You need to install the %s package(s)."
+msgid "You need to install the %s package."
+msgid_plural "You need to install the %s packages."
+msgstr[0] "%s paketea instalatu behar duzu."
+msgstr[1] "%s paketeak instalatu behar dituzu."
+
+#. Title of preferences dialog
+#: src/app-window.vala:1568 src/app-window.vala:1591
+#: src/preferences-dialog.ui:53
+msgid "Preferences"
+msgstr "Hobespenak"
+
+#: src/app-window.vala:1572
+msgid "Keyboard Shortcuts"
+msgstr "Laster-teklak"
+
+#: src/app-window.vala:1573
+msgid "Help"
+msgstr "Laguntza"
+
+#: src/app-window.vala:1574
+msgid "About"
+msgstr "Honi buruz"
+
+#: src/app-window.vala:1575
+msgid "Quit"
+msgstr "Irten"
+
+#: src/app-window.vala:1589
+#| msgid "_Email"
+msgid "Email"
+msgstr "Posta elektronikoa"
+
+#. Populate ActionBar (not supported in Glade)
+#. https://bugzilla.gnome.org/show_bug.cgi?id=769966
+#. Label on new document button
+#: src/app-window.vala:1599
+msgid "Start Again…"
+msgstr "Hasi berriro…"
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: src/app-window.vala:1616
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Biratu orrialdea ezkerrera (erlojuaren kontrako noranzkoan)"
+
+#. Tooltip for rotate right (clockwise) button
+#: src/app-window.vala:1623
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Biratu orrialdea eskuinera (erlojuaren noranzkoan)"
+
+#. Tooltip for crop button
+#: src/app-window.vala:1633
+msgid "Crop the selected page"
+msgstr "Moztu hautatutako orrialdea"
+
+#. Tooltip for delete button
+#: src/app-window.vala:1649
+#| msgid "Crop the selected page"
+msgid "Delete the selected page"
+msgstr "Ezabatu hautatutako orria"
+
+#. Text of button for cancelling save
+#: src/app-window.vala:1814
+#| msgid "_Cancel"
+msgid "Cancel"
+msgstr "Utzi"
+
+#. Button to submit authorization dialog
+#: src/authorize-dialog.ui:25
+msgid "_Authorize"
+msgstr "_Baimendu"
+
+#. Label beside username entry
+#: src/authorize-dialog.ui:99
+msgid "_Username for resource:"
+msgstr "_Erabiltzaile-izena baliabiderako:"
+
+#. Label beside password entry
+#: src/authorize-dialog.ui:112
+msgid "_Password:"
+msgstr "_Pasahitza:"
+
+#: src/book.vala:331 src/book.vala:337
 #, c-format
-msgid "You need to install the %s package(s)."
-msgstr "%s pakete(ak) instalatu behar duzu (dituzu).."
+#| msgid "Unable to open help file"
+msgid "Unable to encode page %i"
+msgstr "Ezin da %i. orria kodetu"
+
+#: src/help-overlay.ui:12
+#| msgid "Scan"
+msgctxt "shortcut window"
+msgid "Scanning"
+msgstr "Eskaneatzen"
+
+#: src/help-overlay.ui:17
+#| msgid "Scan a single page from the scanner"
+msgctxt "shortcut window"
+msgid "Scan a single page"
+msgstr "Eskaneatu orrialde bakarra"
+
+#: src/help-overlay.ui:24
+#| msgid "Scan a single page from the scanner"
+msgctxt "shortcut window"
+msgid "Scan all pages from document feeder"
+msgstr "Eskaneatu orrialde guztiak dokumentuen elikagailutik"
+
+#: src/help-overlay.ui:31
+#| msgid "Scan a single page from the scanner"
+msgctxt "shortcut window"
+msgid "Scan continuously from a flatbed scanner"
+msgstr "Eskaneatu jarraian eskaner lau batetik"
+
+#: src/help-overlay.ui:38
+msgctxt "shortcut window"
+msgid "Stop scan in progress"
+msgstr "Gelditu eskaneatze lana"
+
+#: src/help-overlay.ui:46
+#| msgid "Document Scanner"
+msgctxt "shortcut window"
+msgid "Document Modification"
+msgstr "Dokumentuaren eraldaketa"
+
+#: src/help-overlay.ui:51
+#| msgid "Move Left"
+msgctxt "shortcut window"
+msgid "Move page left"
+msgstr "Eraman orrialdea ezkerrera"
+
+#: src/help-overlay.ui:58
+#| msgid "Move Right"
+msgctxt "shortcut window"
+msgid "Move page right"
+msgstr "Eraman orrialdea eskuinera"
+
+#: src/help-overlay.ui:65
+#| msgid "Rotate the page to the left (counter-clockwise)"
+msgctxt "shortcut window"
+msgid "Rotate page to the left (anti-clockwise)"
+msgstr "Biratu orrialdea ezkerrera (erlojuaren kontrako noranzkoan)"
+
+#: src/help-overlay.ui:72
+#| msgid "Rotate the page to the right (clockwise)"
+msgctxt "shortcut window"
+msgid "Rotate page to the right (clockwise)"
+msgstr "Biratu orrialdea eskuinera (erlojuaren noranzkoan)"
+
+#: src/help-overlay.ui:79
+#| msgid "Crop the selected page"
+msgctxt "shortcut window"
+msgid "Delete page"
+msgstr "Ezabatu orrialdea"
+
+#: src/help-overlay.ui:87
+#| msgid "Document Scanner"
+msgctxt "shortcut window"
+msgid "Document Management"
+msgstr "Dokumentuen kudeaketa"
+
+#: src/help-overlay.ui:92
+#| msgid "Start a new document"
+msgctxt "shortcut window"
+msgid "Start new document"
+msgstr "Hasi dokumentu berria"
+
+#: src/help-overlay.ui:99
+#| msgid "Scanned Document"
+msgctxt "shortcut window"
+msgid "Save scanned document"
+msgstr "Gorde eskaneatutako dokumentua"
+
+#: src/help-overlay.ui:106
+#| msgid "Scanned Document"
+msgctxt "shortcut window"
+msgid "Email scanned document"
+msgstr "Bidali postaz eskaneatutako dokumentua"
+
+#: src/help-overlay.ui:113
+#| msgid "Scanned Document"
+msgctxt "shortcut window"
+msgid "Print scanned document"
+msgstr "Inprimatu eskaneatutako dokumentua"
+
+#: src/help-overlay.ui:120
+msgctxt "shortcut window"
+msgid "Copy current page to clipboard"
+msgstr "Kopiatu uneko orrialdea arbelean"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:113
+#| msgid "scanner"
+msgid "_Scanner"
+msgstr "_Eskanerra"
+
+#. Label beside scan side combo box
+#: src/preferences-dialog.ui:143
+#| msgid "Scan Side:"
+msgid "Scan Sides"
+msgstr "Eskaneatu aldeak"
+
+#. Label beside page size combo box
+#: src/preferences-dialog.ui:160
+#| msgid "Page Size:"
+msgid "Page Size"
+msgstr "Orrialde-tamaina"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:191
+msgid "Front"
+msgstr "Aurrealdea"
+
+#. Preferences Dialog: Toggle button to select scanning on the back side of a page
+#: src/preferences-dialog.ui:206
+msgid "Back"
+msgstr "Atzealdea"
+
+#. Preferences Dialog: Toggle button to select scanning on both sides of a page
+#: src/preferences-dialog.ui:221
+msgid "Both"
+msgstr "Biak"
+
+#. Label beside page delay scale
+#: src/preferences-dialog.ui:260
+msgid "Delay"
+msgstr "Atzerapena"
+
+#. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
+#: src/preferences-dialog.ui:276
+msgid "Multiple pages from flatbed"
+msgstr "Hainbat orrialde eskaner lautik"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:295
+msgid "3"
+msgstr "3"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:310
+msgid "5"
+msgstr "5"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:326
+msgid "7"
+msgstr "7"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:342
+msgid "10"
+msgstr "10"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:358
+msgid "15"
+msgstr "15"
+
+#. Label after page delay radio buttons
+#: src/preferences-dialog.ui:385
+msgid "Seconds"
+msgstr "Segundo"
+
+#. Preferences Dialog: Tab label for scanning settings
+#: src/preferences-dialog.ui:413
+#| msgid "Scan"
+msgid "Scanning"
+msgstr "Eskaneatzea"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:436
+#| msgid "_Text Resolution:"
+msgid "_Text Resolution"
+msgstr "_Testu-bereizmena"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:452
+#| msgid "_Photo Resolution:"
+msgid "_Photo Resolution"
+msgstr "Ar_gazki-bereizmena"
+
+#. Label beside brightness scale
+#: src/preferences-dialog.ui:505
+#| msgid "Brightness:"
+msgid "Brightness"
+msgstr "Distira"
+
+#. Label beside contrast scale
+#: src/preferences-dialog.ui:521
+#| msgid "Contrast:"
+msgid "Contrast"
+msgstr "Kontrastea"
+
+#. Preferences Dialog: Tab for quality settings
+#: src/preferences-dialog.ui:576
+#| msgid "Quality:"
+msgid "Quality"
+msgstr "Kalitatea"
+
+#. Combo box value for automatic paper size
+#: src/preferences-dialog.vala:77
+msgid "Automatic"
+msgstr "Automatikoa"
+
+#: src/preferences-dialog.vala:116
+msgid "Darker"
+msgstr "Ilunago"
+
+#: src/preferences-dialog.vala:118
+msgid "Lighter"
+msgstr "Argiago"
+
+#: src/preferences-dialog.vala:126
+msgid "Less"
+msgstr "Gutxiago"
+
+#: src/preferences-dialog.vala:128
+msgid "More"
+msgstr "Gehiago"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/preferences-dialog.vala:440
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (lehenetsia)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/preferences-dialog.vala:443
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (zirriborroa)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/preferences-dialog.vala:446
 #, 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/preferences-dialog.vala:449
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1835
-msgid "New Document"
-msgstr "Dokumentu berria"
+#. Error displayed when no scanners to scan with
+#: src/scanner.vala:844
+msgid "No scanners available.  Please connect a scanner."
+msgstr "Ez dago eskanerrik erabilgarri. Mesedez, konektatu eskaner bat."
 
-#: ../src/ui.vala:1840
-msgid "Document"
-msgstr "Dokumentua"
+#. Error displayed when cannot connect to scanner
+#: src/scanner.vala:874
+msgid "Unable to connect to scanner"
+msgstr "Ezin da eskanerrarekin konektatu"
 
-#: ../src/ui.vala:1844
-msgid "Email..."
-msgstr "Bidali postaz..."
+#. Error display when unable to start scan
+#: src/scanner.vala:1227
+msgid "Unable to start scan"
+msgstr "Ezin da eskanerra abiarazi"
 
-#: ../src/ui.vala:1845
-msgid "Print..."
-msgstr "Inprimatu..."
+#. Error displayed when communication with scanner broken
+#: src/scanner.vala:1240 src/scanner.vala:1340
+msgid "Error communicating with scanner"
+msgstr "Errorea eskanerrarekin komunikatzean"
 
-#: ../src/ui.vala:1853
-msgid "Help"
-msgstr "Laguntza"
+#. Help string for command line --version flag
+#: src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "Erakutsi bertsioa"
 
-#: ../src/ui.vala:1854
-msgid "About"
-msgstr "Honi buruz"
+#. Help string for command line --debug flag
+#: src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Inprimatu arazketa-mezuak"
 
-#: ../src/ui.vala:1855
-msgid "Quit"
-msgstr "Irten"
+#: 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"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
-msgid "Change _Scanner"
-msgstr "Aldatu e_skanerra"
+#. Title of error dialog when scan failed
+#: src/simple-scan.vala:392
+msgid "Failed to scan"
+msgstr "Ezin izan da eskaneatu"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
-msgid "_Install Drivers"
-msgstr "_Instalatu kontrolatzaileak"
+#. Attempt to inhibit the screensaver when scanning
+#: src/simple-scan.vala:407
+msgid "Scan in progress"
+msgstr "Eskaneatzea lanean"
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
-msgid "Automatic"
-msgstr "Automatikoa"
+#. Arguments and description for --help text
+#: src/simple-scan.vala:584
+#| msgid "[DEVICE...] - Scanning utility"
+msgid "[DEVICE…] — Scanning utility"
+msgstr "[DEVICE…] — Eskaneatze-tresna"
 
-#: ../src/ui.vala:1947
-msgid "Darker"
-msgstr "Ilunago"
+#. Text printed out when an unknown command-line argument provided
+#: src/simple-scan.vala:595
+#, c-format
+#| msgid ""
+#| "Run '%s --help' to see a full list of available command line options."
+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:1949
-msgid "Lighter"
-msgstr "Argiago"
+#~ msgid "Front and Back"
+#~ msgstr "Aurrealdea eta atzealdea"
 
-#: ../src/ui.vala:1957
-msgid "Less"
-msgstr "Gutxiago"
+#~ msgid "New"
+#~ msgstr "Berria"
 
-#: ../src/ui.vala:1959
-msgid "More"
-msgstr "Gehiago"
+#~ msgid "Rotate Left"
+#~ msgstr "Biratu ezkerrera"
 
-#: ../src/ui.vala:1967
-msgid "Minimum"
-msgstr "Minimoa"
+#~ msgid "Rotate Right"
+#~ msgstr "Biratu eskuinera"
 
-#: ../src/ui.vala:1969
-msgid "Maximum"
-msgstr "Maximoa"
+#~ msgid "Crop"
+#~ msgstr "Moztu"
 
-#: ../src/ui.vala:2008
-msgid "Saving document..."
-msgstr "Dokumentua gordetzen..."
+#~ msgid "Scan S_ource:"
+#~ msgstr "Eskaneatze-_jatorria:"
 
-#: ../src/ui.vala:2173
-#, c-format
-msgid "Saving page %d out of %d"
-msgstr "%d orria (%d-etik) gordetzen"
+#~ msgid "New Document"
+#~ msgstr "Dokumentu berria"
+
+#~ msgid "Document"
+#~ msgstr "Dokumentua"
+
+#~ msgid "Email..."
+#~ msgstr "Bidali postaz..."
+
+#~ msgid "Print..."
+#~ msgstr "Inprimatu..."
+
+#~ msgid "_Install Drivers"
+#~ msgstr "_Instalatu kontrolatzaileak"
+
+#~ msgid "Minimum"
+#~ msgstr "Minimoa"
+
+#~ msgid "Maximum"
+#~ msgstr "Maximoa"
+
+#~ msgid "Saving document..."
+#~ msgstr "Dokumentua gordetzen..."
+
+#~ msgid "Saving page %d out of %d"
+#~ msgstr "%d orria (%d-etik) gordetzen"
 
 #~ msgid "4&#xD7;6"
 #~ msgstr "4&#xD7;6"
@@ -768,19 +1130,9 @@ msgstr "%d orria (%d-etik) gordetzen"
 #~ msgid "Height of scanned image in pixels"
 #~ msgstr "Eskaneatutako irudiaren altuera pixeletan"
 
-#~ msgid "Resolution for text scans"
-#~ msgstr "Bereizmena testuen eskaneatzerako"
-
-#~ msgid "Resolution for photo scans"
-#~ msgstr "Bereizmena argazkien eskaneatzerako"
-
 #~ msgid "Resolution of last scanned image"
 #~ msgstr "Eskaneatutako azken irudiaren bereizmena"
 
-#~ msgid "Directory to save files to"
-#~ msgstr "Fitxategiak gordetzeko direktorioa"
-
-#, c-format
 #~ msgid ""
 #~ "Usage:\n"
 #~ "  %s [DEVICE...] - Scanning utility"
@@ -792,31 +1144,27 @@ msgstr "%d orria (%d-etik) gordetzen"
 #~ msgstr "Egiaztatu instalazioa"
 
 #~ msgid ""
-#~ "The direction of the scanner across the scanned page. It can be one of the "
-#~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+#~ "The direction of the scanner across the scanned page. It can be one of "
+#~ "the following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-"
+#~ "left'"
 #~ msgstr ""
-#~ "Eskanerraren noranzkoa eskaneatuko den orrialdean zehar. Hurrengoetako bat "
-#~ "izan daiteke: 'goitik behera' 'behetik gora' 'ezkerretik eskuinera' "
+#~ "Eskanerraren noranzkoa eskaneatuko den orrialdean zehar. Hurrengoetako "
+#~ "bat izan daiteke: 'goitik behera' 'behetik gora' 'ezkerretik eskuinera' "
 #~ "'eskuinetik ezkerrera'"
 
 #~ msgid "TRUE if the application window is maximized"
 #~ msgstr "TRUE aplikazio-leihoa maximizatuta badago"
 
-#~ msgid "Device to scan from"
-#~ msgstr "Eskaneatze-gailua"
-
 #~ msgid ""
-#~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+#~ "The page side to scan. It can be one of the following: 'both' 'front' "
+#~ "'back'"
 #~ msgstr ""
-#~ "Eskaneatuko den aldea. Hurrengoetako bat izan daiteke: 'biak' 'aurrealdea' "
-#~ "'atzealdea'"
-
-#~ msgid "Type of document being scanned"
-#~ msgstr "Eskaneatuko den dokumentu-mota"
+#~ "Eskaneatuko den aldea. Hurrengoetako bat izan daiteke: 'biak' "
+#~ "'aurrealdea' 'atzealdea'"
 
 #~ msgid ""
-#~ "The width of scanned image in pixels. This value is updated to what the last "
-#~ "scanned page was."
+#~ "The width of scanned image in pixels. This value is updated to what the "
+#~ "last scanned page was."
 #~ msgstr ""
 #~ "Eskaneatutako irudiaren zabalera pixeletan. Parametro hau eskaneatutako "
 #~ "azken orrialdearen baliora eguneratzen da."
@@ -825,14 +1173,8 @@ msgstr "%d orria (%d-etik) gordetzen"
 #~ "The height of scanned image in pixels. This value is updated to what the "
 #~ "last scanned page was."
 #~ msgstr ""
-#~ "Eskaneatutako irudiaren altuera pixeletan. Parametro hau eskaneatutako azken "
-#~ "orrialdearen baliora eguneratzen da."
-
-#~ msgid ""
-#~ "The directory to save files to. Defaults to the documents directory if unset."
-#~ msgstr ""
-#~ "Fitxategiak gordeko diren direktorioa. Ez bada ezer ezartzen, balio "
-#~ "lehenetsia dokumentuen direktorioa da."
+#~ "Eskaneatutako irudiaren altuera pixeletan. Parametro hau eskaneatutako "
+#~ "azken orrialdearen baliora eguneratzen da."
 
 #~ msgid ""
 #~ "Type of document being scanned. 'text' for text documents, 'photo' for "
@@ -840,8 +1182,8 @@ msgstr "%d orria (%d-etik) gordetzen"
 #~ "processing."
 #~ msgstr ""
 #~ "Eskaneatuko den dokumentu-mota, 'testua' testu-dokumentuak badira, "
-#~ "'argazkia' argazkiak badira. Ezarpen honek eskaneatze-bereizmena, koloreak "
-#~ "eta post-tratamendua finkatzen du."
+#~ "'argazkia' argazkiak badira. Ezarpen honek eskaneatze-bereizmena, "
+#~ "koloreak eta post-tratamendua finkatzen du."
 
 #~ msgid "Window width in pixels"
 #~ msgstr "Leihoaren zabalera pixeletan"
@@ -852,28 +1194,12 @@ msgstr "%d orria (%d-etik) gordetzen"
 #~ msgid "Width of scanned image in pixels"
 #~ msgstr "Eskaneatutako irudiaren zabalera pixeletan"
 
-#~ msgid "Scanned Document"
-#~ msgstr "Eskaneatutako dokumentua"
-
 #~ msgid "Select File _Type"
 #~ msgstr "Hautatu fit_xategi-mota"
 
-#~ msgid "SANE device to acquire images from."
-#~ msgstr "Irudiak eskuratzeko erabiliko den SANE gailua."
-
 #~ msgid "The resolution in dots-per-inch of the previously scanned image."
 #~ msgstr "Aurretik eskaneatutako irudiaren bereizmena (puntuak hazbeteko)."
 
-#~ msgid "The resolution in dots-per-inch to use when scanning text."
-#~ msgstr "Testua eskaneatzen erabiliko den bereizmena (puntuak hazbeteko)."
-
-#~ msgid "The resolution in dots-per-inch to use when scanning photos."
-#~ msgstr "Argazkiak eskaneatzen erabiliko den bereizmena (puntuak hazbeteko)."
-
-#~ msgid "Page side to scan"
-#~ msgstr "Eskaneatuko den aldea"
-
-#, c-format
 #~ msgid ""
 #~ "GTK+ Options:\n"
 #~ "  --class=CLASS                   Program class as used by the window "
@@ -893,7 +1219,6 @@ msgstr "%d orria (%d-etik) gordetzen"
 #~ "  --gtk-module=MODULUAK Kargatu GTK+ modulu gehigarriak\n"
 #~ "  --g-fatal-warnings Egin abisu guztiak larri"
 
-#, c-format
 #~ msgid ""
 #~ "Help Options:\n"
 #~ "  -d, --debug                     Print debugging messages\n"
@@ -912,53 +1237,5 @@ msgstr "%d orria (%d-etik) gordetzen"
 #~ msgid "Direction of scan"
 #~ msgstr "Eskaneatzearen noranzkoa"
 
-#~ msgid ""
-#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
-#~ msgstr ""
-#~ "Eskaneatutako paperaren altuera milimetro hamarrenetan (edo 0 paperaren "
-#~ "detekzio automatikorako)."
-
-#~ msgid ""
-#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
-#~ msgstr ""
-#~ "Eskaneatutako paperaren zabalera milimetro hamarrenetan (edo 0 paperaren "
-#~ "detekzio automatikorako)."
-
-#~ msgid "Width of paper in tenths of a mm"
-#~ msgstr "Paperaren zabalera mm hamarrenetan"
-
-#~ msgid "Height of paper in tenths of a mm"
-#~ msgstr "Paperaren altuera mm hamarrenetan"
-
-#~ msgid "The page side to scan."
-#~ msgstr "Eskaneatuko den orrialdea."
-
-#~ msgid ""
-#~ "Type of document being scanned. This setting decides on the scan resolution, "
-#~ "colors and post-processing."
-#~ msgstr ""
-#~ "Eskaneatuko den dokumentu-mota. Ezarpen honek eskaneatzearen bereizmena, "
-#~ "koloreak eta posprozesatzea finkatzen du."
-
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "Eskanerraren zentzua eskaneatutako orrian zehar."
-
-#~ msgid "Contrast of scan"
-#~ msgstr "Eskanerraren kontrastea"
-
-#~ msgid "Brightness of scan"
-#~ msgstr "Eskanerraren distira"
-
-#~ msgid "Quality value to use for JPEG compression."
-#~ msgstr "Kalitatearen balioa, JPEG konpresioan erabiltzeko."
-
-#~ msgid "Quality value to use for JPEG compression"
-#~ msgstr "Kalitatearen balioa, JPEG konpresioan erabiltzeko"
-
-#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
-#~ msgstr "Kontrastearen doiketa, -100etik 100era (0 = kontrasterik ez)."
-
-#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
-#~ msgstr "Distiraren doiketa, -100etik 100era (0 = distirarik ez)."
diff --git a/po/fa.po b/po/fa.po
new file mode 100644
index 0000000..fa1b22e
--- /dev/null
+++ b/po/fa.po
@@ -0,0 +1,1017 @@
+# Persian translation for simple-scan.
+# Copyright (C) 2017 simple-scan's COPYRIGHT HOLDER
+# This file is distributed under the same license as the simple-scan package.
+# Goudarz Jafari <goudarz.jafari@gmail.com>, 2017.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: simple-scan gnome-3-26\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=simple-"
+"scan&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-09-11 03:50+0000\n"
+"PO-Revision-Date: 2017-09-22 17:00+0330\n"
+"Language-Team: Persian <fa@li.org>\n"
+"Language: fa\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"Last-Translator: Goudarz Jafari <goudarz.jafari@gmail.com>\n"
+"X-Generator: Poedit 2.0.3\n"
+
+#: data/org.gnome.SimpleScan.gschema.xml:11
+msgid "Device to scan from"
+msgstr "دستگاه برای اسکن کردن از"
+
+#: data/org.gnome.SimpleScan.gschema.xml:12
+msgid "SANE device to acquire images from."
+msgstr "دستگاه SANE برای دریافت تصاویر از طریق آن."
+
+#: data/org.gnome.SimpleScan.gschema.xml:20
+msgid "Type of document being scanned"
+msgstr "نوع نوشتار در حال اسکن"
+
+#: data/org.gnome.SimpleScan.gschema.xml:21
+msgid ""
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+msgstr ""
+"نوع نوشتار درحال اسکن شدن. این تنظیمات بر روی وضوح اسکن، رنگ‌ها و پردازش پس از "
+"اسکن اعمال می‌شود."
+
+#: data/org.gnome.SimpleScan.gschema.xml:25
+msgid "Width of paper in tenths of a mm"
+msgstr "عرض کاغذ در دهم میلی‌متر"
+
+#: data/org.gnome.SimpleScan.gschema.xml:26
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper detection)."
+msgstr "عرض کاغذ در دهم میلی‌متر (یا 0 برای تشخیص اتوماتیک کاغذ)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:30
+msgid "Height of paper in tenths of a mm"
+msgstr "ارتفاع کاغذ در دهم میلی‌متر"
+
+#: data/org.gnome.SimpleScan.gschema.xml:31
+msgid ""
+"The height of the paper in tenths of a mm (or 0 for automatic paper detection)."
+msgstr "ارتفاع کاغذ در دهم میلی‌متر (یا 0 برای تشخیص اتوماتیک کاغذ)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:35
+msgid "Brightness of scan"
+msgstr "روشنایی اسکن"
+
+#: data/org.gnome.SimpleScan.gschema.xml:36
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr "تنظیم روشنایی از -۱۰۰ تا ۱۰۰ (0 هیچ‌کدام)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:40
+msgid "Contrast of scan"
+msgstr "سایه روشن اسکن"
+
+#: data/org.gnome.SimpleScan.gschema.xml:41
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr "تنظیم کنتراست از -۱۰۰ تا ۱۰۰ (۰ هیچ کدام)"
+
+#: data/org.gnome.SimpleScan.gschema.xml:45
+msgid "Resolution for text scans"
+msgstr "تفکیک‌پذیری برای اسکن متن"
+
+#: data/org.gnome.SimpleScan.gschema.xml:46
+msgid "The resolution in dots-per-inch to use when scanning text."
+msgstr "تفکیک‌پذیری نقطه در هر اینچ برای استفاده در اسکن متن."
+
+#: data/org.gnome.SimpleScan.gschema.xml:50
+msgid "Resolution for photo scans"
+msgstr "تفکیک‌پذیری برای اسکن عکس"
+
+#: data/org.gnome.SimpleScan.gschema.xml:51
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr "تفکیک‌پذیری نقطه در هر اینچ برای استفاده در هنگام اسکن تصاویر."
+
+#: data/org.gnome.SimpleScan.gschema.xml:55
+msgid "Page side to scan"
+msgstr "سمتِ صفحه برای اسکن"
+
+#: data/org.gnome.SimpleScan.gschema.xml:56
+msgid "The page side to scan."
+msgstr "سمتِ صفحه‌ای که باید اسکن شود."
+
+#: data/org.gnome.SimpleScan.gschema.xml:60
+msgid "Directory to save files to"
+msgstr "شاخه مربوط به ذخیرهٔ پرونده‌ها"
+
+#: data/org.gnome.SimpleScan.gschema.xml:61
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+"شاخه‌ای که پرونده‌ها در آن ذخیره می‌شوند. اگر تنظیم نشود، پیش‌فرض شاخهٔ نوشتارها."
+
+#: data/org.gnome.SimpleScan.gschema.xml:66
+msgid "Quality value to use for JPEG compression"
+msgstr "میزان کیفیت برای استفاده در هنگام فشرده‌سازی JPEG"
+
+#: data/org.gnome.SimpleScan.gschema.xml:67
+msgid "Quality value to use for JPEG compression."
+msgstr "میزان کیفیت برای استفاده در هنگام فشرده‌سازی JPEG."
+
+#: data/org.gnome.SimpleScan.gschema.xml:72
+msgid "Delay in millisecond between pages"
+msgstr "تاخیر زمانی بین صفحات به میلی ثانیه"
+
+#: data/org.gnome.SimpleScan.gschema.xml:73
+msgid "Delay in millisecond between pages."
+msgstr "تاخیر زمانی بین صفحات به میلی ثانیه."
+
+#. Title of scan window
+#. Set HeaderBar title here because Glade doesn't keep it translated
+#. https://bugzilla.gnome.org/show_bug.cgi?id=782753
+#. Title of scan window
+#: data/simple-scan.appdata.xml.in:6 data/simple-scan.desktop.in:3
+#: src/app-window.ui:76 src/app-window.vala:1560
+msgid "Simple Scan"
+msgstr "اسکن ساده"
+
+#: data/simple-scan.appdata.xml.in:7 data/simple-scan.desktop.in:5
+msgid "Scan Documents"
+msgstr "اسکن پرونده‌ها"
+
+#: 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 print "
+"your scans, export them to pdf, or save them in a range of image formats."
+msgstr ""
+"یک راه ساده برای اسکن اسناد و تصاویر. شما میتوانید قسمت‌های نامتناسب را برش "
+"دهید و بچرخانید. می‌توانید اسکن‌های خود را چاپ کنید، یا آنها را به pdf منتقل "
+"کنید، یا در بازه‌ای در قالب‌های مختلف تصویر، ذخیره کنید."
+
+#: data/simple-scan.appdata.xml.in:14
+msgid "Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+"«اسکن ساده» از چهارچوب SANE جهت پشتیبانی از اسکنرهای موجود استفاده می‌کند."
+
+#: data/simple-scan.desktop.in:4
+msgid "Document Scanner"
+msgstr "اسکنر پرونده"
+
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: data/simple-scan.desktop.in:7
+msgid "scan;scanner;flatbed;adf;"
+msgstr "scan;scanner;flatbed;adf;اسکن;اسکنر;"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: data/simple-scan.desktop.in:10
+msgid "scanner"
+msgstr "scanner"
+
+#. Toolbar scan menu item to scan a single page from the scanner
+#. Scan menu item to scan a single page from the scanner
+#. Toolbar scan menu item to scan a single page from the scanner
+#: src/app-window.ui:22 src/app-window.ui:123 src/app-window.ui:820
+msgid "Single _Page"
+msgstr "تک _صفحه‌ای"
+
+#. Toolbar scan menu item to scan all pages from a document feeder
+#. Scan menu item to scan all pages from a document feeder
+#. Toolbar scan menu item to scan all pages from a document feeder
+#: src/app-window.ui:31 src/app-window.ui:133 src/app-window.ui:829
+msgid "All Pages From _Feeder"
+msgstr "تمام صفحات از _منبع تغذیه"
+
+#. Toolbar scan menu item to scan continuously from the flatbed
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/app-window.ui:40 src/app-window.ui:143 src/app-window.ui:838
+msgid "_Multiple Pages From Flatbed"
+msgstr "_چند صفحه از Flatbed"
+
+#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:853
+msgid "Text"
+msgstr "متن"
+
+#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:863
+msgid "Photo"
+msgstr "عکس"
+
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: src/app-window.ui:91
+msgid "_Document"
+msgstr "_سند"
+
+#. Scan menu item
+#: src/app-window.ui:110
+msgid "Sc_an"
+msgstr "ا_سکن"
+
+#. Menu entry to stop current scan
+#: src/app-window.ui:154
+msgid "_Stop Scan"
+msgstr "_توقف اسکن"
+
+#. Menu item to reorder pages
+#. Title of dialog to reorder pages
+#: src/app-window.ui:196 src/app-window.vala:967 src/app-window.vala:1590
+msgid "Reorder Pages"
+msgstr "جابجایی صفحات"
+
+#. Label on email menu item
+#: src/app-window.ui:215
+msgid "_Email"
+msgstr "_پست‌الکترونیکی"
+
+#. Page menu (contains action for each page, e.g. delete, crop)
+#: src/app-window.ui:280
+msgid "_Page"
+msgstr "_صفحه"
+
+#. Menu item to rotate page to left (anti-clockwise)
+#: src/app-window.ui:290
+msgid "Rotate _Left"
+msgstr "چرخش به _چپ"
+
+#. Menu item to rotate page to right (clockwise)
+#: src/app-window.ui:300
+msgid "Rotate _Right"
+msgstr "چرخش به _راست"
+
+#. Label for page crop submenu
+#: src/app-window.ui:310
+msgid "_Crop"
+msgstr "_برش"
+
+#. Radio button for no crop
+#: src/app-window.ui:320
+msgid "_None"
+msgstr "_هیچ‌کدام"
+
+#. Radio button for cropping page to A4 size
+#: src/app-window.ui:331
+msgid "A_4"
+msgstr "A_4"
+
+#. Radio button for cropping page to A5 size
+#: src/app-window.ui:342
+msgid "A_5"
+msgstr "A_5"
+
+#. Radio button for cropping page to A6 size
+#: src/app-window.ui:353
+msgid "A_6"
+msgstr "A_6"
+
+#. Radio button for cropping page to US letter size
+#: src/app-window.ui:364
+msgid "_Letter"
+msgstr "_نامه"
+
+#. Radio button for cropping to page to US legal size
+#: src/app-window.ui:375
+msgid "Le_gal"
+msgstr "_قانونی"
+
+#. Radio button for cropping page to 4x6 inch
+#: src/app-window.ui:386
+msgid "4×6"
+msgstr "۶×۴"
+
+#. Radio button for cropping to custom page size
+#: src/app-window.ui:397
+msgid "_Custom"
+msgstr "_سفارشی"
+
+#. Menu item to rotate the crop area
+#: src/app-window.ui:415
+msgid "_Rotate Crop"
+msgstr "_چرخاندن برش"
+
+#. Menu item to move the selected page to the left
+#: src/app-window.ui:428
+msgid "Move Left"
+msgstr "جابه‌جایی به چپ"
+
+#. Menu item to move the selected page to the right
+#: src/app-window.ui:437
+msgid "Move Right"
+msgstr "جابه‌جایی به راست"
+
+#. Label on help menu
+#: src/app-window.ui:474
+msgid "_Help"
+msgstr "_راهنما"
+
+#. Help|Contents menu
+#: src/app-window.ui:482
+msgid "_Contents"
+msgstr "_فهرست"
+
+#. Tooltip for scan toolbar button
+#: src/app-window.ui:520 src/app-window.ui:720
+msgid "Scan a single page from the scanner"
+msgstr "اسکن یک صفحه از طریق اسکنر"
+
+#. Label on scan toolbar item
+#: src/app-window.ui:522 src/app-window.ui:716
+msgid "Scan"
+msgstr "اسکن"
+
+#. Tooltip for save toolbar button
+#: src/app-window.ui:538 src/app-window.ui:787
+msgid "Save document to a file"
+msgstr "ذخیره سند در پرونده"
+
+#: src/app-window.ui:540
+msgid "Save"
+msgstr "ذخیره"
+
+#. Tooltip for stop button
+#: src/app-window.ui:555 src/app-window.ui:700
+msgid "Stop the current scan"
+msgstr "توقف اسکن فعلی"
+
+#: src/app-window.ui:556 src/app-window.ui:697
+msgid "Stop"
+msgstr "توقف"
+
+#. Label shown when searching for scanners
+#: src/app-window.ui:611
+msgid "Searching for Scanners…"
+msgstr "در حال جست‌وجو برای اسکنرها…"
+
+#: src/app-window.vala:237 src/app-window.vala:1380
+msgid "_Close"
+msgstr "_بستن"
+
+#. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
+#: src/app-window.vala:246
+#, c-format
+msgid "Username and password required to access “%s”"
+msgstr "برای دسترسی به (%s) نیاز به نام کاربری و رمز عبور دارید"
+
+#. Label shown when detected a scanner
+#: src/app-window.vala:266 src/app-window.vala:584
+msgid "Ready to Scan"
+msgstr "آماده برای اسکن"
+
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: src/app-window.vala:273
+msgid "Additional software needed"
+msgstr "نرم افزار اضافی مورد نیاز است"
+
+#. Instructions to install driver software
+#: src/app-window.vala:275
+msgid ""
+"You need to <a href=\"install-firmware\">install driver software</a> for your "
+"scanner."
+msgstr ""
+"لازم است <a href=\"install-firmware\">نرم‌افزازِ راه انداز</a> را برای اسکنر خود "
+"نصب کنید."
+
+#. Warning displayed when no scanners are detected
+#: src/app-window.vala:281
+msgid "No scanners detected"
+msgstr "اسکنری پیدا نشد"
+
+#. Hint to user on why there are no scanners detected
+#: src/app-window.vala:283
+msgid "Please check your scanner is connected and powered on"
+msgstr "لطفا بررسی کنید که اسکنر شما متصل و روشن باشد"
+
+#. Save dialog: Dialog title
+#: src/app-window.vala:298
+msgid "Save As…"
+msgstr "ذخیره به عنوان…"
+
+#: src/app-window.vala:301 src/app-window.vala:471 src/app-window.vala:552
+msgid "_Cancel"
+msgstr "_لغو"
+
+#: src/app-window.vala:302 src/app-window.vala:553
+msgid "_Save"
+msgstr "_ذخیره"
+
+#. Default filename to use when saving document
+#: src/app-window.vala:310
+msgid "Scanned Document.pdf"
+msgstr "Scanned Document.pdf"
+
+#. Save dialog: Filter name to show only supported image files
+#: src/app-window.vala:316
+msgid "Image Files"
+msgstr "پرونده‌های تصاویر"
+
+#. Save dialog: Filter name to show all files
+#: src/app-window.vala:326
+msgid "All Files"
+msgstr "تمام پرونده‌ها"
+
+#. Save dialog: Label for saving in PDF format
+#: src/app-window.vala:335
+msgid "PDF (multi-page document)"
+msgstr "PDF (سند چند صفحه‌ای)"
+
+#. Save dialog: Label for saving in JPEG format
+#: src/app-window.vala:341
+msgid "JPEG (compressed)"
+msgstr "JPEG (فشرده)"
+
+#. Save dialog: Label for saving in PNG format
+#: src/app-window.vala:347
+msgid "PNG (lossless)"
+msgstr "PNG (بدون کاهش کیفیت)"
+
+#. Save dialog: Label for sabing in WEBP format
+#: src/app-window.vala:354
+msgid "WebP (compressed)"
+msgstr "WebP (فشرده)"
+
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
+#: src/app-window.vala:364
+msgid "File format:"
+msgstr "قالب پرونده:"
+
+#. Label in save dialog beside compression slider
+#: src/app-window.vala:376
+msgid "Compression:"
+msgstr "فشرده‌سازی:"
+
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/app-window.vala:470
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr "پرونده‌ای از پیش با نام «%s» ذخیره شده. می‌خواهید آن را جای‌گزین کنید؟"
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/app-window.vala:473
+msgid "_Replace"
+msgstr "_جایگزینی"
+
+#: src/app-window.vala:512
+msgid "Saving"
+msgstr "درحال ذخیره"
+
+#. Title of error dialog when save failed
+#: src/app-window.vala:527
+msgid "Failed to save file"
+msgstr "ذخیره پرونده شکست خورد"
+
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:550
+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/app-window.vala:591
+msgid "Save current document?"
+msgstr "ذخیره سند جاری؟"
+
+#. Button in dialog to create new document and discard unsaved document
+#: src/app-window.vala:593
+msgid "Discard Changes"
+msgstr "نادیده گرفتن تغییرات"
+
+#. Label shown when scan started
+#: src/app-window.vala:692
+msgid "Contacting scanner…"
+msgstr "در حال برقراری ارتباط با اسکنر…"
+
+#. Error message display when unable to save image for preview
+#: src/app-window.vala:800
+msgid "Unable to save image for preview"
+msgstr "نمی‌توان پرونده را برای پیش‌نمایش ذخیره کرد"
+
+#. Error message display when unable to preview image
+#: src/app-window.vala:812
+msgid "Unable to open image preview application"
+msgstr "نمی‌توان برنامه پیش‌نمایش تصویر را باز کرد"
+
+#. Label on button for combining sides in reordering dialog
+#: src/app-window.vala:990
+msgid "Combine sides"
+msgstr "ترکیبِ طرف‌ها"
+
+#. Label on button for combining sides in reverse order in reordering dialog
+#: src/app-window.vala:1000
+msgid "Combine sides (reverse)"
+msgstr "ترکیب دو طرف (معکوس)"
+
+#. Label on button for reversing in reordering dialog
+#: src/app-window.vala:1010
+msgid "Reverse"
+msgstr "معکوس"
+
+#. Label on button for cancelling page reordering dialog
+#: src/app-window.vala:1020
+msgid "Keep unchanged"
+msgstr "نگه‌داشتن بدون تغییر"
+
+#. Error message displayed when unable to launch help browser
+#: src/app-window.vala:1250
+msgid "Unable to open help file"
+msgstr "نمیتوان فایل راهنما را باز کرد"
+
+#. The license this software is under (GPL3+)
+#: src/app-window.vala:1271
+msgid ""
+"This program is free software: you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation, either version 3 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License\n"
+"along with this program.  If not, see <http://www.gnu.org/licenses/>."
+msgstr ""
+"این نرم‌افزار، یک نرم‌افزار آزاد است؛ شما می‌توانید آن را تحت شرایط اجازه‌نامه‌ی "
+"همگانی عمومی گنو\n"
+"که بنیاد نرم‌افزارهای آزاد منتشر کرده است،‌ تغییر دهید یا دوباره توزیع کنید. یا "
+"نسخه‌ی ۲ اجازه‌نامه\n"
+"یا (به اختیار خودتان) هر نسخه‌ی بالاتر دیگری.\n"
+"\n"
+"این برنامه با این امید توزیع شده است که به درد بخور باشد، اما بدون هر گونه "
+"ضمانتی؛ حتی بدون\n"
+"ضمانت ضمنی قابل فروش بودن یا مناسب بودن برای یک هدف مشخص. برای جزئیات بیشتر "
+"به\n"
+"اجازه‌نامه‌ی همگانی عمومی گنو را ببینید.\n"
+"\n"
+"شما باید به همراه این برنامه رونوشتی از اجازه‌نامه‌ی عمومی همگانی گنو را دریافت "
+"می‌کردید،\n"
+"اگر این‌گونه نیست، «http://www.gnu.org/licenses» را ببینید."
+
+#. Title of about dialog
+#: src/app-window.vala:1274
+msgid "About Simple Scan"
+msgstr "دربارهٔ «اسکن ساده»"
+
+#. Description of program
+#: src/app-window.vala:1277
+msgid "Simple document scanning tool"
+msgstr "یک اسکنر ساده برای اسناد"
+
+#: src/app-window.vala:1286
+msgid "translator-credits"
+msgstr ""
+"Arash Mousavi <mousavi.arash@gmail.com>\n"
+"goudarz jafari <goudarz.jafari@gmail.com>\n"
+"ssshojaei <shojaeisaleh@gmail.com>"
+
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:1308
+msgid "Save document before quitting?"
+msgstr "ذخیره پرونده قبل از خروج؟"
+
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:1310
+msgid "Quit without Saving"
+msgstr "خروج بدون ذخیره‌سازی"
+
+#. Message to indicate a Brother scanner has been detected
+#: src/app-window.vala:1357
+msgid "You appear to have a Brother scanner."
+msgstr "ظاهرا شما یک اسکنر Brother دارید."
+
+#. Instructions on how to install Brother scanner drivers
+#: src/app-window.vala:1359
+msgid ""
+"Drivers for this are available on the <a href=\"http://support.brother.com"
+"\">Brother website</a>."
+msgstr ""
+"راه اندازها برای این دستگاه را میتوانید از <a href=\"http://support.brother.com"
+"\">وب‌سایت Brother</a> پیدا کنید."
+
+#. Message to indicate a Samsung scanner has been detected
+#: src/app-window.vala:1363
+msgid "You appear to have a Samsung scanner."
+msgstr "ظاهرا شما یک اسکنر سامسونگ دارید."
+
+#. Instructions on how to install Samsung scanner drivers
+#: src/app-window.vala:1365
+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/app-window.vala:1369
+msgid "You appear to have an HP scanner."
+msgstr "ظاهرا شما یک اسکنر HP دارید."
+
+#. Message to indicate an Epson scanner has been detected
+#: src/app-window.vala:1374
+msgid "You appear to have an Epson scanner."
+msgstr "شما ظاهرا یک اسکنر Epson دارید."
+
+#. Instructions on how to install Epson scanner drivers
+#: src/app-window.vala:1376
+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/app-window.vala:1380
+msgid "Install drivers"
+msgstr "نصب راه‌اندازها"
+
+#. Message in driver install dialog
+#: src/app-window.vala:1411
+msgid "Once installed you will need to restart Simple Scan."
+msgstr "پس از نصب شما باید برنامه «اسکن ساده» را دوباره باز کنید."
+
+#. Label shown while installing drivers
+#: src/app-window.vala:1423
+msgid "Installing drivers…"
+msgstr "در حال نصب راه‌اندازها…"
+
+#. Label shown once drivers successfully installed
+#: src/app-window.vala:1431
+msgid "Drivers installed successfully!"
+msgstr "راه‌اندازها با موفقیت نصب شدند!"
+
+#. Label shown if failed to install drivers
+#: src/app-window.vala:1441
+#, c-format
+msgid "Failed to install drivers (error code %d)."
+msgstr "نصب راه‌انداز شکست خورد (خطا در کد %Id)"
+
+#. Label shown if failed to install drivers
+#: src/app-window.vala:1447
+msgid "Failed to install drivers."
+msgstr "خطا در نصب راه‌انداز."
+
+#. Label shown to prompt user to install packages (when PackageKit not available)
+#: src/app-window.vala:1454
+#, c-format
+msgid "You need to install the %s package."
+msgid_plural "You need to install the %s packages."
+msgstr[0] "لازم است بستهٔ %s را نصب کنید."
+
+#. Title of preferences dialog
+#: src/app-window.vala:1568 src/app-window.vala:1591 src/preferences-dialog.ui:53
+msgid "Preferences"
+msgstr "تنظیمات"
+
+#: src/app-window.vala:1572
+msgid "Keyboard Shortcuts"
+msgstr "میانبرهای کیبورد"
+
+#: src/app-window.vala:1573
+msgid "Help"
+msgstr "راهنما"
+
+#: src/app-window.vala:1574
+msgid "About"
+msgstr "درباره"
+
+#: src/app-window.vala:1575
+msgid "Quit"
+msgstr "خروج"
+
+#: src/app-window.vala:1589
+msgid "Email"
+msgstr "پست‌الکترونیکی"
+
+#. Populate ActionBar (not supported in Glade)
+#. https://bugzilla.gnome.org/show_bug.cgi?id=769966
+#. Label on new document button
+#: src/app-window.vala:1599
+msgid "Start Again…"
+msgstr "شروع دوباره…"
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: src/app-window.vala:1616
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "چرخاندن صفحه به چپ (خلاف جهت عقربه‌های ساعت)"
+
+#. Tooltip for rotate right (clockwise) button
+#: src/app-window.vala:1623
+msgid "Rotate the page to the right (clockwise)"
+msgstr "چرخاندن صفحه به راست (در جهت عقربه‌های ساعت)"
+
+#. Tooltip for crop button
+#: src/app-window.vala:1633
+msgid "Crop the selected page"
+msgstr "برش صفحه انتخاب شده"
+
+#. Tooltip for delete button
+#: src/app-window.vala:1649
+msgid "Delete the selected page"
+msgstr "حذف صفحه انتخاب شده"
+
+#. Text of button for cancelling save
+#: src/app-window.vala:1814
+msgid "Cancel"
+msgstr "لغو"
+
+#. Button to submit authorization dialog
+#: src/authorize-dialog.ui:25
+msgid "_Authorize"
+msgstr "_تایید مجوز"
+
+#. Label beside username entry
+#: src/authorize-dialog.ui:99
+msgid "_Username for resource:"
+msgstr "_نام کاربری برای منبع:"
+
+#. Label beside password entry
+#: src/authorize-dialog.ui:112
+msgid "_Password:"
+msgstr "_گذرواژه:"
+
+#: src/book.vala:331 src/book.vala:337
+#, c-format
+msgid "Unable to encode page %i"
+msgstr "خطا در رمزگذاری صفحه %Ii"
+
+#: src/help-overlay.ui:12
+msgctxt "shortcut window"
+msgid "Scanning"
+msgstr "در حال اسکن"
+
+#: src/help-overlay.ui:17
+msgctxt "shortcut window"
+msgid "Scan a single page"
+msgstr "اسکنِ یک صفحه"
+
+#: src/help-overlay.ui:24
+msgctxt "shortcut window"
+msgid "Scan all pages from document feeder"
+msgstr "اسکن کردن تمام صفحات در منبع تغذیه سند"
+
+#: src/help-overlay.ui:31
+msgctxt "shortcut window"
+msgid "Scan continuously from a flatbed scanner"
+msgstr "اسکن مداوم از یک اسکنر flatbed"
+
+#: src/help-overlay.ui:38
+msgctxt "shortcut window"
+msgid "Stop scan in progress"
+msgstr "متوقف کردن اسکن جاری"
+
+#: src/help-overlay.ui:46
+msgctxt "shortcut window"
+msgid "Document Modification"
+msgstr "اصلاح سند"
+
+#: src/help-overlay.ui:51
+msgctxt "shortcut window"
+msgid "Move page left"
+msgstr "جابه‌جایی صفحه به چپ"
+
+#: src/help-overlay.ui:58
+msgctxt "shortcut window"
+msgid "Move page right"
+msgstr "جابه‌جایی صفحه به راست"
+
+#: src/help-overlay.ui:65
+msgctxt "shortcut window"
+msgid "Rotate page to the left (anti-clockwise)"
+msgstr "چرخاندن صفحه به چپ (خلاف جهت عقربه‌های ساعت)"
+
+#: src/help-overlay.ui:72
+msgctxt "shortcut window"
+msgid "Rotate page to the right (clockwise)"
+msgstr "چرخاندن صفحه به راست (در جهت عقربه‌های ساعت)"
+
+#: src/help-overlay.ui:79
+msgctxt "shortcut window"
+msgid "Delete page"
+msgstr "حذف صفحه"
+
+#: src/help-overlay.ui:87
+msgctxt "shortcut window"
+msgid "Document Management"
+msgstr "مدیریت سندها"
+
+#: src/help-overlay.ui:92
+msgctxt "shortcut window"
+msgid "Start new document"
+msgstr "شروع اسکن سند جدید"
+
+#: src/help-overlay.ui:99
+msgctxt "shortcut window"
+msgid "Save scanned document"
+msgstr "ذخیره سند اسکن شده"
+
+#: src/help-overlay.ui:106
+msgctxt "shortcut window"
+msgid "Email scanned document"
+msgstr "پست سند اسکن شده"
+
+#: src/help-overlay.ui:113
+msgctxt "shortcut window"
+msgid "Print scanned document"
+msgstr "چاپ سند اسکن شده"
+
+#: src/help-overlay.ui:120
+msgctxt "shortcut window"
+msgid "Copy current page to clipboard"
+msgstr "رونوشت از این صفحه در تخته‌گیره"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:113
+msgid "_Scanner"
+msgstr "_اسکنر"
+
+#. Label beside scan side combo box
+#: src/preferences-dialog.ui:143
+msgid "Scan Sides"
+msgstr "اسکن سمت‌های مختلف"
+
+#. Label beside page size combo box
+#: src/preferences-dialog.ui:160
+msgid "Page Size"
+msgstr "اندازه صفحه"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:191
+msgid "Front"
+msgstr "جلو"
+
+#. Preferences Dialog: Toggle button to select scanning on the back side of a page
+#: src/preferences-dialog.ui:206
+msgid "Back"
+msgstr "عقب"
+
+#. Preferences Dialog: Toggle button to select scanning on both sides of a page
+#: src/preferences-dialog.ui:221
+msgid "Both"
+msgstr "هر دو"
+
+#. Label beside page delay scale
+#: src/preferences-dialog.ui:260
+msgid "Delay"
+msgstr "تاخیر"
+
+#. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
+#: src/preferences-dialog.ui:276
+msgid "Multiple pages from flatbed"
+msgstr "صفحات چندگانه از flatbed"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:295
+msgid "3"
+msgstr "۳"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:310
+msgid "5"
+msgstr "۵"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:326
+msgid "7"
+msgstr "۷"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:342
+msgid "10"
+msgstr "۱۰"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:358
+msgid "15"
+msgstr "۱۵"
+
+#. Label after page delay radio buttons
+#: src/preferences-dialog.ui:385
+msgid "Seconds"
+msgstr "ثانیه"
+
+#. Preferences Dialog: Tab label for scanning settings
+#: src/preferences-dialog.ui:413
+msgid "Scanning"
+msgstr "در حال اسکن"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:436
+msgid "_Text Resolution"
+msgstr "_تفکیک‌پذیری متن"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:452
+msgid "_Photo Resolution"
+msgstr "_تفکیک‌پذیری تصویر"
+
+#. Label beside brightness scale
+#: src/preferences-dialog.ui:505
+msgid "Brightness"
+msgstr "روشنایی"
+
+#. Label beside contrast scale
+#: src/preferences-dialog.ui:521
+msgid "Contrast"
+msgstr "سایه‌روشن"
+
+#. Preferences Dialog: Tab for quality settings
+#: src/preferences-dialog.ui:576
+msgid "Quality"
+msgstr "کیفیت"
+
+#. Combo box value for automatic paper size
+#: src/preferences-dialog.vala:77
+msgid "Automatic"
+msgstr "خودکار"
+
+#: src/preferences-dialog.vala:116
+msgid "Darker"
+msgstr "تیره‌تر"
+
+#: src/preferences-dialog.vala:118
+msgid "Lighter"
+msgstr "روشن‌تر"
+
+#: src/preferences-dialog.vala:126
+msgid "Less"
+msgstr "کمتر"
+
+#: src/preferences-dialog.vala:128
+msgid "More"
+msgstr "بیشتر"
+
+#. Preferences dialog: Label for default resolution in resolution list
+#: src/preferences-dialog.vala:440
+#, c-format
+msgid "%d dpi (default)"
+msgstr "%Id dpi (پیش فرض)"
+
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: src/preferences-dialog.vala:443
+#, c-format
+msgid "%d dpi (draft)"
+msgstr "%Id dpi (پیش نویس)"
+
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: src/preferences-dialog.vala:446
+#, c-format
+msgid "%d dpi (high resolution)"
+msgstr "%Id dpi (بالاترین تفکیک‌پذیری)"
+
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: src/preferences-dialog.vala:449
+#, c-format
+msgid "%d dpi"
+msgstr "%Id dpi"
+
+#. Error displayed when no scanners to scan with
+#: src/scanner.vala:844
+msgid "No scanners available.  Please connect a scanner."
+msgstr "اسکنری موجود نیست. لطفا یک اسکنر را متصل کنید."
+
+#. Error displayed when cannot connect to scanner
+#: src/scanner.vala:874
+msgid "Unable to connect to scanner"
+msgstr "امکان برقراری ارتباط با اسکنر نبود"
+
+#. Error display when unable to start scan
+#: src/scanner.vala:1227
+msgid "Unable to start scan"
+msgstr "امکان شروع اسکن نبود"
+
+#. 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 "نمایش پیام‌های اشکال‌زدایی"
+
+#: 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:392
+msgid "Failed to scan"
+msgstr "اسکن شکست خورد"
+
+#. Attempt to inhibit the screensaver when scanning
+#: src/simple-scan.vala:407
+msgid "Scan in progress"
+msgstr "در حال انجام است"
+
+#. Arguments and description for --help text
+#: src/simple-scan.vala:584
+msgid "[DEVICE…] — Scanning utility"
+msgstr "[DEVICE…] — ابزار اسکن"
+
+#. Text printed out when an unknown command-line argument provided
+#: src/simple-scan.vala:595
+#, c-format
+msgid "Run “%s --help” to see a full list of available command line options."
+msgstr "برای مشاهده راهنمای خط فرمان (%s --help) را وارد کنید."
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..310ad92 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -2,515 +2,533 @@
 # Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
 # This file is distributed under the same license as the simple-scan package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
+# Jiri Grönroos <jiri.gronroos+l10n@iki.fi>, 2017.
 #
 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-09-22 12:07+0000\n"
-"Last-Translator: Jiri Grönroos <Unknown>\n"
-"Language-Team: Finnish <fi@li.org>\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
+"product=simple-scan&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-08-13 21:51+0000\n"
+"PO-Revision-Date: 2017-08-30 10:42+0300\n"
+"Last-Translator: Jiri Grönroos <jiri.gronroos+l10n@iki.fi>\n"
+"Language-Team: suomi <lokalisointi-lista@googlegroups.com>\n"
+"Language: fi\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-25 06:10+0000\n"
+"X-Generator: Gtranslator 2.91.7\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. Button to submit authorization dialog
-#: data/simple-scan.ui:24
-msgid "_Authorize"
-msgstr "_Valtuuta"
+#: data/org.gnome.SimpleScan.gschema.xml:11
+msgid "Device to scan from"
+msgstr "Laite jolta luetaan"
 
-#. Label beside username entry
-#: data/simple-scan.ui:102
-msgid "_Username for resource:"
-msgstr "Resurssin _käyttäjänimi:"
+#: data/org.gnome.SimpleScan.gschema.xml:12
+msgid "SANE device to acquire images from."
+msgstr "SANE-laite jolta kuvat luetaan."
 
-#. Label beside password entry
-#: data/simple-scan.ui:117
-msgid "_Password:"
-msgstr "_Salasana:"
+#: data/org.gnome.SimpleScan.gschema.xml:20
+msgid "Type of document being scanned"
+msgstr "Luettavan asiakirjan tyyppi"
 
-#. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
-msgid "Front and Back"
-msgstr "Etu- ja takapuoli"
+#: data/org.gnome.SimpleScan.gschema.xml:21
+msgid ""
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+msgstr ""
+"Luettavan asiakirjan tyyppi. Tämä asetus määrittää tarkkuuden, värit ja "
+"jälkiprosessoinnin."
 
-#. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
-msgid "Front"
-msgstr "Etupuoli"
+#: data/org.gnome.SimpleScan.gschema.xml:25
+msgid "Width of paper in tenths of a mm"
+msgstr "Paperin leveys kymmenesosamilleinä"
 
-#. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
-msgid "Back"
-msgstr "Takapuoli"
+#: data/org.gnome.SimpleScan.gschema.xml:26
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"Paperin leveys kymmenesosamilleinä (tai 0 automaattista paperintunnistusta "
+"varten)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:30
+msgid "Height of paper in tenths of a mm"
+msgstr "Paperin pituus kymmenesosamilleinä"
+
+#: data/org.gnome.SimpleScan.gschema.xml:31
+msgid ""
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"Paperin pituus kymmenesosamilleinä (tai 0 automaattista paperintunnistusta "
+"varten)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:35
+msgid "Brightness of scan"
+msgstr "Kuvanluvun kirkkaus"
+
+#: data/org.gnome.SimpleScan.gschema.xml:36
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr "Kirkkaussäätö asteikolla -100 - 100 (0 on ei yhtään)"
+
+#: data/org.gnome.SimpleScan.gschema.xml:40
+msgid "Contrast of scan"
+msgstr "Kuvanluvun kontrasti"
+
+#: data/org.gnome.SimpleScan.gschema.xml:41
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr "Kontrastisäätö asteikolla -100 - 100 (0 on ei yhtään)"
+
+#: data/org.gnome.SimpleScan.gschema.xml:45
+msgid "Resolution for text scans"
+msgstr "Tarkkuus tekstin lukemiseen"
+
+#: data/org.gnome.SimpleScan.gschema.xml:46
+msgid "The resolution in dots-per-inch to use when scanning text."
+msgstr "Käytettävä resoluutio pisteinä tuumaa kohti skannattaessa tekstiä."
+
+#: data/org.gnome.SimpleScan.gschema.xml:50
+msgid "Resolution for photo scans"
+msgstr "Tarkkuus valokuvien luvulle"
+
+#: data/org.gnome.SimpleScan.gschema.xml:51
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr "Käytettävä resoluutio pisteinä tuumaa kohti skannattaessa kuvia."
+
+#: data/org.gnome.SimpleScan.gschema.xml:55
+msgid "Page side to scan"
+msgstr "Skannattava puoli"
+
+#: data/org.gnome.SimpleScan.gschema.xml:56
+msgid "The page side to scan."
+msgstr "Skannattavan sivun puoli."
+
+#: data/org.gnome.SimpleScan.gschema.xml:60
+msgid "Directory to save files to"
+msgstr "Kansio, johon tiedostot tallennetaan"
+
+#: data/org.gnome.SimpleScan.gschema.xml:61
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+"Kansio, johon tiedostot tallennetaan. Oletusasetus on Asiakirjat-kansio."
+
+#: data/org.gnome.SimpleScan.gschema.xml:66
+msgid "Quality value to use for JPEG compression"
+msgstr "JPEG-pakkaukseen käytettävä laatuarvo"
+
+#: data/org.gnome.SimpleScan.gschema.xml:67
+msgid "Quality value to use for JPEG compression."
+msgstr "JPEG-pakkaukseen käytettävä laatuarvo."
+
+#: data/org.gnome.SimpleScan.gschema.xml:72
+msgid "Delay in millisecond between pages"
+msgstr "Viive millisekunneissa sivujen välillä"
+
+#: data/org.gnome.SimpleScan.gschema.xml:73
+msgid "Delay in millisecond between pages."
+msgstr "Viive millisekunneissa sivujen välillä."
 
 #. 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
+#. Set HeaderBar title here because Glade doesn't keep it translated
+#. https://bugzilla.gnome.org/show_bug.cgi?id=782753
+#. Title of scan window
+#: data/simple-scan.appdata.xml.in:6 data/simple-scan.desktop.in:3
+#: src/app-window.ui:76 src/app-window.vala:1560
 msgid "Simple Scan"
 msgstr "Kuvanluku"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
-msgid "_Document"
-msgstr "_Asiakirja"
+#: data/simple-scan.appdata.xml.in:7 data/simple-scan.desktop.in:5
+msgid "Scan Documents"
+msgstr "Lue asiakirjoja kuvanlukijalta"
 
-#. Scan menu item
-#: data/simple-scan.ui:260
-msgid "Sc_an"
-msgstr "Lue kuv_a"
+#: 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 "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+"Helppo tapa lukea (skannata) asiakirjoja ja valokuvia. Voit rajata huonot "
+"osat valokuvista pois tai kääntää niitä. Luettuja kuvia voidaan tulostaa, "
+"viedä PDF-muotoon tai tallentaa eri kuvamuodoissa."
+
+#: data/simple-scan.appdata.xml.in:14
+msgid "Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+"Tämä sovellus käyttää SANE-kehystä tukeakseen useimpia olemassa olevia "
+"kuvanlukijoita."
+
+#: data/simple-scan.desktop.in:4
+msgid "Document Scanner"
+msgstr "Asiakirjojen kuvanlukuohjelma"
+
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: data/simple-scan.desktop.in:7
+msgid "scan;scanner;flatbed;adf;"
+msgstr "kuvanluku;skanneri;scan;scanner;flatbed;adf;"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: data/simple-scan.desktop.in:10
+msgid "scanner"
+msgstr "scanner"
 
+#. Toolbar scan menu item to scan a single page from the scanner
 #. 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/app-window.ui:22 src/app-window.ui:123 src/app-window.ui:820
 msgid "Single _Page"
 msgstr "Yksi _sivu"
 
+#. Toolbar scan menu item to scan all pages from a document feeder
 #. 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/app-window.ui:31 src/app-window.ui:133 src/app-window.ui:829
 msgid "All Pages From _Feeder"
 msgstr "Kaikki sivut _laitteelta"
 
-#. Menu entry to stop current scan
-#: data/simple-scan.ui:294
-msgid "_Stop Scan"
-msgstr "Py_säytä kuvanluku"
+#. Toolbar scan menu item to scan continuously from the flatbed
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/app-window.ui:40 src/app-window.ui:143 src/app-window.ui:838
+msgid "_Multiple Pages From Flatbed"
+msgstr "_Useita sivuja tasokuvanlukijasta"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:853
 msgid "Text"
 msgstr "Teksti"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:863
 msgid "Photo"
 msgstr "Valokuva"
 
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: src/app-window.ui:91
+msgid "_Document"
+msgstr "_Asiakirja"
+
+#. Scan menu item
+#: src/app-window.ui:110
+msgid "Sc_an"
+msgstr "Lue kuv_a"
+
+#. Menu entry to stop current scan
+#: src/app-window.ui:154
+msgid "_Stop Scan"
+msgstr "Py_säytä kuvanluku"
+
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/app-window.ui:196 src/app-window.vala:967 src/app-window.vala:1590
 msgid "Reorder Pages"
 msgstr "Järjestä sivut"
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/app-window.ui:215
 msgid "_Email"
 msgstr "_Sähköposti"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/app-window.ui:280
 msgid "_Page"
 msgstr "_Sivu"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/app-window.ui:290
 msgid "Rotate _Left"
 msgstr "Kierrä _vasemmalle"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/app-window.ui:300
 msgid "Rotate _Right"
 msgstr "Kierrä _oikealle"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/app-window.ui:310
 msgid "_Crop"
 msgstr "_Rajaa"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/app-window.ui:320
 msgid "_None"
 msgstr "_Ei mitään"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/app-window.ui:331
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/app-window.ui:342
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/app-window.ui:353
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/app-window.ui:364
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/app-window.ui:375
 msgid "Le_gal"
 msgstr "US Legal"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/app-window.ui:386
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/app-window.ui:397
 msgid "_Custom"
 msgstr "_Muu"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/app-window.ui:415
 msgid "_Rotate Crop"
 msgstr "Kierr_ä rajausta"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/app-window.ui:428
 msgid "Move Left"
 msgstr "Siirrä vasemmalle"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/app-window.ui:437
 msgid "Move Right"
 msgstr "Siirrä oikealle"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/app-window.ui:474
 msgid "_Help"
 msgstr "O_hje"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/app-window.ui:482
 msgid "_Contents"
 msgstr "_Sisältö"
 
-#. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
-msgid "Start a new document"
-msgstr "Aloita uusi asiakirja"
-
-#: data/simple-scan.ui:675
-msgid "New"
-msgstr "Uusi"
-
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/app-window.ui:520 src/app-window.ui:720
 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/app-window.ui:522 src/app-window.ui:716
 msgid "Scan"
 msgstr "Lue"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/app-window.ui:538 src/app-window.ui:787
 msgid "Save document to a file"
 msgstr "Tallenna asiakirja tiedostoon"
 
-#: ../src/ui.vala:1842
+#: src/app-window.ui:540
 msgid "Save"
 msgstr "Tallenna"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/app-window.ui:555 src/app-window.ui:700
 msgid "Stop the current scan"
 msgstr "Pysäytä kuvan lukeminen"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/app-window.ui:556 src/app-window.ui:697
 msgid "Stop"
 msgstr "Pysäytä"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "Kierrä sivua vasemmalle (vastapäivään)"
+#. Label shown when searching for scanners
+#: src/app-window.ui:611
+msgid "Searching for Scanners…"
+msgstr "Etsitään kuvanlukijoita…"
 
-#. Label on rotate page left (anti-clockwise) item
-#: data/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
-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
-msgid "Rotate Right"
-msgstr "Kierrä oikealle"
-
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
-msgid "Crop the selected page"
-msgstr "Rajaa nykyistä sivua"
-
-#: data/simple-scan.ui:781
-msgid "Crop"
-msgstr "Rajaa"
-
-#: ../src/ui.vala:1849
-msgid "Preferences"
-msgstr "Asetukset"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1048
-msgid "Scan S_ource:"
-msgstr "Lue lähtee_stä:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1079
-msgid "_Text Resolution:"
-msgstr "_Tekstin tarkkuus:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1095
-msgid "_Photo Resolution:"
-msgstr "_Valokuvan tarkkuus:"
-
-#. Label beside scan side combo box
-#: data/simple-scan.ui:1139
-msgid "Scan Side:"
-msgstr "Luettava puoli:"
-
-#. Label beside page size combo box
-#: data/simple-scan.ui:1169
-msgid "Page Size:"
-msgstr "Sivun koko:"
-
-#. Label beside brightness scale
-#: data/simple-scan.ui:1199
-msgid "Brightness:"
-msgstr "Kirkkaus:"
-
-#. Label beside contrast scale
-#: data/simple-scan.ui:1229
-msgid "Contrast:"
-msgstr "Kontrasti:"
-
-#. Label beside quality scale
-#: data/simple-scan.ui:1260
-msgid "Quality:"
-msgstr "Laatu:"
-
-#: data/simple-scan.desktop.in:4
-msgid "Document Scanner"
-msgstr "Asiakirjojen kuvanlukuohjelma"
-
-#: data/simple-scan.desktop.in:5
-msgid "Scan Documents"
-msgstr "Lue asiakirjoja kuvanlukijalta"
+#: src/app-window.vala:237 src/app-window.vala:1380
+msgid "_Close"
+msgstr "_Sulje"
 
-#: data/simple-scan.desktop.in:6
-msgid "scan;scanner;flatbed;adf;"
-msgstr "kuvanluku;skanneri;scan;scanner;flatbed;adf;"
+#. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
+#: src/app-window.vala:246
+#, c-format
+#| msgid "Username and password required to access '%s'"
+msgid "Username and password required to access “%s”"
+msgstr "Käyttäjänimi ja salasana vaaditaan laitteen “%s” käyttämiseksi"
 
-#: data/simple-scan.desktop.in:8
-msgid "scanner"
-msgstr ""
+#. Label shown when detected a scanner
+#: src/app-window.vala:266 src/app-window.vala:584
+#| msgid "Failed to scan"
+msgid "Ready to Scan"
+msgstr "Valmiina lukemaan"
 
-#: data/simple-scan.appdata.xml.in:8
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-"Helppo tapa lukea (skannata) asiakirjoja ja valokuvia. Voit rajata huonot "
-"osat valokuvista pois tai kääntää niitä. Luettuja kuvia voidaan tulostaa, "
-"viedä PDF-muotoon tai tallentaa eri kuvamuodoissa."
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: src/app-window.vala:273
+msgid "Additional software needed"
+msgstr "Lisäohjelmistoja vaaditaan"
 
-#: data/simple-scan.appdata.xml.in:13
+#. Instructions to install driver software
+#: src/app-window.vala:275
+#| msgid "You need to install driver software for your scanner."
 msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
+"You need to <a href=\"install-firmware\">install driver software</a> for "
+"your scanner."
 msgstr ""
-"Tämä sovellus käyttää SANE-kehystä tukeakseen useimpia olemassa olevia "
-"kuvanlukijoita."
-
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
-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
-msgid "Unable to connect to scanner"
-msgstr "Kuvanlukijaan ei voi yhdistää"
-
-#. Error display when unable to start scan
-#: ../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
-msgid "Error communicating with scanner"
-msgstr "Virhe viestinnässä kuvanlukijan kanssa"
-
-#. Help string for command line --version flag
-#: ../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
-msgid "Print debugging messages"
-msgstr "Tulosta virheenjäljitysviestit"
-
-#: ../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
-msgid "Failed to scan"
-msgstr "Kuvanluku epäonnistui"
-
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
-msgid "[DEVICE...] - Scanning utility"
-msgstr "[LAITE...] - Skannaus apuohjelma"
-
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
-#, 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
-msgid "_Close"
-msgstr "_Sulje"
-
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../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"
+"Kuvanlukijaa varten on <a href=\"install-firmware\">asennettava erillinen "
+"ajuri</a>."
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/app-window.vala:281
 msgid "No scanners detected"
 msgstr "Kuvanlukijoita ei havaittu"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/app-window.vala:283
 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
-msgid "Additional software needed"
-msgstr "Lisäohjelmistoja vaaditaan"
-
-#. Instructions to install driver software
-#: ../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
-msgid "Save As..."
-msgstr "Tallenna nimellä..."
+#: src/app-window.vala:298
+#| msgid "Save As..."
+msgid "Save As…"
+msgstr "Tallenna nimellä…"
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/app-window.vala:301 src/app-window.vala:471 src/app-window.vala:552
 msgid "_Cancel"
 msgstr "_Peru"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/app-window.vala:302 src/app-window.vala:553
 msgid "_Save"
 msgstr "_Tallenna"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/app-window.vala:310
 msgid "Scanned Document.pdf"
 msgstr "Asiakirja kuvanlukijasta.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#. Save dialog: Filter name to show only supported image files
+#: src/app-window.vala:316
 msgid "Image Files"
 msgstr "Kuvatiedostot"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/app-window.vala:326
 msgid "All Files"
 msgstr "Kaikki tiedostot"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/app-window.vala:335
 msgid "PDF (multi-page document)"
 msgstr "PDF (monisivuinen asiakirja)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/app-window.vala:341
 msgid "JPEG (compressed)"
 msgstr "JPEG (pakattu)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/app-window.vala:347
 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
+#. Save dialog: Label for sabing in WEBP format
+#: src/app-window.vala:354
+#| msgid "JPEG (compressed)"
+msgid "WebP (compressed)"
+msgstr "WebP (pakattu)"
+
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
+#: src/app-window.vala:364
 msgid "File format:"
 msgstr "Tiedostomuoto:"
 
+#. Label in save dialog beside compression slider
+#: src/app-window.vala:376
+msgid "Compression:"
+msgstr "Pakkaus:"
+
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/app-window.vala:470
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr "Tiedosto nimeltä “%s” on jo olemassa. Haluatko korvata sen?"
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/app-window.vala:473
+msgid "_Replace"
+msgstr "_Korvaa"
+
+#: src/app-window.vala:512
+msgid "Saving"
+msgstr "Tallennetaan"
+
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/app-window.vala:527
 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
-msgid "If you don't save, changes will be permanently lost."
+#: src/app-window.vala:550
+#| msgid "If you don't save, changes will be permanently lost."
+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/app-window.vala:591
 msgid "Save current document?"
 msgstr "Tallennetaanko nykyinen asiakirja?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/app-window.vala:593
 msgid "Discard Changes"
 msgstr "Hylkää muutokset"
 
+#. Label shown when scan started
+#: src/app-window.vala:692
+#| msgid "Change _Scanner"
+msgid "Contacting scanner…"
+msgstr "Yhdistetään kuvanlukijaan…"
+
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/app-window.vala:800
 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/app-window.vala:812
 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/app-window.vala:990
 msgid "Combine sides"
 msgstr "Yhdistä puolet"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/app-window.vala:1000
 msgid "Combine sides (reverse)"
 msgstr "Yhdistä puolet (käänteinen)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/app-window.vala:1010
 msgid "Reverse"
 msgstr "Käänteinen"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/app-window.vala:1020
 msgid "Keep unchanged"
 msgstr "Säilytä muuttumattomana"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/app-window.vala:1250
 msgid "Unable to open help file"
 msgstr "Ohjetiedostoa ei voi avata"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/app-window.vala:1271
 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,22 +555,24 @@ msgstr ""
 "lisätietoja lisenssistä GNU General Public Licence.\n"
 "\n"
 "Sinun olisi pitänyt saada kopio lisenssistä GNU General Public Licence\n"
-"tämän ohjelman mukana. Jos et saanut, katso lisätietoja osoitteesta "
-"<http://www.gnu.org/licenses/>."
+"tämän ohjelman mukana. Jos et saanut, katso lisätietoja osoitteesta <http://"
+"www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/app-window.vala:1274
 msgid "About Simple Scan"
 msgstr "Tietoja sovelluksesta"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/app-window.vala:1277
 msgid "Simple document scanning tool"
 msgstr "Yksinkertainen asiakirjojen kuvanlukutyökalu"
 
-#: ../src/ui.vala:1487
+#: src/app-window.vala:1286
 msgid "translator-credits"
 msgstr ""
+"Jiri Grönroos\n"
+"\n"
 "Launchpad Contributions:\n"
 "  Elias Julkunen https://launchpad.net/~eliasj\n"
 "  Heidi Mattila https://launchpad.net/~hessuk-deactivatedaccount\n"
@@ -564,204 +584,546 @@ msgstr ""
 "  Ville Pilvio https://launchpad.net/~vpilvio"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/app-window.vala:1308
 msgid "Save document before quitting?"
 msgstr "Tallennetaanko asiakirja ennen sovelluksen sulkemista?"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:1310
 msgid "Quit without Saving"
 msgstr "Sulje tallentamatta"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/app-window.vala:1357
 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/app-window.vala:1359
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.brother.com\">Brother website</a>."
+"Drivers for this are available on the <a href=\"http://support.brother.com"
+"\">Brother website</a>."
 msgstr ""
 "Sen ajurit voi ladata <a href=\"http://support.brother.com\">Brotherin "
 "verkkosivustolta</a>."
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/app-window.vala:1363
 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/app-window.vala:1365
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://samsung.com/support\">Samsung website</a>."
+"Drivers for this are available on the <a href=\"http://samsung.com/support"
+"\">Samsung website</a>."
 msgstr ""
 "Sen ajurit voi ladata <a href=\"http://samsung.com/support\">Samsungin "
 "verkkosivustolta</a>."
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/app-window.vala:1369
 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/app-window.vala:1374
 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/app-window.vala:1376
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.epson.com\">Epson website</a>."
+"Drivers for this are available on the <a href=\"http://support.epson.com"
+"\">Epson website</a>."
 msgstr ""
 "Sen ajurit voi ladata <a href=\"http://support.epson.com\">Epsonin "
 "verkkosivustolta</a>."
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/app-window.vala:1380
 msgid "Install drivers"
 msgstr "Asenna ajurit"
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/app-window.vala:1411
 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
-msgid "Installing drivers..."
-msgstr "Asennetaan ajureita..."
+#: src/app-window.vala:1423
+#| msgid "Installing drivers..."
+msgid "Installing drivers…"
+msgstr "Asennetaan ajureita…"
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/app-window.vala:1431
 msgid "Drivers installed successfully!"
 msgstr "Ajurit asennettiin onnistuneesti!"
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/app-window.vala:1441
 #, 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/app-window.vala:1447
 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/app-window.vala:1454
+#, c-format
+#| msgid "You need to install the %s package(s)."
+msgid "You need to install the %s package."
+msgid_plural "You need to install the %s packages."
+msgstr[0] "%s paketti/paketit tulee asentaa."
+msgstr[1] "%s paketti/paketit tulee asentaa."
+
+#. Title of preferences dialog
+#: src/app-window.vala:1568 src/app-window.vala:1591
+#: src/preferences-dialog.ui:53
+msgid "Preferences"
+msgstr "Asetukset"
+
+#: src/app-window.vala:1572
+msgid "Keyboard Shortcuts"
+msgstr "Pikanäppäimet"
+
+#: src/app-window.vala:1573
+msgid "Help"
+msgstr "Ohje"
+
+#: src/app-window.vala:1574
+msgid "About"
+msgstr "Tietoja"
+
+#: src/app-window.vala:1575
+msgid "Quit"
+msgstr "Lopeta"
+
+#: src/app-window.vala:1589
+#| msgid "_Email"
+msgid "Email"
+msgstr "Sähköposti"
+
+#. Populate ActionBar (not supported in Glade)
+#. https://bugzilla.gnome.org/show_bug.cgi?id=769966
+#. Label on new document button
+#: src/app-window.vala:1599
+msgid "Start Again…"
+msgstr "Aloita uudelleen…"
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: src/app-window.vala:1616
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Kierrä sivua vasemmalle (vastapäivään)"
+
+#. Tooltip for rotate right (clockwise) button
+#: src/app-window.vala:1623
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Kierrä sivua oikealle (myötäpäivään)"
+
+#. Tooltip for crop button
+#: src/app-window.vala:1633
+msgid "Crop the selected page"
+msgstr "Rajaa nykyistä sivua"
+
+#. Tooltip for delete button
+#: src/app-window.vala:1649
+#| msgid "Crop the selected page"
+msgid "Delete the selected page"
+msgstr "Poista valittu sivu"
+
+#. Text of button for cancelling save
+#: src/app-window.vala:1814
+#| msgid "_Cancel"
+msgid "Cancel"
+msgstr "Peru"
+
+#. Button to submit authorization dialog
+#: src/authorize-dialog.ui:25
+msgid "_Authorize"
+msgstr "_Valtuuta"
+
+#. Label beside username entry
+#: src/authorize-dialog.ui:99
+msgid "_Username for resource:"
+msgstr "Resurssin _käyttäjänimi:"
+
+#. Label beside password entry
+#: src/authorize-dialog.ui:112
+msgid "_Password:"
+msgstr "_Salasana:"
+
+#: src/book.vala:331 src/book.vala:337
 #, c-format
-msgid "You need to install the %s package(s)."
-msgstr "%s paketti/paketit tulee asentaa."
+#| msgid "Unable to open help file"
+msgid "Unable to encode page %i"
+msgstr "Sivun %i koodaus epäonnistui"
+
+#: src/help-overlay.ui:12
+#| msgid "Scan"
+msgctxt "shortcut window"
+msgid "Scanning"
+msgstr "Kuvanluku"
+
+#: src/help-overlay.ui:17
+#| msgid "Scan a single page from the scanner"
+msgctxt "shortcut window"
+msgid "Scan a single page"
+msgstr "Lue yksi sivu kuvanlukijalta"
+
+#: src/help-overlay.ui:24
+#| msgid "Scan a single page from the scanner"
+msgctxt "shortcut window"
+msgid "Scan all pages from document feeder"
+msgstr "Lue kaikki sivut asiakirjasyöttäjältä"
+
+#: src/help-overlay.ui:31
+#| msgid "Scan a single page from the scanner"
+msgctxt "shortcut window"
+msgid "Scan continuously from a flatbed scanner"
+msgstr "Lue jatkuvasti tasokuvanlukijasta"
+
+#: src/help-overlay.ui:38
+msgctxt "shortcut window"
+msgid "Stop scan in progress"
+msgstr "Pysäytä käynnissä olevan kuvanluku"
+
+#: src/help-overlay.ui:46
+#| msgid "Document Scanner"
+msgctxt "shortcut window"
+msgid "Document Modification"
+msgstr "Asiakirjan muokkaus"
+
+#: src/help-overlay.ui:51
+#| msgid "Move Left"
+msgctxt "shortcut window"
+msgid "Move page left"
+msgstr "Siirrä sivu vasemmalle"
+
+#: src/help-overlay.ui:58
+#| msgid "Move Right"
+msgctxt "shortcut window"
+msgid "Move page right"
+msgstr "Siirrä sivu oikealle"
+
+#: src/help-overlay.ui:65
+#| msgid "Rotate the page to the left (counter-clockwise)"
+msgctxt "shortcut window"
+msgid "Rotate page to the left (anti-clockwise)"
+msgstr "Kierrä sivua vasemmalle (vastapäivään)"
+
+#: src/help-overlay.ui:72
+#| msgid "Rotate the page to the right (clockwise)"
+msgctxt "shortcut window"
+msgid "Rotate page to the right (clockwise)"
+msgstr "Kierrä sivua oikealle (myötäpäivään)"
+
+#: src/help-overlay.ui:79
+#| msgid "Crop the selected page"
+msgctxt "shortcut window"
+msgid "Delete page"
+msgstr "Poista sivu"
+
+#: src/help-overlay.ui:87
+#| msgid "Document Scanner"
+msgctxt "shortcut window"
+msgid "Document Management"
+msgstr "Asiakirjan hallinta"
+
+#: src/help-overlay.ui:92
+#| msgid "Start a new document"
+msgctxt "shortcut window"
+msgid "Start new document"
+msgstr "Aloita uusi asiakirja"
+
+#: src/help-overlay.ui:99
+#| msgid "Scanned Document"
+msgctxt "shortcut window"
+msgid "Save scanned document"
+msgstr "Tallenna luettu asiakirja"
+
+#: src/help-overlay.ui:106
+#| msgid "Scanned Document"
+msgctxt "shortcut window"
+msgid "Email scanned document"
+msgstr "Lähetä luettu asiakirja sähköpostitse"
+
+#: src/help-overlay.ui:113
+#| msgid "Scanned Document"
+msgctxt "shortcut window"
+msgid "Print scanned document"
+msgstr "Tulosta luettu asiakirja"
+
+#: src/help-overlay.ui:120
+msgctxt "shortcut window"
+msgid "Copy current page to clipboard"
+msgstr "Kopioi nykyinen sivu leikepöydälle"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:113
+#| msgid "Change _Scanner"
+msgid "_Scanner"
+msgstr "_Kuvanlukija"
+
+#. Label beside scan side combo box
+#: src/preferences-dialog.ui:143
+#| msgid "Scan Side:"
+msgid "Scan Sides"
+msgstr "Luettava puoli"
+
+#. Label beside page size combo box
+#: src/preferences-dialog.ui:160
+#| msgid "Page Size:"
+msgid "Page Size"
+msgstr "Sivun koko"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:191
+msgid "Front"
+msgstr "Etupuoli"
+
+#. Preferences Dialog: Toggle button to select scanning on the back side of a page
+#: src/preferences-dialog.ui:206
+msgid "Back"
+msgstr "Takapuoli"
+
+#. Preferences Dialog: Toggle button to select scanning on both sides of a page
+#: src/preferences-dialog.ui:221
+msgid "Both"
+msgstr "Molemmat"
+
+#. Label beside page delay scale
+#: src/preferences-dialog.ui:260
+msgid "Delay"
+msgstr "Viive"
+
+#. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
+#: src/preferences-dialog.ui:276
+msgid "Multiple pages from flatbed"
+msgstr "Useita sivuja tasokuvanlukijasta"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:295
+msgid "3"
+msgstr "3"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:310
+msgid "5"
+msgstr "5"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:326
+msgid "7"
+msgstr "7"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:342
+msgid "10"
+msgstr "10"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:358
+msgid "15"
+msgstr "15"
+
+#. Label after page delay radio buttons
+#: src/preferences-dialog.ui:385
+msgid "Seconds"
+msgstr "sekuntia"
+
+#. Preferences Dialog: Tab label for scanning settings
+#: src/preferences-dialog.ui:413
+#| msgid "Scan"
+msgid "Scanning"
+msgstr "Kuvanluku"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:436
+#| msgid "_Text Resolution:"
+msgid "_Text Resolution"
+msgstr "_Tekstin tarkkuus"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:452
+#| msgid "_Photo Resolution:"
+msgid "_Photo Resolution"
+msgstr "_Valokuvan tarkkuus"
+
+#. Label beside brightness scale
+#: src/preferences-dialog.ui:505
+#| msgid "Brightness:"
+msgid "Brightness"
+msgstr "Kirkkaus"
+
+#. Label beside contrast scale
+#: src/preferences-dialog.ui:521
+#| msgid "Contrast:"
+msgid "Contrast"
+msgstr "Kontrasti"
+
+#. Preferences Dialog: Tab for quality settings
+#: src/preferences-dialog.ui:576
+#| msgid "Quality:"
+msgid "Quality"
+msgstr "Laatu"
+
+#. Combo box value for automatic paper size
+#: src/preferences-dialog.vala:77
+msgid "Automatic"
+msgstr "Automaattinen"
+
+#: src/preferences-dialog.vala:116
+msgid "Darker"
+msgstr "Tummempi"
+
+#: src/preferences-dialog.vala:118
+msgid "Lighter"
+msgstr "Vaaleampi"
+
+#: src/preferences-dialog.vala:126
+msgid "Less"
+msgstr "Vähemmän"
+
+#: src/preferences-dialog.vala:128
+msgid "More"
+msgstr "Enemmän"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/preferences-dialog.vala:440
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (oletus)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/preferences-dialog.vala:443
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (vedos)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/preferences-dialog.vala:446
 #, 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/preferences-dialog.vala:449
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1835
-msgid "New Document"
-msgstr "Uusi asiakirja"
+#. Error displayed when no scanners to scan with
+#: src/scanner.vala:844
+msgid "No scanners available.  Please connect a scanner."
+msgstr "Kuvanlukijoita ei löydy. Yhdistä kuvanlukija."
 
-#: ../src/ui.vala:1840
-msgid "Document"
-msgstr "Asiakirja"
+#. Error displayed when cannot connect to scanner
+#: src/scanner.vala:874
+msgid "Unable to connect to scanner"
+msgstr "Kuvanlukijaan ei voi yhdistää"
 
-#: ../src/ui.vala:1844
-msgid "Email..."
-msgstr "Sähköposti..."
+#. Error display when unable to start scan
+#: src/scanner.vala:1227
+msgid "Unable to start scan"
+msgstr "Kuvanluvun käynnistäminen ei onnistu"
 
-#: ../src/ui.vala:1845
-msgid "Print..."
-msgstr "Tulosta..."
+#. Error displayed when communication with scanner broken
+#: src/scanner.vala:1240 src/scanner.vala:1340
+msgid "Error communicating with scanner"
+msgstr "Virhe viestinnässä kuvanlukijan kanssa"
 
-#: ../src/ui.vala:1853
-msgid "Help"
-msgstr "Ohje"
+#. Help string for command line --version flag
+#: src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "Näytä julkaisuversio"
 
-#: ../src/ui.vala:1854
-msgid "About"
-msgstr "Tietoja"
+#. Help string for command line --debug flag
+#: src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Tulosta virheenjäljitysviestit"
 
-#: ../src/ui.vala:1855
-msgid "Quit"
-msgstr "Lopeta"
+#: src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+msgstr "Korjaa vanhemmilla Kuvanlukijan versioilla luodut PDF-tiedostot"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
-msgid "Change _Scanner"
-msgstr "Muuta _kuvanlukijaa"
+#. Title of error dialog when scan failed
+#: src/simple-scan.vala:392
+msgid "Failed to scan"
+msgstr "Kuvanluku epäonnistui"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
-msgid "_Install Drivers"
-msgstr "_Asenna ajurit"
+#. Attempt to inhibit the screensaver when scanning
+#: src/simple-scan.vala:407
+msgid "Scan in progress"
+msgstr "Kuvanluku meneillään"
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
-msgid "Automatic"
-msgstr "Automaattinen"
+#. Arguments and description for --help text
+#: src/simple-scan.vala:584
+#| msgid "[DEVICE...] - Scanning utility"
+msgid "[DEVICE…] — Scanning utility"
+msgstr "[LAITE...] — Kuvanlukusovellus"
 
-#: ../src/ui.vala:1947
-msgid "Darker"
-msgstr "Tummempi"
+#. Text printed out when an unknown command-line argument provided
+#: src/simple-scan.vala:595
+#, c-format
+#| msgid ""
+#| "Run '%s --help' to see a full list of available command line options."
+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:1949
-msgid "Lighter"
-msgstr "Vaaleampi"
+#~ msgid "Front and Back"
+#~ msgstr "Etu- ja takapuoli"
 
-#: ../src/ui.vala:1957
-msgid "Less"
-msgstr "Vähemmän"
+#~ msgid "New"
+#~ msgstr "Uusi"
 
-#: ../src/ui.vala:1959
-msgid "More"
-msgstr "Enemmän"
+#~ msgid "Rotate Left"
+#~ msgstr "Kierrä vasemmalle"
 
-#: ../src/ui.vala:1967
-msgid "Minimum"
-msgstr "Heikompi"
+#~ msgid "Rotate Right"
+#~ msgstr "Kierrä oikealle"
 
-#: ../src/ui.vala:1969
-msgid "Maximum"
-msgstr "Parempi"
+#~ msgid "Crop"
+#~ msgstr "Rajaa"
 
-#: ../src/ui.vala:2008
-msgid "Saving document..."
-msgstr "Tallennetaan asiakirjaa..."
+#~ msgid "Scan S_ource:"
+#~ msgstr "Lue lähtee_stä:"
 
-#: ../src/ui.vala:2173
-#, c-format
-msgid "Saving page %d out of %d"
-msgstr "Tallennetaan sivua %d/%d"
+#~ msgid "New Document"
+#~ msgstr "Uusi asiakirja"
+
+#~ msgid "Document"
+#~ msgstr "Asiakirja"
+
+#~ msgid "Email..."
+#~ msgstr "Sähköposti..."
+
+#~ msgid "Print..."
+#~ msgstr "Tulosta..."
+
+#~ msgid "_Install Drivers"
+#~ msgstr "_Asenna ajurit"
+
+#~ msgid "Minimum"
+#~ msgstr "Heikompi"
+
+#~ msgid "Maximum"
+#~ msgstr "Parempi"
+
+#~ msgid "Saving document..."
+#~ msgstr "Tallennetaan asiakirjaa..."
+
+#~ msgid "Saving page %d out of %d"
+#~ msgstr "Tallennetaan sivua %d/%d"
 
 #~ msgid "4&#xD7;6"
 #~ msgstr "4&#xD7;6"
 
-#, c-format
 #~ msgid ""
 #~ "GTK+ Options:\n"
 #~ "  --class=CLASS                   Program class as used by the window "
@@ -781,42 +1143,24 @@ msgstr "Tallennetaan sivua %d/%d"
 #~ "  --gtk-module=MODUULIT           Lataa lisäksi GTK+-moduulit\n"
 #~ "  --g-fatal-warnings              Tee kaikista varoituksista kuolettavia"
 
-#~ msgid "Device to scan from"
-#~ msgstr "Laite jolta luetaan"
-
 #~ msgid "Direction of scan"
 #~ msgstr "Lukemisen suunta"
 
-#~ msgid "SANE device to acquire images from."
-#~ msgstr "SANE-laite jolta kuvat luetaan."
-
 #~ msgid "Files missing"
 #~ msgstr "Tiedostoja puuttuu"
 
 #~ msgid "Height of scanned image in pixels"
 #~ msgstr "Luetun kuvan korkeus pikseleissä"
 
-#~ msgid "Resolution for text scans"
-#~ msgstr "Tarkkuus tekstin lukemiseen"
-
-#~ msgid "Resolution for photo scans"
-#~ msgstr "Tarkkuus valokuvien luvulle"
-
 #~ msgid "Resolution of last scanned image"
 #~ msgstr "Viimeisimmän luetun kuvan tarkkuus"
 
-#~ msgid "Directory to save files to"
-#~ msgstr "Kansio, johon tiedostot tallennetaan"
-
 #~ msgid "Window height in pixels"
 #~ msgstr "Ikkunan korkeus pikseleinä"
 
 #~ msgid "Window width in pixels"
 #~ msgstr "Ikkunan leveys pikseleinä"
 
-#~ msgid "Scanned Document"
-#~ msgstr "Kuvanlukuasiakirja"
-
 #~ msgid "Select File _Type"
 #~ msgstr "Valitse tiedosto_tyyppi"
 
@@ -826,7 +1170,6 @@ msgstr "Tallennetaan sivua %d/%d"
 #~ msgid "TRUE if the application window is maximized"
 #~ msgstr "Arvo TOSI, jos sovelluksen ikkuna on suurennettu"
 
-#, c-format
 #~ msgid ""
 #~ "Usage:\n"
 #~ "  %s [DEVICE...] - Scanning utility"
@@ -838,64 +1181,34 @@ msgstr "Tallennetaan sivua %d/%d"
 #~ "The height of scanned image in pixels. This value is updated to what the "
 #~ "last scanned page was."
 #~ msgstr ""
-#~ "Luettavan kuvan korkeus pikseleinä. Arvo päivittyy viimeisimmän luetun sivun "
-#~ "mukaan."
-
-#~ msgid ""
-#~ "The directory to save files to. Defaults to the documents directory if unset."
-#~ msgstr ""
-#~ "Kansio, johon tiedostot tallennetaan. Oletusasetus on Asiakirjat-kansio."
-
-#~ msgid "Type of document being scanned"
-#~ msgstr "Luettavan asiakirjan tyyppi"
+#~ "Luettavan kuvan korkeus pikseleinä. Arvo päivittyy viimeisimmän luetun "
+#~ "sivun mukaan."
 
 #~ msgid "Width of scanned image in pixels"
 #~ msgstr "Luettavan kuvan leveys pikseleinä"
 
 #~ msgid ""
-#~ "The width of scanned image in pixels. This value is updated to what the last "
-#~ "scanned page was."
+#~ "The width of scanned image in pixels. This value is updated to what the "
+#~ "last scanned page was."
 #~ msgstr ""
 #~ "Skannattavan kuvan leveys pikseleinä. Arvo päivittyy viimeksi skannatun "
 #~ "sivun mukaan."
 
-#~ msgid "Page side to scan"
-#~ msgstr "Skannattava puoli"
-
-#~ msgid "Height of paper in tenths of a mm"
-#~ msgstr "Paperin pituus kymmenesosamilleinä"
-
-#~ msgid ""
-#~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
-#~ msgstr "Skannattava puoli. Mahdollisia valintoja ovat: molemmat, etu ja taka"
-
 #~ msgid ""
-#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
+#~ "The page side to scan. It can be one of the following: 'both' 'front' "
+#~ "'back'"
 #~ msgstr ""
-#~ "Paperin pituus kymmenesosamilleinä (tai 0 automaattista paperintunnistusta "
-#~ "varten)."
-
-#~ msgid ""
-#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
-#~ msgstr ""
-#~ "Paperin leveys kymmenesosamilleinä (tai 0 automaattista paperintunnistusta "
-#~ "varten)."
-
-#~ msgid "Width of paper in tenths of a mm"
-#~ msgstr "Paperin leveys kymmenesosamilleinä"
+#~ "Skannattava puoli. Mahdollisia valintoja ovat: molemmat, etu ja taka"
 
 #~ msgid ""
 #~ "Type of document being scanned. 'text' for text documents, 'photo' for "
 #~ "photos. This setting decides on the scan resolution, colors and post-"
 #~ "processing."
 #~ msgstr ""
-#~ "Skannattavan dokumentin luokka. Valitse 'teksti' tekstidokumentteja varten "
-#~ "tai 'kuva' kuvia varten. Tämä asetus määrää skannaus koon, värit ja "
-#~ "jälkiprosessoinnin."
+#~ "Skannattavan dokumentin luokka. Valitse 'teksti' tekstidokumentteja "
+#~ "varten tai 'kuva' kuvia varten. Tämä asetus määrää skannaus koon, värit "
+#~ "ja jälkiprosessoinnin."
 
-#, c-format
 #~ msgid ""
 #~ "Help Options:\n"
 #~ "  -d, --debug                     Print debugging messages\n"
@@ -911,50 +1224,17 @@ msgstr "Tallennetaan sivua %d/%d"
 #~ "  --help-all Näytä kaikki apuvalinnat\n"
 #~ "  --help-gtk Näytä kaikki GTK+-valinnat"
 
-#~ msgid "The resolution in dots-per-inch to use when scanning photos."
-#~ msgstr "Käytettävä resoluutio pisteinä tuumaa kohti skannattaessa kuvia."
-
-#~ msgid "The resolution in dots-per-inch to use when scanning text."
-#~ msgstr "Käytettävä resoluutio pisteinä tuumaa kohti skannattaessa tekstiä."
-
 #~ msgid "The resolution in dots-per-inch of the previously scanned image."
 #~ msgstr "Viimeksi skannatun kuvan resoluutio pisteinä tuumaa kohti."
 
 #~ msgid ""
-#~ "The direction of the scanner across the scanned page. It can be one of the "
-#~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
-#~ msgstr ""
-#~ "Skannerin suunta skannatun sivun yli. Se voi olla jokin seuraavista: 'top-to-"
-#~ "bottom' 'bottom-to-top' 'left-to-right' 'right-to-left' ('ylhäältä alas' "
-#~ "'alhaalta ylös' 'vasemmalta oikealle' 'oikealta vasemmalle')"
-
-#~ msgid ""
-#~ "Type of document being scanned. This setting decides on the scan resolution, "
-#~ "colors and post-processing."
+#~ "The direction of the scanner across the scanned page. It can be one of "
+#~ "the following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-"
+#~ "left'"
 #~ msgstr ""
-#~ "Luettavan asiakirjan tyyppi. Tämä asetus määrittää tarkkuuden, värit ja "
-#~ "jälkiprosessoinnin."
-
-#~ msgid "The page side to scan."
-#~ msgstr "Skannattavan sivun puoli."
+#~ "Skannerin suunta skannatun sivun yli. Se voi olla jokin seuraavista: 'top-"
+#~ "to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left' ('ylhäältä "
+#~ "alas' 'alhaalta ylös' 'vasemmalta oikealle' 'oikealta vasemmalle')"
 
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "Skannerin kulkusuunta skannattavan sivun suhteen."
-
-#~ msgid "Quality value to use for JPEG compression."
-#~ msgstr "JPEG-pakkaukseen käytettävä laatuarvo."
-
-#~ msgid "Quality value to use for JPEG compression"
-#~ msgstr "JPEG-pakkaukseen käytettävä laatuarvo"
-
-#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
-#~ msgstr "Kirkkaussäätö asteikolla -100 - 100 (0 on ei yhtään)"
-
-#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
-#~ msgstr "Kontrastisäätö asteikolla -100 - 100 (0 on ei yhtään)"
-
-#~ msgid "Brightness of scan"
-#~ msgstr "Kuvanluvun kirkkaus"
-
-#~ msgid "Contrast of scan"
-#~ msgstr "Kuvanluvun kontrasti"
diff --git a/po/fr.gmo b/po/fr.gmo
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..d9308fb 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,519 +6,530 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-07-29 12:47+1200\n"
-"PO-Revision-Date: 2016-08-14 10:33+0000\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
+"product=simple-scan&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-08-07 02:27+0000\n"
+"PO-Revision-Date: 2017-08-22 16:58+0200\n"
 "Last-Translator: Anne017 <anneonyme017@openmailbox.org>\n"
 "Language-Team: French <fr@li.org>\n"
+"Language: fr\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-25 06:10+0000\n"
+"X-Generator: Poedit 1.8.11\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#. Button to submit authorization dialog
-#: data/simple-scan.ui:24
-msgid "_Authorize"
-msgstr "_Autoriser"
+#: data/org.gnome.SimpleScan.gschema.xml:11
+msgid "Device to scan from"
+msgstr "Numériser depuis"
 
-#. Label beside username entry
-#: data/simple-scan.ui:102
-msgid "_Username for resource:"
-msgstr "_Utilisateur :"
+#: data/org.gnome.SimpleScan.gschema.xml:12
+msgid "SANE device to acquire images from."
+msgstr "Périphérique SANE à utiliser pour l’acquisition des images."
 
-#. Label beside password entry
-#: data/simple-scan.ui:117
-msgid "_Password:"
-msgstr "_Mot de passe :"
+#: data/org.gnome.SimpleScan.gschema.xml:20
+msgid "Type of document being scanned"
+msgstr "Type de document numérisé"
 
-#. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
-msgid "Front and Back"
-msgstr "Recto-verso"
+#: data/org.gnome.SimpleScan.gschema.xml:21
+msgid ""
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+msgstr ""
+"Type de document numérisé. Ce réglage définit la résolution de numérisation, "
+"les couleurs et le post-traitement."
 
-#. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
-msgid "Front"
-msgstr "Recto"
+#: data/org.gnome.SimpleScan.gschema.xml:25
+msgid "Width of paper in tenths of a mm"
+msgstr "Largeur du papier en dixièmes de mm."
 
-#. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
-msgid "Back"
-msgstr "Verso"
+#: data/org.gnome.SimpleScan.gschema.xml:26
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"La largeur du papier en dixièmes de mm (ou 0 pour une détection automatique "
+"du papier)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:30
+msgid "Height of paper in tenths of a mm"
+msgstr "Hauteur du papier en dixièmes de mm"
+
+#: data/org.gnome.SimpleScan.gschema.xml:31
+msgid ""
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"La hauteur du papier en dixièmes de mm (ou 0 pour une détection automatique "
+"du papier)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:35
+msgid "Brightness of scan"
+msgstr "Luminosité de la numérisation"
+
+#: data/org.gnome.SimpleScan.gschema.xml:36
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr "L’ajustement de la luminosité de -100 à 100 (0 pour aucun)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:40
+msgid "Contrast of scan"
+msgstr "Contraste de la numérisation"
+
+#: data/org.gnome.SimpleScan.gschema.xml:41
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr "L’ajustement du contraste de -100 à 100 (0 pour aucun)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:45
+msgid "Resolution for text scans"
+msgstr "Résolution des numérisations de textes"
+
+#: data/org.gnome.SimpleScan.gschema.xml:46
+msgid "The resolution in dots-per-inch to use when scanning text."
+msgstr ""
+"La résolution en points par pouce à utiliser lors de la numérisation de "
+"texte."
+
+#: data/org.gnome.SimpleScan.gschema.xml:50
+msgid "Resolution for photo scans"
+msgstr "Résolution des numérisations de photos"
+
+#: data/org.gnome.SimpleScan.gschema.xml:51
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr ""
+"La résolution en points par pouce à utiliser lors de la numérisation de "
+"photos."
+
+#: data/org.gnome.SimpleScan.gschema.xml:55
+msgid "Page side to scan"
+msgstr "Face de la page à numériser"
+
+#: data/org.gnome.SimpleScan.gschema.xml:56
+msgid "The page side to scan."
+msgstr "La face de la page à numériser."
+
+#: data/org.gnome.SimpleScan.gschema.xml:60
+msgid "Directory to save files to"
+msgstr "Dossier dans lequel les fichiers sont enregistrés"
+
+#: data/org.gnome.SimpleScan.gschema.xml:61
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+"Le dossier dans lequel les fichiers sont enregistrés. S’il n’est pas défini, "
+"le dossier « Documents » sera utilisé par défaut."
+
+#: data/org.gnome.SimpleScan.gschema.xml:66
+msgid "Quality value to use for JPEG compression"
+msgstr "Taux de qualité à utiliser pour la compression JPEG"
+
+#: data/org.gnome.SimpleScan.gschema.xml:67
+msgid "Quality value to use for JPEG compression."
+msgstr "Taux de qualité à utiliser pour la compression JPEG."
+
+#: data/org.gnome.SimpleScan.gschema.xml:72
+msgid "Delay in millisecond between pages"
+msgstr "Délai en millisecondes entre les pages"
+
+#: data/org.gnome.SimpleScan.gschema.xml:73
+msgid "Delay in millisecond between pages."
+msgstr "Délai en millisecondes entre les pages."
 
 #. 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
+#. Set HeaderBar title here because Glade doesn't keep it translated
+#. https://bugzilla.gnome.org/show_bug.cgi?id=782753
+#. Title of scan window
+#: data/simple-scan.appdata.xml.in:6 data/simple-scan.desktop.in:3
+#: src/app-window.ui:76 src/app-window.vala:1560
 msgid "Simple Scan"
 msgstr "Outil de numérisation Simple Scan"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
-msgid "_Document"
-msgstr "_Document"
+#: data/simple-scan.appdata.xml.in:7 data/simple-scan.desktop.in:5
+msgid "Scan Documents"
+msgstr "Numériser des documents"
 
-#. Scan menu item
-#: data/simple-scan.ui:260
-msgid "Sc_an"
-msgstr "Nu_mériser"
+#: 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 "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+"Une façon très simple de numériser à la fois documents et photos. Vous "
+"pouvez recadrer une photo et la faire pivoter si elle est dans le mauvais "
+"sens. Vous pouvez imprimer vos numérisations, les exporter au format pdf ou "
+"les enregistrer dans d’autres formats d’image."
 
+#: data/simple-scan.appdata.xml.in:14
+msgid "Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+"Simple Scan utilise la structure logicielle de SANE pour prendre en charge "
+"la plupart des périphériques de numérisation existants."
+
+#: data/simple-scan.desktop.in:4
+msgid "Document Scanner"
+msgstr "Numériseur de documents"
+
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: data/simple-scan.desktop.in:7
+msgid "scan;scanner;flatbed;adf;"
+msgstr "numériser;scanner;numériseur;à plat;adf;"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: data/simple-scan.desktop.in:10
+msgid "scanner"
+msgstr "scanner"
+
+#. Toolbar scan menu item to scan a single page from the scanner
 #. 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/app-window.ui:22 src/app-window.ui:123 src/app-window.ui:820
 msgid "Single _Page"
 msgstr "_Page unique"
 
+#. Toolbar scan menu item to scan all pages from a document feeder
 #. 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/app-window.ui:31 src/app-window.ui:133 src/app-window.ui:829
 msgid "All Pages From _Feeder"
-msgstr "Toutes les pages du _chargeur"
+msgstr "Toutes les pages du _bac d’alimentation"
 
-#. Menu entry to stop current scan
-#: data/simple-scan.ui:294
-msgid "_Stop Scan"
-msgstr "_Arrêter la numérisation"
+#. Toolbar scan menu item to scan continuously from the flatbed
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/app-window.ui:40 src/app-window.ui:143 src/app-window.ui:838
+msgid "_Multiple Pages From Flatbed"
+msgstr "Pages _multiples depuis un numériseur à plat"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:853
 msgid "Text"
 msgstr "Texte"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:863
 msgid "Photo"
 msgstr "Photo"
 
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: src/app-window.ui:91
+msgid "_Document"
+msgstr "_Document"
+
+#. Scan menu item
+#: src/app-window.ui:110
+msgid "Sc_an"
+msgstr "Nu_mériser"
+
+#. Menu entry to stop current scan
+#: src/app-window.ui:154
+msgid "_Stop Scan"
+msgstr "_Arrêter la numérisation"
+
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/app-window.ui:196 src/app-window.vala:967 src/app-window.vala:1590
 msgid "Reorder Pages"
 msgstr "Réorganiser les pages"
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/app-window.ui:215
 msgid "_Email"
 msgstr "_Courriel"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/app-window.ui:280
 msgid "_Page"
 msgstr "_Page"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/app-window.ui:290
 msgid "Rotate _Left"
 msgstr "Faire pivoter vers la _gauche"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/app-window.ui:300
 msgid "Rotate _Right"
 msgstr "Faire pivoter vers la _droite"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/app-window.ui:310
 msgid "_Crop"
 msgstr "Re_cadrer"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/app-window.ui:320
 msgid "_None"
 msgstr "Aucu_n"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/app-window.ui:331
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/app-window.ui:342
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/app-window.ui:353
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/app-window.ui:364
 msgid "_Letter"
 msgstr "_Letter (US)"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/app-window.ui:375
 msgid "Le_gal"
 msgstr "_Legal (US)"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/app-window.ui:386
 msgid "4×6"
 msgstr "4 × 6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/app-window.ui:397
 msgid "_Custom"
 msgstr "_Personnalisé"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/app-window.ui:415
 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/app-window.ui:428
 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/app-window.ui:437
 msgid "Move Right"
 msgstr "Déplacer vers la droite"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/app-window.ui:474
 msgid "_Help"
 msgstr "_Aide"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/app-window.ui:482
 msgid "_Contents"
 msgstr "_Contenus"
 
-#. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
-msgid "Start a new document"
-msgstr "Créer un nouveau document"
-
-#: data/simple-scan.ui:675
-msgid "New"
-msgstr "Nouveau"
-
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/app-window.ui:520 src/app-window.ui:720
 msgid "Scan a single page from the scanner"
-msgstr "Numériser une seule page depuis le périphérique de numérisation"
+msgstr "Numériser une seule page depuis le numériseur"
 
 #. Label on scan toolbar item
-#: data/simple-scan.ui:691 data/simple-scan.ui:837
+#: src/app-window.ui:522 src/app-window.ui:716
 msgid "Scan"
 msgstr "Numériser"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/app-window.ui:538 src/app-window.ui:787
 msgid "Save document to a file"
 msgstr "Enregistrer le document dans un fichier"
 
-#: ../src/ui.vala:1842
+#: src/app-window.ui:540
 msgid "Save"
 msgstr "Enregistrer"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/app-window.ui:555 src/app-window.ui:700
 msgid "Stop the current scan"
 msgstr "Arrêter la numérisation en cours"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/app-window.ui:556 src/app-window.ui:697
 msgid "Stop"
 msgstr "Arrêter"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "Faire pivoter la page vers la gauche (sens antihoraire)"
-
-#. Label on rotate page left (anti-clockwise) item
-#: data/simple-scan.ui:750
-msgid "Rotate Left"
-msgstr "Faire pivoter vers la gauche"
-
-#. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
-msgid "Rotate the page to the right (clockwise)"
-msgstr "Faire pivoter la page vers la droite (sens horaire)"
-
-#. Label on rotate page right (clockwise) item
-#: data/simple-scan.ui:765
-msgid "Rotate Right"
-msgstr "Faire pivoter vers la droite"
-
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
-msgid "Crop the selected page"
-msgstr "Recadrer la page sélectionnée"
-
-#: data/simple-scan.ui:781
-msgid "Crop"
-msgstr "Recadrer"
-
-#: ../src/ui.vala:1849
-msgid "Preferences"
-msgstr "Préférences"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1048
-msgid "Scan S_ource:"
-msgstr "S_ource de numérisation :"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1079
-msgid "_Text Resolution:"
-msgstr "Résolution pour le _texte :"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1095
-msgid "_Photo Resolution:"
-msgstr "Résolution de la _photo :"
-
-#. Label beside scan side combo box
-#: data/simple-scan.ui:1139
-msgid "Scan Side:"
-msgstr "Face à numériser :"
-
-#. Label beside page size combo box
-#: data/simple-scan.ui:1169
-msgid "Page Size:"
-msgstr "Taille de la page :"
-
-#. Label beside brightness scale
-#: data/simple-scan.ui:1199
-msgid "Brightness:"
-msgstr "Luminosité :"
-
-#. Label beside contrast scale
-#: data/simple-scan.ui:1229
-msgid "Contrast:"
-msgstr "Contraste :"
+#. Label shown when searching for scanners
+#: src/app-window.ui:611
+msgid "Searching for Scanners…"
+msgstr "Recherche de périphériques de numérisation…."
 
-#. Label beside quality scale
-#: data/simple-scan.ui:1260
-msgid "Quality:"
-msgstr "Qualité :"
-
-#: data/simple-scan.desktop.in:4
-msgid "Document Scanner"
-msgstr "Numériseur de documents"
-
-#: data/simple-scan.desktop.in:5
-msgid "Scan Documents"
-msgstr "Numériser des documents"
+#: src/app-window.vala:237 src/app-window.vala:1380
+msgid "_Close"
+msgstr "_Fermer"
 
-#: data/simple-scan.desktop.in:6
-msgid "scan;scanner;flatbed;adf;"
-msgstr "numériser;scanner;numériseur;à plat;adf;"
+#. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
+#: src/app-window.vala:246
+#, c-format
+msgid "Username and password required to access “%s”"
+msgstr "Nom d’utilisateur et mot de passe nécessaires pour accéder à « %s »"
 
-#: data/simple-scan.desktop.in:8
-msgid "scanner"
-msgstr "numériseur"
+#. Label shown when detected a scanner
+#: src/app-window.vala:266 src/app-window.vala:584
+msgid "Ready to Scan"
+msgstr "Prêt à numériser"
 
-#: data/simple-scan.appdata.xml.in:8
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-"Une façon très simple de numériser à la fois documents et photos. Vous "
-"pouvez recadrer une photo et la faire pivoter si elle est dans le mauvais "
-"sens. Vous pouvez imprimer vos numérisations, les exporter au format pdf ou "
-"les enregistrer dans d'autres formats d'image."
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: src/app-window.vala:273
+msgid "Additional software needed"
+msgstr "Logiciel supplémentaire nécessaire"
 
-#: data/simple-scan.appdata.xml.in:13
+#. Instructions to install driver software
+#: src/app-window.vala:275
 msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
+"You need to <a href=\"install-firmware\">install driver software</a> for "
+"your scanner."
 msgstr ""
-"Simple Scan utilise la structure logicielle de SANE pour prendre en charge "
-"la plupart des périphériques de numérisation existants."
-
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala: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
-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
-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
-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
-msgid "Show release version"
-msgstr "Afficher les informations de version"
-
-#. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
-msgid "Print debugging messages"
-msgstr "Afficher les messages de débogage"
-
-#: ../src/simple-scan.vala:26
-msgid "Fix PDF files generated with older versions of Simple Scan"
-msgstr ""
-"Corriger les fichiers PDF générés avec les anciennes versions de Simple Scan"
-
-#. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:391
-msgid "Failed to scan"
-msgstr "Échec de la numérisation"
-
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
-msgid "[DEVICE...] - Scanning utility"
-msgstr "[DEVICE...] - Outil de numérisation"
-
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
-#, c-format
-msgid "Run '%s --help' to see a full list of available command line options."
-msgstr ""
-"Exécutez « %s --help » pour voir la liste complète des options disponibles "
-"en ligne de commande."
-
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
-msgid "_Close"
-msgstr "_Fermer"
-
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../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 »"
+"Vous devez <a href=\"install-firmware\">installer le logiciel du pilote</a> de votre périphérique de "
+"numérisation."
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/app-window.vala:281
 msgid "No scanners detected"
-msgstr "Aucun périphérique de numérisation n'a été détecté."
+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/app-window.vala:283
 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
-msgid "Additional software needed"
-msgstr "Logiciel supplémentaire nécessaire"
-
-#. Instructions to install driver software
-#: ../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
-msgid "Save As..."
-msgstr "Enregistrer sous..."
+#: src/app-window.vala:298
+msgid "Save As…"
+msgstr "Enregistrer sous…"
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/app-window.vala:301 src/app-window.vala:471 src/app-window.vala:552
 msgid "_Cancel"
 msgstr "_Annuler"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/app-window.vala:302 src/app-window.vala:553
 msgid "_Save"
 msgstr "_Enregistrer"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/app-window.vala:310
 msgid "Scanned Document.pdf"
 msgstr "Document numérisé.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#. Save dialog: Filter name to show only supported image files
+#: src/app-window.vala:316
 msgid "Image Files"
 msgstr "Fichiers image"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/app-window.vala:326
 msgid "All Files"
 msgstr "Tous les fichiers"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/app-window.vala:335
 msgid "PDF (multi-page document)"
 msgstr "PDF (document multipage)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/app-window.vala:341
 msgid "JPEG (compressed)"
 msgstr "JPEG (compressé)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/app-window.vala:347
 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
+#. Save dialog: Label for sabing in WEBP format
+#: src/app-window.vala:354
+msgid "WebP (compressed)"
+msgstr "WebP (compressé)"
+
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
+#: src/app-window.vala:364
 msgid "File format:"
 msgstr "Format du fichier :"
 
+#. Label in save dialog beside compression slider
+#: src/app-window.vala:376
+msgid "Compression:"
+msgstr "Compression :"
+
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/app-window.vala:470
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr "Un fichier nommé « %s » existe déjà. Souhaitez-vous le remplacer ?"
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/app-window.vala:473
+msgid "_Replace"
+msgstr "_Remplacer"
+
+#: src/app-window.vala:512
+msgid "Saving"
+msgstr "Enregistrement"
+
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/app-window.vala:527
 msgid "Failed to save file"
-msgstr "Impossible d'enregistrer le fichier"
+msgstr "Impossible d’enregistrer le fichier"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
-msgid "If you don't save, changes will be permanently lost."
+#: src/app-window.vala:550
+msgid "If you don’t save, changes will be permanently lost."
 msgstr ""
-"Si vous n'enregistrez pas, les modifications seront définitivement perdues."
+"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/app-window.vala:591
 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/app-window.vala:593
 msgid "Discard Changes"
 msgstr "Abandonner les modifications"
 
+#. Label shown when scan started
+#: src/app-window.vala:692
+msgid "Contacting scanner…"
+msgstr "Contact du périphérique de numérisation…"
+
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/app-window.vala:800
 msgid "Unable to save image for preview"
-msgstr "Impossible d'enregistrer l'image pour la prévisualiser"
+msgstr "Impossible d’enregistrer l’image pour la prévisualiser"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/app-window.vala:812
 msgid "Unable to open image preview application"
-msgstr "Impossible d'ouvrir l'aperçu de l'image"
+msgstr "Impossible d’ouvrir l’aperçu de l’image"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/app-window.vala:990
 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/app-window.vala:1000
 msgid "Combine sides (reverse)"
 msgstr "Associer les côtés (inverser)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/app-window.vala:1010
 msgid "Reverse"
 msgstr "Inverser"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/app-window.vala:1020
 msgid "Keep unchanged"
 msgstr "Maintenir inchangé"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/app-window.vala:1250
 msgid "Unable to open help file"
-msgstr "Impossible d'ouvrir le fichier d'aide"
+msgstr "Impossible d’ouvrir le fichier d’aide"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/app-window.vala:1271
 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,26 +549,26 @@ msgstr ""
 "par la Free Software Foundation, dans sa version 3 ou supérieure\n"
 "(selon votre choix).\n"
 "\n"
-"Ce programme est distribué dans l'espoir d'être utile, mais\n"
+"Ce programme est distribué dans l’espoir d’être utile, mais\n"
 "SANS AUCUNE GARANTIE, y compris les garanties de \n"
-"COMMERCIALISATION ou d'ADAPTATION À UN BUT SPÉCIFIQUE.\n"
+"COMMERCIALISATION ou d’ADAPTATION À UN BUT SPÉCIFIQUE.\n"
 "Consultez la licence publique générale GNU pour plus de détails.\n"
 "\n"
 "Vous devez avoir reçu une copie de la licence publique générale GNU\n"
-"en même temps que ce programme ; si ce n'est pas le cas, consultez\n"
+"en même temps que ce programme ; si ce n’est pas le cas, consultez\n"
 "<http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/app-window.vala:1274
 msgid "About Simple Scan"
 msgstr "À propos de Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/app-window.vala:1277
 msgid "Simple document scanning tool"
 msgstr "Numériser simplement vos documents"
 
-#: ../src/ui.vala:1487
+#: src/app-window.vala:1286
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -597,405 +608,464 @@ msgstr ""
 "  torglut https://launchpad.net/~torglut"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/app-window.vala:1308
 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
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:1310
 msgid "Quit without Saving"
 msgstr "Quitter sans enregistrer"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/app-window.vala:1357
 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/app-window.vala:1359
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.brother.com\">Brother website</a>."
+"Drivers for this are available on the <a href=\"http://support.brother.com"
+"\">Brother website</a>."
 msgstr ""
-"Les pilotes sont disponibles sur le <a "
-"href=\"http://support.brother.com\">site Web de Brother</a>."
+"Les pilotes sont disponibles sur le <a href=\"http://support.brother.com"
+"\">site Web de Brother</a>."
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/app-window.vala:1363
 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/app-window.vala:1365
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://samsung.com/support\">Samsung website</a>."
+"Drivers for this are available on the <a href=\"http://samsung.com/support"
+"\">Samsung website</a>."
 msgstr ""
-"Les pilotes sont disponibles sur le <a "
-"href=\"http://samsung.com/support\">site Web de Samsung</a>."
+"Les pilotes sont disponibles sur le <a href=\"http://samsung.com/support"
+"\">site Web de Samsung</a>."
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/app-window.vala:1369
 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/app-window.vala:1374
 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/app-window.vala:1376
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.epson.com\">Epson website</a>."
+"Drivers for this are available on the <a href=\"http://support.epson.com"
+"\">Epson website</a>."
 msgstr ""
-"Les pilotes sont disponibles sur le <a "
-"href=\"http://support.epson.com\">site web d'Epson</a>."
+"Les pilotes sont disponibles sur le <a href=\"http://support.epson.com"
+"\">site web d’Epson</a>."
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/app-window.vala:1380
 msgid "Install drivers"
 msgstr "Installer les pilotes"
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/app-window.vala:1411
 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
-msgid "Installing drivers..."
-msgstr "Installation des pilotes..."
+#: src/app-window.vala:1423
+msgid "Installing drivers…"
+msgstr "Installation des pilotes…"
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/app-window.vala:1431
 msgid "Drivers installed successfully!"
 msgstr "Pilotes installés avec succès !"
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/app-window.vala:1441
 #, c-format
 msgid "Failed to install drivers (error code %d)."
-msgstr "Impossible d'installer les pilotes (code d'erreur %d)."
+msgstr "Impossible d’installer les pilotes (code d’erreur %d)."
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/app-window.vala:1447
 msgid "Failed to install drivers."
-msgstr "Impossible d'installer les pilotes."
+msgstr "Impossible d’installer les pilotes."
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/app-window.vala:1454
 #, c-format
-msgid "You need to install the %s package(s)."
-msgstr "Vous devez installer le(s) paquet(s) %s."
+msgid "You need to install the %s package."
+msgid_plural "You need to install the %s packages."
+msgstr[0] "Vous devez installer le paquet %s."
+msgstr[1] "Vous devez installer les paquets %s."
+
+#. Title of preferences dialog
+#: src/app-window.vala:1568 src/app-window.vala:1591
+#: src/preferences-dialog.ui:53
+msgid "Preferences"
+msgstr "Préférences"
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
-#, c-format
-msgid "%d dpi (default)"
-msgstr "%d ppp (par défaut)"
+#: src/app-window.vala:1572
+msgid "Keyboard Shortcuts"
+msgstr "Raccourcis clavier"
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
-#, c-format
-msgid "%d dpi (draft)"
-msgstr "%d ppp (brouillon)"
+#: src/app-window.vala:1573
+msgid "Help"
+msgstr "Aide"
 
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
-#, c-format
-msgid "%d dpi (high resolution)"
-msgstr "%d ppp (haute résolution)"
+#: src/app-window.vala:1574
+msgid "About"
+msgstr "À propos"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/app-window.vala:1575
+msgid "Quit"
+msgstr "Quitter"
+
+#: src/app-window.vala:1589
+msgid "Email"
+msgstr "Courriel"
+
+#. Populate ActionBar (not supported in Glade)
+#. https://bugzilla.gnome.org/show_bug.cgi?id=769966
+#. Label on new document button
+#: src/app-window.vala:1599
+msgid "Start Again…"
+msgstr "Recommencer…"
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: src/app-window.vala:1616
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Faire pivoter la page vers la gauche (sens antihoraire)"
+
+#. Tooltip for rotate right (clockwise) button
+#: src/app-window.vala:1623
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Faire pivoter la page vers la droite (sens horaire)"
+
+#. Tooltip for crop button
+#: src/app-window.vala:1633
+msgid "Crop the selected page"
+msgstr "Recadrer la page sélectionnée"
+
+#. Tooltip for delete button
+#: src/app-window.vala:1649
+msgid "Delete the selected page"
+msgstr "Supprimer la page sélectionnée"
+
+#. Text of button for cancelling save
+#: src/app-window.vala:1814
+msgid "Cancel"
+msgstr "Annuler"
+
+#. Button to submit authorization dialog
+#: src/authorize-dialog.ui:25
+msgid "_Authorize"
+msgstr "_Autoriser"
+
+#. Label beside username entry
+#: src/authorize-dialog.ui:99
+msgid "_Username for resource:"
+msgstr "_Utilisateur :"
+
+#. Label beside password entry
+#: src/authorize-dialog.ui:112
+msgid "_Password:"
+msgstr "_Mot de passe :"
+
+#: src/book.vala:331 src/book.vala:337
 #, c-format
-msgid "%d dpi"
-msgstr "%d ppp"
+msgid "Unable to encode page %i"
+msgstr "Impossible d’encoder la page %i"
+
+#: src/help-overlay.ui:12
+msgctxt "shortcut window"
+msgid "Scanning"
+msgstr "Numérisation"
+
+#: src/help-overlay.ui:17
+msgctxt "shortcut window"
+msgid "Scan a single page"
+msgstr "Numériser une seule page"
+
+#: src/help-overlay.ui:24
+msgctxt "shortcut window"
+msgid "Scan all pages from document feeder"
+msgstr "Numériser toutes les pages depuis le bac d’alimentation du numériseur"
+
+#: src/help-overlay.ui:31
+msgctxt "shortcut window"
+msgid "Scan continuously from a flatbed scanner"
+msgstr "Numériser en continuer depuis le numériseur"
+
+#: src/help-overlay.ui:38
+msgctxt "shortcut window"
+msgid "Stop scan in progress"
+msgstr "Stopper la numérisation en cours"
+
+#: src/help-overlay.ui:46
+msgctxt "shortcut window"
+msgid "Document Modification"
+msgstr "Modification du document"
+
+#: src/help-overlay.ui:51
+msgctxt "shortcut window"
+msgid "Move page left"
+msgstr "Déplacer la page vers la gauche"
+
+#: src/help-overlay.ui:58
+msgctxt "shortcut window"
+msgid "Move page right"
+msgstr "Déplacer la page vers la droite"
+
+#: src/help-overlay.ui:65
+msgctxt "shortcut window"
+msgid "Rotate page to the left (anti-clockwise)"
+msgstr "Faire pivoter la page vers la gauche (sens antihoraire)"
 
-#: ../src/ui.vala:1835
-msgid "New Document"
-msgstr "Nouveau document"
+#: src/help-overlay.ui:72
+msgctxt "shortcut window"
+msgid "Rotate page to the right (clockwise)"
+msgstr "Faire pivoter la page vers la droite (sens horaire)"
 
-#: ../src/ui.vala:1840
-msgid "Document"
-msgstr "Document"
+#: src/help-overlay.ui:79
+msgctxt "shortcut window"
+msgid "Delete page"
+msgstr "Supprimer la page"
 
-#: ../src/ui.vala:1844
-msgid "Email..."
-msgstr "Courriel..."
+#: src/help-overlay.ui:87
+msgctxt "shortcut window"
+msgid "Document Management"
+msgstr "Gestion de documents"
 
-#: ../src/ui.vala:1845
-msgid "Print..."
-msgstr "Imprimer..."
+#: src/help-overlay.ui:92
+msgctxt "shortcut window"
+msgid "Start new document"
+msgstr "Créer un nouveau document"
 
-#: ../src/ui.vala:1853
-msgid "Help"
-msgstr "Aide"
+#: src/help-overlay.ui:99
+msgctxt "shortcut window"
+msgid "Save scanned document"
+msgstr "Sauvegarder le document numérisé"
 
-#: ../src/ui.vala:1854
-msgid "About"
-msgstr "À propos"
+#: src/help-overlay.ui:106
+msgctxt "shortcut window"
+msgid "Email scanned document"
+msgstr "Envoyer par courriel le document numérisé"
 
-#: ../src/ui.vala:1855
-msgid "Quit"
-msgstr "Quitter"
+#: src/help-overlay.ui:113
+msgctxt "shortcut window"
+msgid "Print scanned document"
+msgstr "Imprimer le document numérisé"
+
+#: src/help-overlay.ui:120
+msgctxt "shortcut window"
+msgid "Copy current page to clipboard"
+msgstr "Copier la page courante dans le presse-papier"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
-msgid "Change _Scanner"
-msgstr "Changer de _périphérique de numérisation"
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:113
+msgid "_Scanner"
+msgstr "_Numériseur"
+
+#. Label beside scan side combo box
+#: src/preferences-dialog.ui:143
+msgid "Scan Sides"
+msgstr "Faces à numériser"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
-msgid "_Install Drivers"
-msgstr "_Installer les pilotes"
+#. Label beside page size combo box
+#: src/preferences-dialog.ui:160
+msgid "Page Size"
+msgstr "Taille de la page"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:191
+msgid "Front"
+msgstr "Recto"
+
+#. Preferences Dialog: Toggle button to select scanning on the back side of a page
+#: src/preferences-dialog.ui:206
+msgid "Back"
+msgstr "Verso"
+
+#. Preferences Dialog: Toggle button to select scanning on both sides of a page
+#: src/preferences-dialog.ui:221
+msgid "Both"
+msgstr "Recto-verso"
+
+#. Label beside page delay scale
+#: src/preferences-dialog.ui:260
+msgid "Delay"
+msgstr "Délai"
+
+#. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
+#: src/preferences-dialog.ui:276
+msgid "Multiple pages from flatbed"
+msgstr "Pages multiples depuis un numériseur à plat"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:295
+msgid "3"
+msgstr "3"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:310
+msgid "5"
+msgstr "5"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:326
+msgid "7"
+msgstr "7"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:342
+msgid "10"
+msgstr "10"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:358
+msgid "15"
+msgstr "15"
+
+#. Label after page delay radio buttons
+#: src/preferences-dialog.ui:385
+msgid "Seconds"
+msgstr "Secondes"
+
+#. Preferences Dialog: Tab label for scanning settings
+#: src/preferences-dialog.ui:413
+msgid "Scanning"
+msgstr "Numérisation"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:436
+msgid "_Text Resolution"
+msgstr "Résolution du _texte"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:452
+msgid "_Photo Resolution"
+msgstr "Résolution de la _photo"
+
+#. Label beside brightness scale
+#: src/preferences-dialog.ui:505
+msgid "Brightness"
+msgstr "Luminosité"
+
+#. Label beside contrast scale
+#: src/preferences-dialog.ui:521
+msgid "Contrast"
+msgstr "Contraste"
+
+#. Preferences Dialog: Tab for quality settings
+#: src/preferences-dialog.ui:576
+msgid "Quality"
+msgstr "Qualité"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/preferences-dialog.vala:77
 msgid "Automatic"
 msgstr "Automatique"
 
-#: ../src/ui.vala:1947
+#: src/preferences-dialog.vala:116
 msgid "Darker"
 msgstr "Plus foncé"
 
-#: ../src/ui.vala:1949
+#: src/preferences-dialog.vala:118
 msgid "Lighter"
 msgstr "Plus clair"
 
-#: ../src/ui.vala:1957
+#: src/preferences-dialog.vala:126
 msgid "Less"
 msgstr "Moins"
 
-#: ../src/ui.vala:1959
+#: src/preferences-dialog.vala:128
 msgid "More"
 msgstr "Plus"
 
-#: ../src/ui.vala:1967
-msgid "Minimum"
-msgstr "Minimum"
+#. Preferences dialog: Label for default resolution in resolution list
+#: src/preferences-dialog.vala:440
+#, c-format
+msgid "%d dpi (default)"
+msgstr "%d ppp (par défaut)"
 
-#: ../src/ui.vala:1969
-msgid "Maximum"
-msgstr "Maximum"
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: src/preferences-dialog.vala:443
+#, c-format
+msgid "%d dpi (draft)"
+msgstr "%d ppp (brouillon)"
 
-#: ../src/ui.vala:2008
-msgid "Saving document..."
-msgstr "Enregistrement du document..."
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: src/preferences-dialog.vala:446
+#, c-format
+msgid "%d dpi (high resolution)"
+msgstr "%d ppp (haute résolution)"
 
-#: ../src/ui.vala:2173
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: src/preferences-dialog.vala:449
 #, c-format
-msgid "Saving page %d out of %d"
-msgstr "Enregistrement de la page %d sur %d"
+msgid "%d dpi"
+msgstr "%d ppp"
 
-#~ msgid "Please check your installation"
-#~ msgstr "Veuillez vérifier votre installation"
+#. Error displayed when no scanners to scan with
+#: src/scanner.vala:844
+msgid "No scanners available.  Please connect a scanner."
+msgstr ""
+"Aucun périphérique de numérisation disponible. Veuillez en connecter un."
 
-#~ msgid "Files missing"
-#~ msgstr "Fichiers manquants"
+#. Error displayed when cannot connect to scanner
+#: src/scanner.vala:874
+msgid "Unable to connect to scanner"
+msgstr "Impossible de se connecter au périphérique de numérisation"
 
-#, c-format
-#~ msgid ""
-#~ "Usage:\n"
-#~ "  %s [DEVICE...] - Scanning utility"
-#~ msgstr ""
-#~ "Usage :\n"
-#~ "  %s [PÉRIPHÉRIQUE...] - utilitaire de numérisation"
+#. Error display when unable to start scan
+#: src/scanner.vala:1227
+msgid "Unable to start scan"
+msgstr "Impossible de démarrer la numérisation"
 
-#, c-format
-#~ msgid ""
-#~ "GTK+ Options:\n"
-#~ "  --class=CLASS                   Program class as used by the window "
-#~ "manager\n"
-#~ "  --name=NAME                     Program name as used by the window "
-#~ "manager\n"
-#~ "  --screen=SCREEN                 X screen to use\n"
-#~ "  --sync                          Make X calls synchronous\n"
-#~ "  --gtk-module=MODULES            Load additional GTK+ modules\n"
-#~ "  --g-fatal-warnings              Make all warnings fatal"
-#~ msgstr ""
-#~ "Options GTK+ :\n"
-#~ "  --class=CLASSE Classe du programme telle qu'utilisée par le gestionnaire "
-#~ "de fenêtres\n"
-#~ "  --name=NOM Nom du programme tel qu'utilisé par le gestionnaire de "
-#~ "fenêtres\n"
-#~ "  --screen=ÉCRAN Écran X à utiliser\n"
-#~ "  --sync Rendre les appels X synchrones\n"
-#~ "  --gtk-module=MODULES Charger des modules GTK+ supplémentaires\n"
-#~ "  --g-fatal-warnings Rendre tous les avertissements fatals"
-
-#~ msgid "Window height in pixels"
-#~ msgstr "Hauteur de la fenêtre en pixels"
-
-#~ msgid "Window width in pixels"
-#~ msgstr "Largeur de la fenêtre en pixels"
-
-#~ msgid "TRUE if the application window is maximized"
-#~ msgstr "VRAI si la fenêtre de l'application est maximisée"
-
-#~ msgid ""
-#~ "The height of scanned image in pixels. This value is updated to what the "
-#~ "last scanned page was."
-#~ msgstr ""
-#~ "La hauteur de l'image numérisée en pixels. Cette valeur est mise à jour en "
-#~ "fonction de la dernière page numérisée."
-
-#~ msgid ""
-#~ "The width of scanned image in pixels. This value is updated to what the last "
-#~ "scanned page was."
-#~ msgstr ""
-#~ "La largeur de l'image numérisée en pixels. Cette valeur est mise à jour en "
-#~ "fonction de la dernière page numérisée."
-
-#~ msgid "Height of scanned image in pixels"
-#~ msgstr "Hauteur de l'image numérisée en pixels"
-
-#~ msgid "SANE device to acquire images from."
-#~ msgstr "Périphérique SANE à utiliser pour l'acquisition des images."
-
-#~ msgid "Resolution of last scanned image"
-#~ msgstr "Résolution de la dernière image numérisée"
-
-#~ msgid "Device to scan from"
-#~ msgstr "Numériser depuis"
-
-#~ msgid "Direction of scan"
-#~ msgstr "Sens de numérisation"
+#. Error displayed when communication with scanner broken
+#: src/scanner.vala:1240 src/scanner.vala:1340
+msgid "Error communicating with scanner"
+msgstr "Erreur de communication avec le périphérique de numérisation"
 
-#, c-format
-#~ msgid ""
-#~ "Help Options:\n"
-#~ "  -d, --debug                     Print debugging messages\n"
-#~ "  -v, --version                   Show release version\n"
-#~ "  -h, --help                      Show help options\n"
-#~ "  --help-all                      Show all help options\n"
-#~ "  --help-gtk                      Show GTK+ options"
-#~ msgstr ""
-#~ "Options d'aide :\n"
-#~ "  -d, --debug Affiche les messages d'erreur\n"
-#~ "  -v, --version Affiche le numéro de version\n"
-#~ "  -h, --help Affiche les options d'aide\n"
-#~ "  --help-all Affiche toutes les options d'aide\n"
-#~ "  --help-gtk Affiche les options de GTK+"
-
-#~ msgid "Scanned Document"
-#~ msgstr "Document numérisé"
-
-#~ msgid ""
-#~ "The direction of the scanner across the scanned page. It can be one of the "
-#~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
-#~ msgstr ""
-#~ "Direction du balayage lors de la numérisation de la page. Celle-ci peut "
-#~ "être : de haut en bas ; de bas en haut ; de gauche à droite ; de droite à "
-#~ "gauche"
-
-#~ msgid "The resolution in dots-per-inch of the previously scanned image."
-#~ msgstr "La résolution de la dernière image numérisée en points par pouce."
-
-#~ msgid "The resolution in dots-per-inch to use when scanning text."
-#~ msgstr ""
-#~ "La résolution en points par pouce à utiliser lors de la numérisation de "
-#~ "texte."
-
-#~ msgid "The resolution in dots-per-inch to use when scanning photos."
-#~ msgstr ""
-#~ "La résolution en points par pouce à utiliser lors de la numérisation de "
-#~ "photos."
-
-#~ msgid "Width of scanned image in pixels"
-#~ msgstr "Largeur de l'image numérisée en pixels"
-
-#~ msgid ""
-#~ "Type of document being scanned. 'text' for text documents, 'photo' for "
-#~ "photos. This setting decides on the scan resolution, colors and post-"
-#~ "processing."
-#~ msgstr ""
-#~ "Nature du document qui va être numérisé. « texte » pour les documents texte, "
-#~ "« photo » pour les photographies. Ce paramètre détermine la résolution de "
-#~ "numérisation, le nombre de couleurs et les traitements postérieurs."
-
-#~ msgid "Select File _Type"
-#~ msgstr "Sélectionner le _type de fichier"
-
-#~ msgid "Height of paper in tenths of a mm"
-#~ msgstr "Hauteur du papier en dixièmes de mm"
-
-#~ msgid ""
-#~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
-#~ msgstr ""
-#~ "La ou les faces de la page à numériser. Cela peut être au choix : « Recto "
-#~ "verso », « Recto » ou « Verso »"
-
-#~ msgid ""
-#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
-#~ msgstr ""
-#~ "La largeur du papier en dixièmes de mm (ou 0 pour une détection automatique "
-#~ "du papier)."
-
-#~ msgid "Page side to scan"
-#~ msgstr "Face(s) de la page à numériser"
-
-#~ msgid ""
-#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
-#~ msgstr ""
-#~ "La hauteur du papier en dixièmes de mm (ou 0 pour une détection automatique "
-#~ "du papier)."
-
-#~ msgid "Width of paper in tenths of a mm"
-#~ msgstr "Largeur du papier en dixièmes de mm."
-
-#~ msgid "Directory to save files to"
-#~ msgstr "Dossier dans lequel les fichiers sont enregistrés"
-
-#~ msgid ""
-#~ "Type of document being scanned. This setting decides on the scan resolution, "
-#~ "colors and post-processing."
-#~ msgstr ""
-#~ "Type de document numérisé. Ce réglage définit la résolution de numérisation, "
-#~ "les couleurs et le post-traitement."
-
-#~ msgid "The direction of the scanner across the scanned page."
-#~ msgstr "Le sens du scanner par rapport à la page numérisée."
-
-#~ msgid "4&#xD7;6"
-#~ msgstr "4&#xD7;6"
-
-#~ msgid "Resolution for text scans"
-#~ msgstr "Résolution des numérisations de textes"
-
-#~ msgid "Resolution for photo scans"
-#~ msgstr "Résolution des numérisations de photos"
-
-#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
-#~ msgstr "L'ajustement du contraste de -100 à 100 (0 pour aucun)."
-
-#~ msgid "Contrast of scan"
-#~ msgstr "Contraste de la numérisation"
-
-#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
-#~ msgstr "L'ajustement de la luminosité de -100 à 100 (0 pour aucun)."
-
-#~ msgid "Brightness of scan"
-#~ msgstr "Luminosité de la numérisation"
-
-#~ msgid "Quality value to use for JPEG compression"
-#~ msgstr "Taux de qualité à utiliser pour la compression JPEG"
-
-#~ msgid "Quality value to use for JPEG compression."
-#~ msgstr "Taux de qualité à utiliser pour la compression JPEG."
-
-#~ msgid "Type of document being scanned"
-#~ msgstr "Type de document numérisé"
+#. Help string for command line --version flag
+#: src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "Afficher les informations de version"
 
-#~ msgid "The page side to scan."
-#~ msgstr "La face de la page à numériser."
+#. Help string for command line --debug flag
+#: src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Afficher les messages de débogage"
 
-#~ msgid ""
-#~ "The directory to save files to. Defaults to the documents directory if unset."
-#~ msgstr ""
-#~ "Le dossier dans lequel les fichiers sont enregistrés. S'il n'est pas défini, "
-#~ "le dossier « Documents » sera utilisé par défaut."
+#: 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:392
+msgid "Failed to scan"
+msgstr "Échec de la numérisation"
+
+#. Attempt to inhibit the screensaver when scanning
+#: src/simple-scan.vala:407
+msgid "Scan in progress"
+msgstr "Numérisation en cours"
+
+#. Arguments and description for --help text
+#: src/simple-scan.vala:584
+msgid "[DEVICE…] — Scanning utility"
+msgstr "[DEVICE…] - Outil de numérisation"
+
+#. Text printed out when an unknown command-line argument provided
+#: src/simple-scan.vala:595
+#, 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."
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
deleted file mode 100644
index d71d9bc..0000000
--- a/po/fr_CA.po
+++ /dev/null
@@ -1,843 +0,0 @@
-# French (Canada) translation for simple-scan
-# Copyright (c) 2016 Rosetta Contributors and Canonical Ltd 2016
-# This file is distributed under the same license as the simple-scan package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2016.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: simple-scan\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-07-29 12:47+1200\n"
-"PO-Revision-Date: 2016-04-13 19:31+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: French (Canada) <fr_CA@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-12-19 05:08+0000\n"
-"X-Generator: Launchpad (build 18298)\n"
-
-#. Button to submit authorization dialog
-#: data/simple-scan.ui:24
-msgid "_Authorize"
-msgstr "_Autoriser"
-
-#. Label beside username entry
-#: data/simple-scan.ui:102
-msgid "_Username for resource:"
-msgstr "_Utilisateur :"
-
-#. Label beside password entry
-#: data/simple-scan.ui:117
-msgid "_Password:"
-msgstr "_Mot de passe :"
-
-#. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
-msgid "Front and Back"
-msgstr "Recto-verso"
-
-#. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
-msgid "Front"
-msgstr "Recto"
-
-#. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
-msgid "Back"
-msgstr "Verso"
-
-#. Title of scan window
-#: data/simple-scan.ui:225 data/simple-scan.ui:809
-#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
-msgid "Simple Scan"
-msgstr "Outil de numérisation Simple Scan"
-
-#. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
-msgid "_Document"
-msgstr "_Document"
-
-#. Scan menu item
-#: data/simple-scan.ui:260
-msgid "Sc_an"
-msgstr "Nu_mériser"
-
-#. Scan menu item to scan a single page from the scanner
-#. Toolbar scan menu item to scan a single page from the scanner
-#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
-msgid "Single _Page"
-msgstr "_Page unique"
-
-#. Scan menu item to scan all pages from a document feeder
-#. Toolbar scan menu item to scan all pages from a document feeder
-#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
-msgid "All Pages From _Feeder"
-msgstr "Toutes les pages du _bac"
-
-#. Menu entry to stop current scan
-#: data/simple-scan.ui:294
-msgid "_Stop Scan"
-msgstr "_Arrêter la numérisation"
-
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
-msgid "Text"
-msgstr "Texte"
-
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
-msgid "Photo"
-msgstr "Photo"
-
-#. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
-msgid "Reorder Pages"
-msgstr "Réorganiser les pages"
-
-#. Label on email menu item
-#: data/simple-scan.ui:367
-msgid "_Email"
-msgstr "_Courriel"
-
-#. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
-msgid "_Page"
-msgstr "_Page"
-
-#. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
-msgid "Rotate _Left"
-msgstr "Faire pivoter vers la _gauche"
-
-#. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
-msgid "Rotate _Right"
-msgstr "Faire pivoter vers la _droite"
-
-#. Label for page crop submenu
-#: data/simple-scan.ui:460
-msgid "_Crop"
-msgstr "Re_cadrer"
-
-#. Radio button for no crop
-#: data/simple-scan.ui:470
-msgid "_None"
-msgstr "Aucu_n"
-
-#. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
-msgid "A_4"
-msgstr "A_4"
-
-#. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
-msgid "A_5"
-msgstr "A_5"
-
-#. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
-msgid "A_6"
-msgstr "A_6"
-
-#. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
-msgid "_Letter"
-msgstr "_Letter (US)"
-
-#. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
-msgid "Le_gal"
-msgstr "_Legal (US)"
-
-#. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
-msgid "4×6"
-msgstr "4 × 6"
-
-#. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
-msgid "_Custom"
-msgstr "_Personnalisé"
-
-#. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
-msgid "_Rotate Crop"
-msgstr "Faire pivote_r la sélection"
-
-#. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
-msgid "Move Left"
-msgstr "Déplacer vers la gauche"
-
-#. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
-msgid "Move Right"
-msgstr "Déplacer vers la droite"
-
-#. Label on help menu
-#: data/simple-scan.ui:624
-msgid "_Help"
-msgstr "_Aide"
-
-#. Help|Contents menu
-#: data/simple-scan.ui:632
-msgid "_Contents"
-msgstr "_Contenus"
-
-#. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
-msgid "Start a new document"
-msgstr "Créer un nouveau document"
-
-#: data/simple-scan.ui:675
-msgid "New"
-msgstr "Nouveau"
-
-#. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
-msgid "Scan a single page from the scanner"
-msgstr "Numériser une seule page depuis le périphérique de numérisation"
-
-#. Label on scan toolbar item
-#: data/simple-scan.ui:691 data/simple-scan.ui:837
-msgid "Scan"
-msgstr "Numériser"
-
-#. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
-msgid "Save document to a file"
-msgstr "Enregistrer le document dans un fichier"
-
-#: ../src/ui.vala:1842
-msgid "Save"
-msgstr "Enregistrer"
-
-#. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
-msgid "Stop the current scan"
-msgstr "Arrêter la numérisation en cours"
-
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
-msgid "Stop"
-msgstr "Arrêter"
-
-#. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "Faire pivoter la page vers la gauche (sens antihoraire)"
-
-#. Label on rotate page left (anti-clockwise) item
-#: data/simple-scan.ui:750
-msgid "Rotate Left"
-msgstr "Faire pivoter vers la gauche"
-
-#. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
-msgid "Rotate the page to the right (clockwise)"
-msgstr "Faire pivoter la page vers la droite (sens horaire)"
-
-#. Label on rotate page right (clockwise) item
-#: data/simple-scan.ui:765
-msgid "Rotate Right"
-msgstr "Faire pivoter vers la droite"
-
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
-msgid "Crop the selected page"
-msgstr "Recadrer la page sélectionnée"
-
-#: data/simple-scan.ui:781
-msgid "Crop"
-msgstr "Recadrer"
-
-#: ../src/ui.vala:1849
-msgid "Preferences"
-msgstr "Préférences"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1048
-msgid "Scan S_ource:"
-msgstr "S_ource de numérisation :"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1079
-msgid "_Text Resolution:"
-msgstr "Résolution pour le _texte :"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1095
-msgid "_Photo Resolution:"
-msgstr "Résolution de la _photo :"
-
-#. Label beside scan side combo box
-#: data/simple-scan.ui:1139
-msgid "Scan Side:"
-msgstr "Face à numériser :"
-
-#. Label beside page size combo box
-#: data/simple-scan.ui:1169
-msgid "Page Size:"
-msgstr "Taille de la page :"
-
-#. Label beside brightness scale
-#: data/simple-scan.ui:1199
-msgid "Brightness:"
-msgstr "Luminosité :"
-
-#. Label beside contrast scale
-#: data/simple-scan.ui:1229
-msgid "Contrast:"
-msgstr "Contraste :"
-
-#. Label beside quality scale
-#: data/simple-scan.ui:1260
-msgid "Quality:"
-msgstr "Qualité :"
-
-#: data/simple-scan.desktop.in:4
-msgid "Document Scanner"
-msgstr "Numériseur de documents"
-
-#: data/simple-scan.desktop.in:5
-msgid "Scan Documents"
-msgstr "Numériser des documents"
-
-#: data/simple-scan.desktop.in:6
-msgid "scan;scanner;flatbed;adf;"
-msgstr "numériser;scanner;numériseur;à plat;adf;"
-
-#: data/simple-scan.desktop.in:8
-msgid "scanner"
-msgstr ""
-
-#: data/simple-scan.appdata.xml.in:8
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-"Une façon très simple de numériser à la fois documents et photos. Vous "
-"pouvez recadrer une photo et la faire pivoter si elle est dans le mauvais "
-"sens. Vous pouvez imprimer vos numérisations, les exporter au format pdf ou "
-"les enregistrer dans d'autres formats d'image."
-
-#: data/simple-scan.appdata.xml.in:13
-msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
-"Simple Scan utilise la structure logicielle de SANE pour prendre en charge "
-"la plupart des périphériques de numérisation existants."
-
-#. Error displayed when no scanners to scan with
-#: ../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
-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
-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
-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
-msgid "Show release version"
-msgstr "Afficher les informations de version"
-
-#. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
-msgid "Print debugging messages"
-msgstr "Afficher les messages de débogage"
-
-#: ../src/simple-scan.vala:26
-msgid "Fix PDF files generated with older versions of Simple Scan"
-msgstr ""
-"Corriger les fichiers PDF générés avec les anciennes versions de Simple Scan"
-
-#. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:391
-msgid "Failed to scan"
-msgstr "Échec de la numérisation"
-
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
-msgid "[DEVICE...] - Scanning utility"
-msgstr "[DEVICE...] - Outil de numérisation"
-
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
-#, c-format
-msgid "Run '%s --help' to see a full list of available command line options."
-msgstr ""
-"Exécutez « %s --help » pour voir la liste complète des options disponibles "
-"en ligne de commande."
-
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
-msgid "_Close"
-msgstr "_Fermer"
-
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../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
-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
-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
-msgid "Additional software needed"
-msgstr "Logiciel supplémentaire nécessaire"
-
-#. Instructions to install driver software
-#: ../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
-msgid "Save As..."
-msgstr "Enregistrer sous..."
-
-#: ../src/ui.vala:509 ../src/ui.vala:675
-msgid "_Cancel"
-msgstr "_Annuler"
-
-#: ../src/ui.vala:510 ../src/ui.vala:676
-msgid "_Save"
-msgstr "_Enregistrer"
-
-#. Default filename to use when saving document
-#: ../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
-msgid "Image Files"
-msgstr "Fichiers image"
-
-#. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
-msgid "All Files"
-msgstr "Tous les fichiers"
-
-#. Save dialog: Label for saving in PDF format
-#: ../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
-msgid "JPEG (compressed)"
-msgstr "JPEG (compressé)"
-
-#. Save dialog: Label for saving in PNG format
-#: ../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
-msgid "File format:"
-msgstr "Format du fichier :"
-
-#. Title of error dialog when save failed
-#: ../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
-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
-msgid "Save current document?"
-msgstr "Enregistrer le document actuel ?"
-
-#. Button in dialog to create new document and discard unsaved document
-#: ../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
-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
-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
-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
-msgid "Combine sides (reverse)"
-msgstr "Associer les côtés (inverser)"
-
-#. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
-msgid "Reverse"
-msgstr "Inverser"
-
-#. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
-msgid "Keep unchanged"
-msgstr "Maintenir inchangé"
-
-#. Error message displayed when unable to launch help browser
-#: ../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
-msgid ""
-"This program is free software: you can redistribute it and/or modify\n"
-"it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation, either version 3 of the License, or\n"
-"(at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful,\n"
-"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program.  If not, see <http://www.gnu.org/licenses/>."
-msgstr ""
-"Ce programme est libre, vous pouvez le redistribuer et/ou le modifier\n"
-"selon les termes de la licence publique générale (GPL) GNU publiée\n"
-"par la Free Software Foundation, dans sa version 3 ou supérieure\n"
-"(selon votre choix).\n"
-"\n"
-"Ce programme est distribué dans l'espoir d'être utile, mais\n"
-"SANS AUCUNE GARANTIE, y compris les garanties de \n"
-"COMMERCIALISATION ou d'ADAPTATION À UN BUT SPÉCIFIQUE.\n"
-"Consultez la licence publique générale GNU pour plus de détails.\n"
-"\n"
-"Vous devez avoir reçu une copie de la licence publique générale GNU\n"
-"en même temps que ce programme ; si ce n'est pas le cas, consultez\n"
-"<http://www.gnu.org/licenses/>."
-
-#. Title of about dialog
-#: ../src/ui.vala:1475
-msgid "About Simple Scan"
-msgstr "À propos de Simple Scan"
-
-#. Description of program
-#: ../src/ui.vala:1478
-msgid "Simple document scanning tool"
-msgstr "Numériser simplement vos documents"
-
-#: ../src/ui.vala:1487
-msgid "translator-credits"
-msgstr ""
-"Launchpad Contributions:\n"
-"  Mathieu Marin https://launchpad.net/~rama-197"
-
-#. Text in dialog warning when a document is about to be lost
-#: ../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
-msgid "Quit without Saving"
-msgstr "Quitter sans enregistrer"
-
-#. Message to indicate a Brother scanner has been detected
-#: ../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
-msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.brother.com\">Brother website</a>."
-msgstr ""
-"Les pilotes sont disponibles sur le <a "
-"href=\"http://support.brother.com\">site Web de Brother</a>."
-
-#. Message to indicate a Samsung scanner has been detected
-#: ../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
-msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://samsung.com/support\">Samsung website</a>."
-msgstr ""
-"Les pilotes sont disponibles sur le <a "
-"href=\"http://samsung.com/support\">site Web de Samsung</a>."
-
-#. Message to indicate a HP scanner has been detected
-#: ../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
-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
-msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.epson.com\">Epson website</a>."
-msgstr ""
-"Les pilotes sont disponibles sur le <a "
-"href=\"http://support.epson.com\">site web d'Epson</a>."
-
-#. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
-msgid "Install drivers"
-msgstr "Installer les pilotes"
-
-#. Message in driver install dialog
-#: ../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
-msgid "Installing drivers..."
-msgstr "Installation des pilotes..."
-
-#. Label shown once drivers successfully installed
-#: ../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
-#, 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
-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
-#, 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
-#, 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
-#, c-format
-msgid "%d dpi (draft)"
-msgstr "%d ppp (brouillon)"
-
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../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
-#, c-format
-msgid "%d dpi"
-msgstr "%d ppp"
-
-#: ../src/ui.vala:1835
-msgid "New Document"
-msgstr "Nouveau document"
-
-#: ../src/ui.vala:1840
-msgid "Document"
-msgstr "Document"
-
-#: ../src/ui.vala:1844
-msgid "Email..."
-msgstr "Courriel..."
-
-#: ../src/ui.vala:1845
-msgid "Print..."
-msgstr "Imprimer..."
-
-#: ../src/ui.vala:1853
-msgid "Help"
-msgstr "Aide"
-
-#: ../src/ui.vala:1854
-msgid "About"
-msgstr "À propos"
-
-#: ../src/ui.vala:1855
-msgid "Quit"
-msgstr "Quitter"
-
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../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
-msgid "_Install Drivers"
-msgstr "_Installer les pilotes"
-
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
-msgid "Automatic"
-msgstr "Automatique"
-
-#: ../src/ui.vala:1947
-msgid "Darker"
-msgstr "Plus foncé"
-
-#: ../src/ui.vala:1949
-msgid "Lighter"
-msgstr "Plus clair"
-
-#: ../src/ui.vala:1957
-msgid "Less"
-msgstr "Moins"
-
-#: ../src/ui.vala:1959
-msgid "More"
-msgstr "Plus"
-
-#: ../src/ui.vala:1967
-msgid "Minimum"
-msgstr "Minimum"
-
-#: ../src/ui.vala:1969
-msgid "Maximum"
-msgstr "Maximum"
-
-#: ../src/ui.vala:2008
-msgid "Saving document..."
-msgstr "Enregistrement du document..."
-
-#: ../src/ui.vala:2173
-#, c-format
-msgid "Saving page %d out of %d"
-msgstr "Enregistrement de la page %d sur %d"
-
-#~ msgid "Device to scan from"
-#~ msgstr "Numériser depuis"
-
-#~ msgid "SANE device to acquire images from."
-#~ msgstr "Périphérique SANE à utiliser pour l'acquisition des images."
-
-#~ msgid "Type of document being scanned"
-#~ msgstr "Type de document numérisé"
-
-#~ msgid ""
-#~ "Type of document being scanned. This setting decides on the scan resolution, "
-#~ "colors and post-processing."
-#~ msgstr ""
-#~ "Type de document numérisé. Ce réglage définit la résolution de numérisation, "
-#~ "les couleurs et le post-traitement."
-
-#~ msgid "Width of paper in tenths of a mm"
-#~ msgstr "Largeur du papier en dixièmes de mm."
-
-#~ msgid ""
-#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
-#~ msgstr ""
-#~ "La largeur du papier en dixièmes de mm (ou 0 pour une détection automatique "
-#~ "du papier)."
-
-#~ msgid "Height of paper in tenths of a mm"
-#~ msgstr "Hauteur du papier en dixièmes de mm"
-
-#~ msgid ""
-#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
-#~ msgstr ""
-#~ "La hauteur du papier en dixièmes de mm (ou 0 pour une détection automatique "
-#~ "du papier)."
-
-#~ msgid "Brightness of scan"
-#~ msgstr "Luminosité de la numérisation"
-
-#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
-#~ msgstr "L'ajustement de la luminosité de -100 à 100 (0 pour aucun)."
-
-#~ msgid "Contrast of scan"
-#~ msgstr "Contraste de la numérisation"
-
-#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
-#~ msgstr "L'ajustement du contraste de -100 à 100 (0 pour aucun)."
-
-#~ msgid "Resolution for text scans"
-#~ msgstr "Résolution des numérisations de textes"
-
-#~ msgid "The resolution in dots-per-inch to use when scanning text."
-#~ msgstr ""
-#~ "La résolution en points par pouce à utiliser lors de la numérisation de "
-#~ "texte."
-
-#~ msgid "Resolution for photo scans"
-#~ msgstr "Résolution des numérisations de photos"
-
-#~ msgid "The resolution in dots-per-inch to use when scanning photos."
-#~ msgstr ""
-#~ "La résolution en points par pouce à utiliser lors de la numérisation de "
-#~ "photos."
-
-#~ msgid "Page side to scan"
-#~ msgstr "Face(s) de la page à numériser"
-
-#~ msgid "The page side to scan."
-#~ msgstr "La face de la page à numériser."
-
-#~ msgid "Directory to save files to"
-#~ msgstr "Dossier dans lequel les fichiers sont enregistrés"
-
-#~ msgid ""
-#~ "The directory to save files to. Defaults to the documents directory if unset."
-#~ msgstr ""
-#~ "Le dossier dans lequel les fichiers sont enregistrés. S'il n'est pas défini, "
-#~ "le dossier « Documents » sera utilisé par défaut."
-
-#~ msgid "Quality value to use for JPEG compression"
-#~ msgstr "Taux de qualité à utiliser pour la compression JPEG"
-
-#~ msgid "Quality value to use for JPEG compression."
-#~ msgstr "Taux de qualité à utiliser pour la compression JPEG."
diff --git a/po/fur.po b/po/fur.po
new file mode 100644
index 0000000..acc1237
--- /dev/null
+++ b/po/fur.po
@@ -0,0 +1,1070 @@
+# Friulian translation for simple-scan.
+# Copyright (C) 2017 simple-scan's COPYRIGHT HOLDER
+# This file is distributed under the same license as the simple-scan package.
+# Fabio Tomat <f.t.public@gmail.com>, 2017.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: simple-scan master\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
+"product=simple-scan&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-08-07 02:27+0000\n"
+"PO-Revision-Date: 2017-08-09 12:26+0200\n"
+"Last-Translator: Fabio Tomat <f.t.public@gmail.com>\n"
+"Language-Team: Friulian <fur@li.org>\n"
+"Language: fur\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 2.0.2\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: data/org.gnome.SimpleScan.gschema.xml:11
+msgid "Device to scan from"
+msgstr "Dispositîf di dulà scansionâ"
+
+#: data/org.gnome.SimpleScan.gschema.xml:12
+msgid "SANE device to acquire images from."
+msgstr "Dispositîf SANE dulà acuisî imagjins."
+
+#: data/org.gnome.SimpleScan.gschema.xml:20
+msgid "Type of document being scanned"
+msgstr "Gjenar di document di scansionâ"
+
+#: data/org.gnome.SimpleScan.gschema.xml:21
+msgid ""
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+msgstr ""
+"Gjenar di document di scansionâ. Cheste impostazion e decît su la risoluzion "
+"di scansion, colôrs e la post-produzion."
+
+#: data/org.gnome.SimpleScan.gschema.xml:25
+msgid "Width of paper in tenths of a mm"
+msgstr "Largjece de cjarte in decims di mm"
+
+#: data/org.gnome.SimpleScan.gschema.xml:26
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"La largjece de cjarte in decims di mm (o 0 pal rilevament automatic de "
+"cjarte)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:30
+msgid "Height of paper in tenths of a mm"
+msgstr "Altece de cjarte in decims di mm"
+
+#: data/org.gnome.SimpleScan.gschema.xml:31
+msgid ""
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"La altece de cjarte in decims di mm (o 0 pal rilevament automatic de cjarte)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:35
+msgid "Brightness of scan"
+msgstr "Luminositât de scansion"
+
+#: data/org.gnome.SimpleScan.gschema.xml:36
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr "La justade de luminositât, di -100 a 100 (0 par nissune)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:40
+msgid "Contrast of scan"
+msgstr "Contrast de scansion"
+
+#: data/org.gnome.SimpleScan.gschema.xml:41
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr "La justade dal contrast, di -100 a 100 (0 par nissune)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:45
+msgid "Resolution for text scans"
+msgstr "Risoluzion pes scansions di test"
+
+#: data/org.gnome.SimpleScan.gschema.xml:46
+msgid "The resolution in dots-per-inch to use when scanning text."
+msgstr "La risoluzion in ponts-par-once di doprâ tal scansionâ test."
+
+#: data/org.gnome.SimpleScan.gschema.xml:50
+msgid "Resolution for photo scans"
+msgstr "Risoluzion pes scansions di foto"
+
+#: data/org.gnome.SimpleScan.gschema.xml:51
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr "La risoluzion in ponts-par-once di doprâ tal scansionâ fotos."
+
+#: data/org.gnome.SimpleScan.gschema.xml:55
+msgid "Page side to scan"
+msgstr "Bande de pagjine di scansionâ"
+
+#: data/org.gnome.SimpleScan.gschema.xml:56
+msgid "The page side to scan."
+msgstr "La façade de pagjine di scansionâ."
+
+#: data/org.gnome.SimpleScan.gschema.xml:60
+msgid "Directory to save files to"
+msgstr "Cartele dulà salvâ i file"
+
+#: data/org.gnome.SimpleScan.gschema.xml:61
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+"La cartele dulà salvâ i file. Se nol è stabilît, in maniere predefinide al "
+"ponte ae cartele dai documents."
+
+#: data/org.gnome.SimpleScan.gschema.xml:66
+msgid "Quality value to use for JPEG compression"
+msgstr "Valôr de cualitât di doprâ pe compression JPEG"
+
+#: data/org.gnome.SimpleScan.gschema.xml:67
+msgid "Quality value to use for JPEG compression."
+msgstr "Valôr de cualitât di doprâ pe compression JPEG."
+
+#: data/org.gnome.SimpleScan.gschema.xml:72
+msgid "Delay in millisecond between pages"
+msgstr "Ritart in miliseconts tra lis pagjinis"
+
+#: data/org.gnome.SimpleScan.gschema.xml:73
+msgid "Delay in millisecond between pages."
+msgstr "Ritart in miliseconts tra lis pagjinis."
+
+#. Title of scan window
+#. Set HeaderBar title here because Glade doesn't keep it translated
+#. https://bugzilla.gnome.org/show_bug.cgi?id=782753
+#. Title of scan window
+#: data/simple-scan.appdata.xml.in:6 data/simple-scan.desktop.in:3
+#: src/app-window.ui:76 src/app-window.vala:1560
+msgid "Simple Scan"
+msgstr "Scansion Semplice"
+
+#: data/simple-scan.appdata.xml.in:7 data/simple-scan.desktop.in:5
+msgid "Scan Documents"
+msgstr "Scansione documents"
+
+#: 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 "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+"Une maniere une vore facile par scansionâ documents e fotos. Al è pussibil "
+"taiâ vie lis parts brutis di une foto e zirâle se e je voltade de bande "
+"sbaliade. Si pues stampâ lis scansions, espuartâlis su pdf o salvâlis intune "
+"schirie di formâts imagjin."
+
+#: data/simple-scan.appdata.xml.in:14
+msgid "Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+"Scansion Semplice al dopre il framework SANE par supuartâ la plui parte dai "
+"scansionadôrs esistents."
+
+#: data/simple-scan.desktop.in:4
+msgid "Document Scanner"
+msgstr "Scansionadôr di document"
+
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: data/simple-scan.desktop.in:7
+msgid "scan;scanner;flatbed;adf;"
+msgstr "scansion;scanner;scansionadôr;plan;adf;"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: data/simple-scan.desktop.in:10
+msgid "scanner"
+msgstr "scanner"
+
+#. Toolbar scan menu item to scan a single page from the scanner
+#. Scan menu item to scan a single page from the scanner
+#. Toolbar scan menu item to scan a single page from the scanner
+#: src/app-window.ui:22 src/app-window.ui:123 src/app-window.ui:820
+msgid "Single _Page"
+msgstr "_Pagjine singule"
+
+#. Toolbar scan menu item to scan all pages from a document feeder
+#. Scan menu item to scan all pages from a document feeder
+#. Toolbar scan menu item to scan all pages from a document feeder
+#: src/app-window.ui:31 src/app-window.ui:133 src/app-window.ui:829
+msgid "All Pages From _Feeder"
+msgstr "_Dutis lis pagjinis dal cjariadôr"
+
+#. Toolbar scan menu item to scan continuously from the flatbed
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/app-window.ui:40 src/app-window.ui:143 src/app-window.ui:838
+msgid "_Multiple Pages From Flatbed"
+msgstr "Pagjinis _multiplis dal plan di scansion"
+
+#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:853
+msgid "Text"
+msgstr "Test"
+
+#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:863
+msgid "Photo"
+msgstr "Foto"
+
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: src/app-window.ui:91
+msgid "_Document"
+msgstr "_Document"
+
+#. Scan menu item
+#: src/app-window.ui:110
+msgid "Sc_an"
+msgstr "Sc_ansione"
+
+#. Menu entry to stop current scan
+#: src/app-window.ui:154
+msgid "_Stop Scan"
+msgstr "_Ferme la scansion"
+
+#. Menu item to reorder pages
+#. Title of dialog to reorder pages
+#: src/app-window.ui:196 src/app-window.vala:967 src/app-window.vala:1590
+msgid "Reorder Pages"
+msgstr "Torne ordene lis pagjinis"
+
+#. Label on email menu item
+#: src/app-window.ui:215
+msgid "_Email"
+msgstr "_E-mail"
+
+#. Page menu (contains action for each page, e.g. delete, crop)
+#: src/app-window.ui:280
+msgid "_Page"
+msgstr "_Pagjine"
+
+#. Menu item to rotate page to left (anti-clockwise)
+#: src/app-window.ui:290
+msgid "Rotate _Left"
+msgstr "Ribalte a _çampe"
+
+#. Menu item to rotate page to right (clockwise)
+#: src/app-window.ui:300
+msgid "Rotate _Right"
+msgstr "Ribalte a _drete"
+
+#. Label for page crop submenu
+#: src/app-window.ui:310
+msgid "_Crop"
+msgstr "Rifi_le"
+
+# rifiladure
+#. Radio button for no crop
+#: src/app-window.ui:320
+msgid "_None"
+msgstr "_Nissune"
+
+#. Radio button for cropping page to A4 size
+#: src/app-window.ui:331
+msgid "A_4"
+msgstr "A_4"
+
+#. Radio button for cropping page to A5 size
+#: src/app-window.ui:342
+msgid "A_5"
+msgstr "A_5"
+
+#. Radio button for cropping page to A6 size
+#: src/app-window.ui:353
+msgid "A_6"
+msgstr "A_6"
+
+#. Radio button for cropping page to US letter size
+#: src/app-window.ui:364
+msgid "_Letter"
+msgstr "_Letter"
+
+#. Radio button for cropping to page to US legal size
+#: src/app-window.ui:375
+msgid "Le_gal"
+msgstr "Le_gal"
+
+#. Radio button for cropping page to 4x6 inch
+#: src/app-window.ui:386
+msgid "4×6"
+msgstr "4×6"
+
+#. Radio button for cropping to custom page size
+#: src/app-window.ui:397
+msgid "_Custom"
+msgstr "_Personalizât"
+
+#. Menu item to rotate the crop area
+#: src/app-window.ui:415
+msgid "_Rotate Crop"
+msgstr "_Volte rifiladure"
+
+#. Menu item to move the selected page to the left
+#: src/app-window.ui:428
+msgid "Move Left"
+msgstr "Sposte a çampe"
+
+#. Menu item to move the selected page to the right
+#: src/app-window.ui:437
+msgid "Move Right"
+msgstr "Sposte a drete"
+
+#. Label on help menu
+#: src/app-window.ui:474
+msgid "_Help"
+msgstr "_Jutori"
+
+#. Help|Contents menu
+#: src/app-window.ui:482
+msgid "_Contents"
+msgstr "_Contignûts"
+
+#. Tooltip for scan toolbar button
+#: src/app-window.ui:520 src/app-window.ui:720
+msgid "Scan a single page from the scanner"
+msgstr "Scansione une singule pagjine dal scansionadôr"
+
+#. Label on scan toolbar item
+#: src/app-window.ui:522 src/app-window.ui:716
+msgid "Scan"
+msgstr "Scansione"
+
+#. Tooltip for save toolbar button
+#: src/app-window.ui:538 src/app-window.ui:787
+msgid "Save document to a file"
+msgstr "Salve il document suntun file"
+
+#: src/app-window.ui:540
+msgid "Save"
+msgstr "Salve"
+
+#. Tooltip for stop button
+#: src/app-window.ui:555 src/app-window.ui:700
+msgid "Stop the current scan"
+msgstr "Ferme la scansion atuâl"
+
+#: src/app-window.ui:556 src/app-window.ui:697
+msgid "Stop"
+msgstr "Ferme"
+
+#. Label shown when searching for scanners
+#: src/app-window.ui:611
+msgid "Searching for Scanners…"
+msgstr "Daûr a cirî scansionadôrs…"
+
+#: src/app-window.vala:237 src/app-window.vala:1380
+msgid "_Close"
+msgstr "_Siere"
+
+#. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
+#: src/app-window.vala:246
+#, c-format
+msgid "Username and password required to access “%s”"
+msgstr "Non utent e password necessaris par acedi a “%s”"
+
+#. Label shown when detected a scanner
+#: src/app-window.vala:266 src/app-window.vala:584
+msgid "Ready to Scan"
+msgstr "Pront pe scansion"
+
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: src/app-window.vala:273
+msgid "Additional software needed"
+msgstr "Software adizionâl necessari"
+
+#. Instructions to install driver software
+#: src/app-window.vala:275
+msgid ""
+"You need to <a href=\"install-firmware\">install driver software</a> for "
+"your scanner."
+msgstr ""
+"Si scugne <a href=\"install-firmware\">instalâ il software dal driver</a> "
+"pal scansionadôr."
+
+#. Warning displayed when no scanners are detected
+#: src/app-window.vala:281
+msgid "No scanners detected"
+msgstr "Nissun scansionadôr rilevât"
+
+#. Hint to user on why there are no scanners detected
+#: src/app-window.vala:283
+msgid "Please check your scanner is connected and powered on"
+msgstr "Controle che il scansionadôr al sedi tacât e impiât"
+
+#. Save dialog: Dialog title
+#: src/app-window.vala:298
+msgid "Save As…"
+msgstr "Salve come…"
+
+#: src/app-window.vala:301 src/app-window.vala:471 src/app-window.vala:552
+msgid "_Cancel"
+msgstr "_Anule"
+
+#: src/app-window.vala:302 src/app-window.vala:553
+msgid "_Save"
+msgstr "_Salve"
+
+#. Default filename to use when saving document
+#: src/app-window.vala:310
+msgid "Scanned Document.pdf"
+msgstr "Document scansionât.pdf"
+
+#. Save dialog: Filter name to show only supported image files
+#: src/app-window.vala:316
+msgid "Image Files"
+msgstr "File imagjin"
+
+#. Save dialog: Filter name to show all files
+#: src/app-window.vala:326
+msgid "All Files"
+msgstr "Ducj i file"
+
+#. Save dialog: Label for saving in PDF format
+#: src/app-window.vala:335
+msgid "PDF (multi-page document)"
+msgstr "PDF (document a plui pagjinis)"
+
+#. Save dialog: Label for saving in JPEG format
+#: src/app-window.vala:341
+msgid "JPEG (compressed)"
+msgstr "JPEG (comprimût)"
+
+#. Save dialog: Label for saving in PNG format
+#: src/app-window.vala:347
+msgid "PNG (lossless)"
+msgstr "PNG (cence pierditis)"
+
+#. Save dialog: Label for sabing in WEBP format
+#: src/app-window.vala:354
+msgid "WebP (compressed)"
+msgstr "WebP (comprimût)"
+
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
+#: src/app-window.vala:364
+msgid "File format:"
+msgstr "formât file:"
+
+#. Label in save dialog beside compression slider
+#: src/app-window.vala:376
+msgid "Compression:"
+msgstr "Compression:"
+
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/app-window.vala:470
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr "Un file clamât “%s” al esist za.  Vuelistu sostituîlu?"
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/app-window.vala:473
+msgid "_Replace"
+msgstr "_Sostituìs"
+
+#: src/app-window.vala:512
+msgid "Saving"
+msgstr "Daûr a salvâ"
+
+#. Title of error dialog when save failed
+#: src/app-window.vala:527
+msgid "Failed to save file"
+msgstr "No si è rivâts a salvâ il file"
+
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:550
+msgid "If you don’t save, changes will be permanently lost."
+msgstr "Se no si salve, lis modifichis a laran pierdudis par simpri."
+
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:591
+msgid "Save current document?"
+msgstr "Salvâ il document atuâl?"
+
+#. Button in dialog to create new document and discard unsaved document
+#: src/app-window.vala:593
+msgid "Discard Changes"
+msgstr "Scarte modifichis"
+
+#. Label shown when scan started
+#: src/app-window.vala:692
+msgid "Contacting scanner…"
+msgstr "Daûr a contatâ il scansionadôr…"
+
+#. Error message display when unable to save image for preview
+#: src/app-window.vala:800
+msgid "Unable to save image for preview"
+msgstr "Impussibil salvâ la imagjin pe anteprime"
+
+#. Error message display when unable to preview image
+#: src/app-window.vala:812
+msgid "Unable to open image preview application"
+msgstr "Impussibil vierzi la aplicazion pe anteprime de imagjin"
+
+#. Label on button for combining sides in reordering dialog
+#: src/app-window.vala:990
+msgid "Combine sides"
+msgstr "Cumbine bandis"
+
+#. Label on button for combining sides in reverse order in reordering dialog
+#: src/app-window.vala:1000
+msgid "Combine sides (reverse)"
+msgstr "Cumbine bandis (inviers)"
+
+#. Label on button for reversing in reordering dialog
+#: src/app-window.vala:1010
+msgid "Reverse"
+msgstr "Inviers"
+
+#. Label on button for cancelling page reordering dialog
+#: src/app-window.vala:1020
+msgid "Keep unchanged"
+msgstr "Lasse no modificât"
+
+#. Error message displayed when unable to launch help browser
+#: src/app-window.vala:1250
+msgid "Unable to open help file"
+msgstr "Impussibil vierzi il file di jutori"
+
+#. The license this software is under (GPL3+)
+#: src/app-window.vala:1271
+msgid ""
+"This program is free software: you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation, either version 3 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License\n"
+"along with this program.  If not, see <http://www.gnu.org/licenses/>."
+msgstr ""
+"Chest program al è software libar; si pues tornâ a distribuîlu e/o "
+"modificâlu\n"
+"sot i tiermins de licence GNU General Public come publicade de\n"
+"Free Software Foundation, sedi la version 3 de licence o (a to sielte)\n"
+"cualsisei version sucessive.\n"
+"\n"
+"Chest program al è distribuît inte sperance che al sedi util,\n"
+"ma CENCE NISSUNE GARANZIE; cence nancje la implicite garanzie di\n"
+"CUMIERÇABILITÂT o IDONEITÂT A UNE FINALITÂT PARTICOLÂR. Viôt la\n"
+"licence GNU General Public par vê plui detais.\n"
+"\n"
+"O varessis di vê ricevût une copie de licence GNU General Public adun\n"
+"cun chest program. In câs contrari, visite <http://www.gnu.org/licenses/>."
+
+#. Title of about dialog
+#: src/app-window.vala:1274
+msgid "About Simple Scan"
+msgstr "Informazions su Scansion Semplice"
+
+#. Description of program
+#: src/app-window.vala:1277
+msgid "Simple document scanning tool"
+msgstr "Sempliç strument par scansionâ documents"
+
+#: src/app-window.vala:1286
+msgid "translator-credits"
+msgstr "Fabio Tomat <f.t.public@gmail.com>"
+
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:1308
+msgid "Save document before quitting?"
+msgstr "Salvâ il document prime di jessî?"
+
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:1310
+msgid "Quit without Saving"
+msgstr "Jes cence salvâ"
+
+#. Message to indicate a Brother scanner has been detected
+#: src/app-window.vala:1357
+msgid "You appear to have a Brother scanner."
+msgstr "Al semee che tu vedis un scansionadôr Brother."
+
+#. Instructions on how to install Brother scanner drivers
+#: src/app-window.vala:1359
+msgid ""
+"Drivers for this are available on the <a href=\"http://support.brother.com"
+"\">Brother website</a>."
+msgstr ""
+"I driver par chest dispositîf a son disponibii sul <a href=\"http://support."
+"brother.com\">sît web de Brother</a>."
+
+#. Message to indicate a Samsung scanner has been detected
+#: src/app-window.vala:1363
+msgid "You appear to have a Samsung scanner."
+msgstr "Al semee che tu vedis un scansionadôr Samsung."
+
+#. Instructions on how to install Samsung scanner drivers
+#: src/app-window.vala:1365
+msgid ""
+"Drivers for this are available on the <a href=\"http://samsung.com/support"
+"\">Samsung website</a>."
+msgstr ""
+"I driver par chest dispositîf a son disponibii sul <a href=\"http://samsung."
+"com/support\">sît web de Samsung</a>."
+
+#. Message to indicate a HP scanner has been detected
+#: src/app-window.vala:1369
+msgid "You appear to have an HP scanner."
+msgstr "Al semee che tu vedis un scansionadôr HP."
+
+#. Message to indicate an Epson scanner has been detected
+#: src/app-window.vala:1374
+msgid "You appear to have an Epson scanner."
+msgstr "Al semee che tu vedis un scansionadôr Epson."
+
+#. Instructions on how to install Epson scanner drivers
+#: src/app-window.vala:1376
+msgid ""
+"Drivers for this are available on the <a href=\"http://support.epson.com"
+"\">Epson website</a>."
+msgstr ""
+"I driver par chest dispositîf a son disponibii sul <a href=\"http://support."
+"epson.com\">sît web de Epson</a>."
+
+#. Title of dialog giving instructions on how to install drivers
+#: src/app-window.vala:1380
+msgid "Install drivers"
+msgstr "Instale driver"
+
+#. Message in driver install dialog
+#: src/app-window.vala:1411
+msgid "Once installed you will need to restart Simple Scan."
+msgstr "Une volte instalât si scugne tornâ a inviâ Scansion Semplice."
+
+#. Label shown while installing drivers
+#: src/app-window.vala:1423
+msgid "Installing drivers…"
+msgstr "Daûr a instalâ i driver…"
+
+#. Label shown once drivers successfully installed
+#: src/app-window.vala:1431
+msgid "Drivers installed successfully!"
+msgstr "Driver instalâts cun sucès!"
+
+#. Label shown if failed to install drivers
+#: src/app-window.vala:1441
+#, c-format
+msgid "Failed to install drivers (error code %d)."
+msgstr "No si è rivâts a instalâ i driver (codiç di erôr %d)."
+
+#. Label shown if failed to install drivers
+#: src/app-window.vala:1447
+msgid "Failed to install drivers."
+msgstr "No si è rivâts a instalâ i driver."
+
+#. Label shown to prompt user to install packages (when PackageKit not available)
+#: src/app-window.vala:1454
+#, c-format
+msgid "You need to install the %s package."
+msgid_plural "You need to install the %s packages."
+msgstr[0] "Si scugne instalâ il pachet %s."
+msgstr[1] "Si scugne instalâ i pachets %s."
+
+#. Title of preferences dialog
+#: src/app-window.vala:1568 src/app-window.vala:1591
+#: src/preferences-dialog.ui:53
+msgid "Preferences"
+msgstr "Preferencis"
+
+#: src/app-window.vala:1572
+msgid "Keyboard Shortcuts"
+msgstr "Scurtis di tastiere"
+
+#: src/app-window.vala:1573
+msgid "Help"
+msgstr "Jutori"
+
+#: src/app-window.vala:1574
+msgid "About"
+msgstr "Informazions"
+
+#: src/app-window.vala:1575
+msgid "Quit"
+msgstr "Jes"
+
+#: src/app-window.vala:1589
+msgid "Email"
+msgstr "E-mail"
+
+#. Populate ActionBar (not supported in Glade)
+#. https://bugzilla.gnome.org/show_bug.cgi?id=769966
+#. Label on new document button
+#: src/app-window.vala:1599
+msgid "Start Again…"
+msgstr "Torne tache…"
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: src/app-window.vala:1616
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Zire la pagjine a çampe (sens antiorari)"
+
+#. Tooltip for rotate right (clockwise) button
+#: src/app-window.vala:1623
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Zire la pagjine a drete (sens orari)"
+
+#. Tooltip for crop button
+#: src/app-window.vala:1633
+msgid "Crop the selected page"
+msgstr "Rifile la pagjine selezionade"
+
+#. Tooltip for delete button
+#: src/app-window.vala:1649
+msgid "Delete the selected page"
+msgstr "Elimine la pagjine selezionade"
+
+#. Text of button for cancelling save
+#: src/app-window.vala:1814
+msgid "Cancel"
+msgstr "Anule"
+
+#. Button to submit authorization dialog
+#: src/authorize-dialog.ui:25
+msgid "_Authorize"
+msgstr "_Autorize"
+
+#. Label beside username entry
+#: src/authorize-dialog.ui:99
+msgid "_Username for resource:"
+msgstr "_Non utent pe risorse:"
+
+#. Label beside password entry
+#: src/authorize-dialog.ui:112
+msgid "_Password:"
+msgstr "_Password:"
+
+#: src/book.vala:331 src/book.vala:337
+#, c-format
+msgid "Unable to encode page %i"
+msgstr "Impussibil codificâ la pagjine %i"
+
+#: src/help-overlay.ui:12
+msgctxt "shortcut window"
+msgid "Scanning"
+msgstr "Scansion"
+
+#: src/help-overlay.ui:17
+msgctxt "shortcut window"
+msgid "Scan a single page"
+msgstr "Scansione une singule pagjine"
+
+#: src/help-overlay.ui:24
+msgctxt "shortcut window"
+msgid "Scan all pages from document feeder"
+msgstr "Scansione dutis lis pagjinis dal alimentadôr di documents"
+
+#: src/help-overlay.ui:31
+msgctxt "shortcut window"
+msgid "Scan continuously from a flatbed scanner"
+msgstr "Scansione di un continui dal plan di scansionament"
+
+#: src/help-overlay.ui:38
+msgctxt "shortcut window"
+msgid "Stop scan in progress"
+msgstr "Ferme la scansion in cors"
+
+#: src/help-overlay.ui:46
+msgctxt "shortcut window"
+msgid "Document Modification"
+msgstr "Modifiche document"
+
+#: src/help-overlay.ui:51
+msgctxt "shortcut window"
+msgid "Move page left"
+msgstr "Sposte pagjine a çampe"
+
+#: src/help-overlay.ui:58
+msgctxt "shortcut window"
+msgid "Move page right"
+msgstr "Sposte pagjine a drete"
+
+#: src/help-overlay.ui:65
+msgctxt "shortcut window"
+msgid "Rotate page to the left (anti-clockwise)"
+msgstr "Zire pagjine a çampe (sens antiorari)"
+
+#: src/help-overlay.ui:72
+msgctxt "shortcut window"
+msgid "Rotate page to the right (clockwise)"
+msgstr "Zire pagjine a drete (sens orari)"
+
+#: src/help-overlay.ui:79
+msgctxt "shortcut window"
+msgid "Delete page"
+msgstr "Elimine pagjine"
+
+#: src/help-overlay.ui:87
+msgctxt "shortcut window"
+msgid "Document Management"
+msgstr "Gjestion document"
+
+#: src/help-overlay.ui:92
+msgctxt "shortcut window"
+msgid "Start new document"
+msgstr "Tache un gnûf document"
+
+#: src/help-overlay.ui:99
+msgctxt "shortcut window"
+msgid "Save scanned document"
+msgstr "Salve document scansionât"
+
+#: src/help-overlay.ui:106
+msgctxt "shortcut window"
+msgid "Email scanned document"
+msgstr "E-mail document scansionât"
+
+#: src/help-overlay.ui:113
+msgctxt "shortcut window"
+msgid "Print scanned document"
+msgstr "Stampe document scansionât"
+
+#: src/help-overlay.ui:120
+msgctxt "shortcut window"
+msgid "Copy current page to clipboard"
+msgstr "Copie la pagjine atuâl tes notis"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:113
+msgid "_Scanner"
+msgstr "_Scansionadôr"
+
+#. Label beside scan side combo box
+#: src/preferences-dialog.ui:143
+msgid "Scan Sides"
+msgstr "Bandis de scansion"
+
+#. Label beside page size combo box
+#: src/preferences-dialog.ui:160
+msgid "Page Size"
+msgstr "Dimension pagjine"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:191
+msgid "Front"
+msgstr "Denant"
+
+#. Preferences Dialog: Toggle button to select scanning on the back side of a page
+#: src/preferences-dialog.ui:206
+msgid "Back"
+msgstr "Daûr"
+
+# lis bandis de pagjine
+#. Preferences Dialog: Toggle button to select scanning on both sides of a page
+#: src/preferences-dialog.ui:221
+msgid "Both"
+msgstr "Dutis dôs"
+
+#. Label beside page delay scale
+#: src/preferences-dialog.ui:260
+msgid "Delay"
+msgstr "Ritart"
+
+#. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
+#: src/preferences-dialog.ui:276
+msgid "Multiple pages from flatbed"
+msgstr "Pagjinis multiplis dal plan di scansion"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:295
+msgid "3"
+msgstr "3"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:310
+msgid "5"
+msgstr "5"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:326
+msgid "7"
+msgstr "7"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:342
+msgid "10"
+msgstr "10"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:358
+msgid "15"
+msgstr "15"
+
+#. Label after page delay radio buttons
+#: src/preferences-dialog.ui:385
+msgid "Seconds"
+msgstr "Seconts"
+
+#. Preferences Dialog: Tab label for scanning settings
+#: src/preferences-dialog.ui:413
+msgid "Scanning"
+msgstr "Scansion"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:436
+msgid "_Text Resolution"
+msgstr "Risoluzion _test"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:452
+msgid "_Photo Resolution"
+msgstr "Risoluzion _foto"
+
+#. Label beside brightness scale
+#: src/preferences-dialog.ui:505
+msgid "Brightness"
+msgstr "Luminositât"
+
+#. Label beside contrast scale
+#: src/preferences-dialog.ui:521
+msgid "Contrast"
+msgstr "Contrast"
+
+#. Preferences Dialog: Tab for quality settings
+#: src/preferences-dialog.ui:576
+msgid "Quality"
+msgstr "Cualitât"
+
+#. Combo box value for automatic paper size
+#: src/preferences-dialog.vala:77
+msgid "Automatic"
+msgstr "Automatic"
+
+#: src/preferences-dialog.vala:116
+msgid "Darker"
+msgstr "Plui scûr"
+
+#: src/preferences-dialog.vala:118
+msgid "Lighter"
+msgstr "Plui clâr"
+
+#: src/preferences-dialog.vala:126
+msgid "Less"
+msgstr "Mancul"
+
+#: src/preferences-dialog.vala:128
+msgid "More"
+msgstr "Plui"
+
+#. Preferences dialog: Label for default resolution in resolution list
+#: src/preferences-dialog.vala:440
+#, c-format
+msgid "%d dpi (default)"
+msgstr "%d ppo (predefinît)"
+
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: src/preferences-dialog.vala:443
+#, c-format
+msgid "%d dpi (draft)"
+msgstr "%d ppo (stampon)"
+
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: src/preferences-dialog.vala:446
+#, c-format
+msgid "%d dpi (high resolution)"
+msgstr "%d ppo (alte risoluzion)"
+
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: src/preferences-dialog.vala:449
+#, c-format
+msgid "%d dpi"
+msgstr "%d ppo"
+
+#. Error displayed when no scanners to scan with
+#: src/scanner.vala:844
+msgid "No scanners available.  Please connect a scanner."
+msgstr "Nissun scansionadôr disponibil. Tache un scansionadôr."
+
+#. Error displayed when cannot connect to scanner
+#: src/scanner.vala:874
+msgid "Unable to connect to scanner"
+msgstr "Impussibil tacâsi a un scansionadôr"
+
+#. Error display when unable to start scan
+#: src/scanner.vala:1227
+msgid "Unable to start scan"
+msgstr "Impussibil tacâ la scansion"
+
+#. Error displayed when communication with scanner broken
+#: src/scanner.vala:1240 src/scanner.vala:1340
+msgid "Error communicating with scanner"
+msgstr "Erôr tal comunicâ cul scansionadôr"
+
+#. Help string for command line --version flag
+#: src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "Mostre la version di publicazion"
+
+#. Help string for command line --debug flag
+#: src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Stampe messaçs di debug"
+
+#: src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+msgstr ""
+"Comede i file PDF gjenerâts cun versions di Scansion Semplice plui vecjis"
+
+#. Title of error dialog when scan failed
+#: src/simple-scan.vala:392
+msgid "Failed to scan"
+msgstr "No si è rivâts a scansionâ"
+
+#. Attempt to inhibit the screensaver when scanning
+#: src/simple-scan.vala:407
+msgid "Scan in progress"
+msgstr "Scansion in cors"
+
+#. Arguments and description for --help text
+#: src/simple-scan.vala:584
+msgid "[DEVICE…] — Scanning utility"
+msgstr "[DISPOSITÎF…] — utilitât di scansionament"
+
+#. Text printed out when an unknown command-line argument provided
+#: src/simple-scan.vala:595
+#, c-format
+msgid "Run “%s --help” to see a full list of available command line options."
+msgstr ""
+"Eseguìs “%s --help” par viodi la liste di dutis lis opzions disponibilis te "
+"rie di comant."
+
+#~ msgid "Saving document…"
+#~ msgstr "Daûr a salvâ il document…"
+
+#~ msgid "Saving page %d out of %d"
+#~ msgstr "Daûr a salvâ la pagjine %d di %d"
+
+#~ msgid "Front and Back"
+#~ msgstr "Denant e daûr"
+
+#~ msgid "New"
+#~ msgstr "Gnûf"
+
+#~ msgid "Rotate Left"
+#~ msgstr "Ribalte a çampe"
+
+#~ msgid "Rotate Right"
+#~ msgstr "Ribalte a drete"
+
+#~ msgid "Crop"
+#~ msgstr "Rifile"
+
+#~ msgid "Scan S_ource:"
+#~ msgstr "S_orzint scansion:"
+
+#~ msgid "New Document"
+#~ msgstr "Gnûf document"
+
+#~ msgid "Document"
+#~ msgstr "Document"
+
+#~ msgid "Email..."
+#~ msgstr "E-mail..."
+
+#~ msgid "Print..."
+#~ msgstr "Stampe..."
+
+#~ msgid "Minimum"
+#~ msgstr "Minim"
+
+#~ msgid "Maximum"
+#~ msgstr "Massim"
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..39115ca 100644
--- a/po/gd.po
+++ b/po/gd.po
@@ -7,296 +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"
+"POT-Creation-Date: 2017-04-16 08:54-0400\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"
+"Language: gd\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-25 06:10+0000\n"
+"X-Generator: Launchpad (build 18361)\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:231 src/simple-scan.ui:815 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:247
 msgid "_Document"
 msgstr "_Sgrìobhainn"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/simple-scan.ui:266
 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:279 src/simple-scan.ui:1343 src/simple-scan.ui:1402
 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:289 src/simple-scan.ui:1352 src/simple-scan.ui:1411
 msgid "All Pages From _Feeder"
 msgstr "Gach duilleag a tha san _bhiathadair"
 
+#. 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 "Cuir _stad air an sganadh"
 
-#: 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 "Teacsa"
 
-#: 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 "Dealbh"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/simple-scan.ui:352 src/ui.vala:1247 src/ui.vala:1891
 msgid "Reorder Pages"
 msgstr "Atharraich òrdugh nan duilleagan"
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/simple-scan.ui:371
 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:436
 msgid "_Page"
 msgstr "_Duilleag"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:446
 msgid "Rotate _Left"
 msgstr "Cuairtich gu _tuathail"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:456
 msgid "Rotate _Right"
 msgstr "Cuairtich gu _deiseil"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:466
 msgid "_Crop"
 msgstr "_Bearr"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:476
 msgid "_None"
 msgstr "Cha_n eil gin"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:487
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:498
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:509
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:520
 msgid "_Letter"
 msgstr "_Litir"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:531
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:542
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:553
 msgid "_Custom"
 msgstr "_Gnàthaichte"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:571
 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:584
 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:593
 msgid "Move Right"
 msgstr "Gluais gun taobh deas"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:630
 msgid "_Help"
 msgstr "_Cobhair"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:638
 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:680 src/simple-scan.ui:891
 msgid "Start a new document"
 msgstr "Tòisich air sgrìobhainn ùr"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:681
 msgid "New"
 msgstr "Ùr"
 
 #. 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 "Sganaich duilleag shingilte on sganair"
 
 #. 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 "Sganaich"
 
 #. 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 "Sàbhail an sgrìobhainn mar fhaidhle"
 
-#: ../src/ui.vala:1842
+#: src/simple-scan.ui:715 src/ui.vala:1892
 msgid "Save"
 msgstr "Sàbhail"
 
 #. 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 "Cuir stad air an sganadh làithreach"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:731 src/simple-scan.ui:831
 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:755 src/simple-scan.ui:942
 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:756
 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:770 src/simple-scan.ui:920
 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:771
 msgid "Rotate Right"
 msgstr "Cuairtich gu deiseil"
 
-#: 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 "Bearr an duilleag a thagh thu"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:787
 msgid "Crop"
 msgstr "Bearr"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:1003 src/ui.vala:1898
 msgid "Preferences"
 msgstr "Roghainnean"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1054
 msgid "Scan S_ource:"
 msgstr "Tùs an _sganaidh:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1085
 msgid "_Text Resolution:"
 msgstr "_Dùmhlachd-bhreacaidh an teacsa:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1101
 msgid "_Photo Resolution:"
 msgstr "_Dùmhlachd-bhreacaidh an deilbh:"
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1145
 msgid "Scan Side:"
 msgstr "Sganaich taobh:"
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1175
 msgid "Page Size:"
 msgstr "Meud na duilleige:"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1205
 msgid "Brightness:"
 msgstr "Soilleireachd:"
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1235
 msgid "Contrast:"
 msgstr "Iomsgaradh:"
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1266
 msgid "Quality:"
 msgstr "Càileachd:"
 
+#. 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 "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 +322,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 +335,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 +343,65 @@ msgstr ""
 "mhòrchuid a sganairean a tha ann."
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:844
 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:874
 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:1227
 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:1240 src/scanner.vala:1340
 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:332 src/ui.vala:1655 src/ui.vala:1935
 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:341
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr ""
@@ -395,131 +409,142 @@ msgstr ""
 "\"%s\""
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/ui.vala:389
 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:391
 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:396
 msgid "Additional software needed"
 msgstr "Tha bathar-bog a dhìth"
 
 #. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:398
 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:510
 msgid "Save As..."
 msgstr "Sàbhail mar..."
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:513 src/ui.vala:648 src/ui.vala:723
 msgid "_Cancel"
 msgstr "_Sguir dheth"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:514 src/ui.vala:724
 msgid "_Save"
 msgstr "_Sàbhail"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:522
 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:528
 msgid "Image Files"
 msgstr "Faidhlichean deilbh"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:534
 msgid "All Files"
 msgstr "Na h-uile faidhle"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:543
 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:549
 msgid "JPEG (compressed)"
 msgstr "JPEG (dùmhlaichte)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:555
 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:564
 msgid "File format:"
 msgstr "Fòrmat an fhaidhle:"
 
+#. 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:650
+#: src/ui.vala:698
 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:721
 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:763
 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:765
 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:1056
 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:1068
 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:1270
 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:1280
 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:1290
 msgid "Reverse"
 msgstr "Contrarra"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1300
 msgid "Keep unchanged"
 msgstr "Cum gun atharrachadh"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1504
 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: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"
@@ -548,16 +573,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:1528
 msgid "About Simple Scan"
 msgstr "Mu dhèidhinn Sganadh simplidh"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1531
 msgid "Simple document scanning tool"
 msgstr "Inneal simplidh airson sganadh sgrìobhainnean"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1540
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -566,22 +591,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:1562
 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:1564
 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:1632
 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:1634
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
@@ -590,12 +615,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:1638
 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:1640
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
@@ -604,17 +629,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:1644
 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:1649
 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:1651
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
@@ -623,139 +648,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:1655
 msgid "Install drivers"
 msgstr "Stàlaich na draibhearan"
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1686
 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:1698
 msgid "Installing drivers..."
 msgstr "A' stàladh nan draibhearan..."
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1706
 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:1716
 #, 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:1722
 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:1729
 #, 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:1833
 #, 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:1836
 #, 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:1839
 #, 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:1842
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1885
 msgid "New Document"
 msgstr "Sgrìobhainn ùr"
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1890
 msgid "Document"
 msgstr "Sgrìobhainn"
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1893
 msgid "Email..."
 msgstr "Post-d..."
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1894
 msgid "Print..."
 msgstr "Clò-bhuail..."
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1902
 msgid "Help"
 msgstr "Cobhair"
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1903
 msgid "About"
 msgstr "Mu dhèidhinn"
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1904
 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:1937
 msgid "Change _Scanner"
 msgstr "Atharraich an _sganair"
 
 #. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1939
 msgid "_Install Drivers"
 msgstr "Stàlaich na dra_ibhearan"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1945
 msgid "Automatic"
 msgstr "Gu fèin-obrachail"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1995
 msgid "Darker"
 msgstr "Nas duirche"
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1997
 msgid "Lighter"
 msgstr "Nas soilleire"
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:2005
 msgid "Less"
 msgstr "Nas lugha"
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:2007
 msgid "More"
 msgstr "Barrachd"
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:2015
 msgid "Minimum"
 msgstr "As lugha"
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:2017
 msgid "Maximum"
 msgstr "As motha"
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2068
 msgid "Saving document..."
 msgstr "A' sàbhaladh na sgrìobhainn..."
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2242
 #, 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..7125d6f 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -2,517 +2,534 @@
 # Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
 # This file is distributed under the same license as the simple-scan package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
-#
+# Fran Dieguez <frandieguez@gnome.org>, 2017.
 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-10-05 07:56+0000\n"
-"Last-Translator: Fran Diéguez <Unknown>\n"
-"Language-Team: Galician <gl@li.org>\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product"
+"=simple-scan&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-08-07 02:27+0000\n"
+"PO-Revision-Date: 2017-08-10 18:02+0200\n"
+"Last-Translator: Fran Dieguez <frandieguez@gnome.org>\n"
+"Language-Team: Galician\n"
+"Language: gl\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"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Virtaal 0.7.1\n"
+"X-Launchpad-Export-Date: 2017-04-25 06:10+0000\n"
+"X-Project-Style: gnome\n"
 
-#. Button to submit authorization dialog
-#: data/simple-scan.ui:24
-msgid "_Authorize"
-msgstr "_Autorizar"
+#: data/org.gnome.SimpleScan.gschema.xml:11
+msgid "Device to scan from"
+msgstr "Dispositivo desde o que escanear"
 
-#. Label beside username entry
-#: data/simple-scan.ui:102
-msgid "_Username for resource:"
-msgstr "Nome de _usuario para o recurso:"
+#: data/org.gnome.SimpleScan.gschema.xml:12
+msgid "SANE device to acquire images from."
+msgstr "Dispositivo SANE desde o que adquirir as imaxes."
 
-#. Label beside password entry
-#: data/simple-scan.ui:117
-msgid "_Password:"
-msgstr "_Contrasinal:"
+#: data/org.gnome.SimpleScan.gschema.xml:20
+msgid "Type of document being scanned"
+msgstr "Tipo de documento que está sendo escaneado"
 
-#. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
-msgid "Front and Back"
-msgstr "Anverso e reverso"
+#: data/org.gnome.SimpleScan.gschema.xml:21
+msgid ""
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+msgstr ""
+"Tipo de documento a escanear. Esta opción decide a resolución, cores e post-"
+"procesado do escaneado"
 
-#. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
-msgid "Front"
-msgstr "Anverso"
+#: data/org.gnome.SimpleScan.gschema.xml:25
+msgid "Width of paper in tenths of a mm"
+msgstr "Largura do papel en décimas de mm"
 
-#. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
-msgid "Back"
-msgstr "Atrás"
+#: data/org.gnome.SimpleScan.gschema.xml:26
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"A largura do papel en décimas de mm (ou 0 para a detección automática do "
+"papel)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:30
+msgid "Height of paper in tenths of a mm"
+msgstr "Altura do papel en décimas de mm"
+
+#: data/org.gnome.SimpleScan.gschema.xml:31
+msgid ""
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"A altura do papel en décimas de mm (ou 0 para a detección automática do "
+"papel)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:35
+msgid "Brightness of scan"
+msgstr "Brillo do escaneo"
+
+#: data/org.gnome.SimpleScan.gschema.xml:36
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr "Axuste de brillo de -100 a 100 (0 é ningún)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:40
+msgid "Contrast of scan"
+msgstr "Contraste do escaneo"
+
+#: data/org.gnome.SimpleScan.gschema.xml:41
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr "Axuste de contraste de -100 a 100 (0 é ningún)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:45
+msgid "Resolution for text scans"
+msgstr "Resolución para o escaneado de texto"
+
+#: data/org.gnome.SimpleScan.gschema.xml:46
+msgid "The resolution in dots-per-inch to use when scanning text."
+msgstr "Resolución en puntos por polgada a usar cando se escanean textos."
+
+#: data/org.gnome.SimpleScan.gschema.xml:50
+msgid "Resolution for photo scans"
+msgstr "Resolución para o escaneado de fotos"
+
+#: data/org.gnome.SimpleScan.gschema.xml:51
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr "Resolución en puntos por polgada a usar cando se escanean fotos."
+
+#: data/org.gnome.SimpleScan.gschema.xml:55
+msgid "Page side to scan"
+msgstr "Cara da páxina a escanear"
+
+#: data/org.gnome.SimpleScan.gschema.xml:56
+msgid "The page side to scan."
+msgstr "O lado da páxina a escanear."
+
+#: data/org.gnome.SimpleScan.gschema.xml:60
+msgid "Directory to save files to"
+msgstr "Directorio no que gardar os ficheiros"
+
+#: data/org.gnome.SimpleScan.gschema.xml:61
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+"O directorio no que se gardarán os ficheiros. Por omisión usarase o "
+"directorio de documentos."
+
+#: data/org.gnome.SimpleScan.gschema.xml:66
+msgid "Quality value to use for JPEG compression"
+msgstr "Valor de calidade a usar na compresión JPEG"
+
+#: data/org.gnome.SimpleScan.gschema.xml:67
+msgid "Quality value to use for JPEG compression."
+msgstr "Valor de calidade a usar na compresión JPEG."
+
+#: data/org.gnome.SimpleScan.gschema.xml:72
+msgid "Delay in millisecond between pages"
+msgstr "Atraso en milisegundos entre as páxinas"
+
+#: data/org.gnome.SimpleScan.gschema.xml:73
+msgid "Delay in millisecond between pages."
+msgstr "Atraso en milisegundos entre páxinas."
 
 #. 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
+#. Set HeaderBar title here because Glade doesn't keep it translated
+#. https://bugzilla.gnome.org/show_bug.cgi?id=782753
+#. Title of scan window
+#: data/simple-scan.appdata.xml.in:6 data/simple-scan.desktop.in:3
+#: src/app-window.ui:76 src/app-window.vala:1560
 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
-msgid "_Document"
-msgstr "_Documento"
+#: data/simple-scan.appdata.xml.in:7 data/simple-scan.desktop.in:5
+msgid "Scan Documents"
+msgstr "Escanear documentos"
 
-#. Scan menu item
-#: data/simple-scan.ui:260
-msgid "Sc_an"
-msgstr "Esc_anear"
+#: 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 "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+"Un xeito ben sinxelo de escanear documentos e imaxes. Pode recortar as "
+"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:14
+msgid "Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+"Escáner Sinxelo usa o marco de traballo de SANE para ser compatíbel coa "
+"maioría de escáneres existentes."
+
+#: data/simple-scan.desktop.in:4
+msgid "Document Scanner"
+msgstr "Escáner de documentos"
+
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: data/simple-scan.desktop.in:7
+msgid "scan;scanner;flatbed;adf;"
+msgstr "escanear;escáner;flatbed;adf;"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: data/simple-scan.desktop.in:10
+msgid "scanner"
+msgstr "scanner"
 
+#. Toolbar scan menu item to scan a single page from the scanner
 #. 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/app-window.ui:22 src/app-window.ui:123 src/app-window.ui:820
 msgid "Single _Page"
 msgstr "Única _páxina"
 
+#. Toolbar scan menu item to scan all pages from a document feeder
 #. 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/app-window.ui:31 src/app-window.ui:133 src/app-window.ui:829
 msgid "All Pages From _Feeder"
 msgstr "Todas as páxinas do _alimentador"
 
-#. Menu entry to stop current scan
-#: data/simple-scan.ui:294
-msgid "_Stop Scan"
-msgstr "_Deter o escaneado"
+#. Toolbar scan menu item to scan continuously from the flatbed
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/app-window.ui:40 src/app-window.ui:143 src/app-window.ui:838
+msgid "_Multiple Pages From Flatbed"
+msgstr "_Múltiples páxinas desde Flatbed"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:853
 msgid "Text"
 msgstr "Texto"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:863
 msgid "Photo"
 msgstr "Fotografía"
 
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: src/app-window.ui:91
+msgid "_Document"
+msgstr "_Documento"
+
+#. Scan menu item
+#: src/app-window.ui:110
+msgid "Sc_an"
+msgstr "Esc_anear"
+
+#. Menu entry to stop current scan
+#: src/app-window.ui:154
+msgid "_Stop Scan"
+msgstr "_Deter o escaneado"
+
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/app-window.ui:196 src/app-window.vala:967 src/app-window.vala:1590
 msgid "Reorder Pages"
 msgstr "Reordenar as páxinas"
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/app-window.ui:215
 msgid "_Email"
 msgstr "Correo-_e"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/app-window.ui:280
 msgid "_Page"
 msgstr "_Páxina"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/app-window.ui:290
 msgid "Rotate _Left"
 msgstr "Rotar á _esquerda"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/app-window.ui:300
 msgid "Rotate _Right"
 msgstr "Rotar á _dereita"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/app-window.ui:310
 msgid "_Crop"
 msgstr "_Recortar"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/app-window.ui:320
 msgid "_None"
 msgstr "_Ningún"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/app-window.ui:331
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/app-window.ui:342
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/app-window.ui:353
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/app-window.ui:364
 msgid "_Letter"
 msgstr "_Carta"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/app-window.ui:375
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/app-window.ui:386
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/app-window.ui:397
 msgid "_Custom"
 msgstr "_Personalizado"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/app-window.ui:415
 msgid "_Rotate Crop"
 msgstr "_Rotar o recorte"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/app-window.ui:428
 msgid "Move Left"
 msgstr "Mover á esquerda"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/app-window.ui:437
 msgid "Move Right"
 msgstr "Mover á dereita"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/app-window.ui:474
 msgid "_Help"
 msgstr "_Axuda"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/app-window.ui:482
 msgid "_Contents"
 msgstr "_Contidos"
 
-#. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
-msgid "Start a new document"
-msgstr "Iniciar un novo documento"
-
-#: data/simple-scan.ui:675
-msgid "New"
-msgstr "Novo"
-
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/app-window.ui:520 src/app-window.ui:720
 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/app-window.ui:522 src/app-window.ui:716
 msgid "Scan"
 msgstr "Escanear"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/app-window.ui:538 src/app-window.ui:787
 msgid "Save document to a file"
 msgstr "Gardar o documento nun ficheiro"
 
-#: ../src/ui.vala:1842
+#: src/app-window.ui:540
 msgid "Save"
 msgstr "Gardar"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/app-window.ui:555 src/app-window.ui:700
 msgid "Stop the current scan"
 msgstr "Deter o escaneo actual"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/app-window.ui:556 src/app-window.ui:697
 msgid "Stop"
 msgstr "Deter"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "Xirar a páxina á esquerda (sentido contrario ao reloxo)"
-
-#. Label on rotate page left (anti-clockwise) item
-#: data/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
-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
-msgid "Rotate Right"
-msgstr "Rotar á dereita"
-
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
-msgid "Crop the selected page"
-msgstr "Recortar a páxina seleccionada"
-
-#: data/simple-scan.ui:781
-msgid "Crop"
-msgstr "Recortar"
-
-#: ../src/ui.vala:1849
-msgid "Preferences"
-msgstr "Preferencias"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1048
-msgid "Scan S_ource:"
-msgstr "_Orixe de escaneo:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1079
-msgid "_Text Resolution:"
-msgstr "Resolución de _texto:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1095
-msgid "_Photo Resolution:"
-msgstr "Resolución _fotográfica:"
-
-#. Label beside scan side combo box
-#: data/simple-scan.ui:1139
-msgid "Scan Side:"
-msgstr "Cara a escanear:"
-
-#. Label beside page size combo box
-#: data/simple-scan.ui:1169
-msgid "Page Size:"
-msgstr "Tamaño da páxina:"
-
-#. Label beside brightness scale
-#: data/simple-scan.ui:1199
-msgid "Brightness:"
-msgstr "Brillo:"
-
-#. Label beside contrast scale
-#: data/simple-scan.ui:1229
-msgid "Contrast:"
-msgstr "Contraste:"
-
-#. Label beside quality scale
-#: data/simple-scan.ui:1260
-msgid "Quality:"
-msgstr "Calidade:"
-
-#: data/simple-scan.desktop.in:4
-msgid "Document Scanner"
-msgstr "Escáner de documentos"
+#. Label shown when searching for scanners
+#: src/app-window.ui:611
+msgid "Searching for Scanners…"
+msgstr "Buscando escáneres…"
 
-#: data/simple-scan.desktop.in:5
-msgid "Scan Documents"
-msgstr "Escanear documentos"
+#: src/app-window.vala:237 src/app-window.vala:1380
+msgid "_Close"
+msgstr "_Pechar"
 
-#: data/simple-scan.desktop.in:6
-msgid "scan;scanner;flatbed;adf;"
-msgstr "escanear;escáner;flatbed;adf;"
+#. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
+#: src/app-window.vala:246
+#, c-format
+#| msgid "Username and password required to access '%s'"
+msgid "Username and password required to access “%s”"
+msgstr "Requírese o nome de usuario e o contrasinal para acceder a «%s»"
 
-#: data/simple-scan.desktop.in:8
-msgid "scanner"
-msgstr ""
+#. Label shown when detected a scanner
+#: src/app-window.vala:266 src/app-window.vala:584
+#| msgid "Failed to scan"
+msgid "Ready to Scan"
+msgstr "Listo para escanear"
 
-#: data/simple-scan.appdata.xml.in:8
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-"Un xeito ben sinxelo de escanear documentos e imaxes. Pode recortar as "
-"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."
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: src/app-window.vala:273
+msgid "Additional software needed"
+msgstr "Precísase software adicional"
 
-#: data/simple-scan.appdata.xml.in:13
+#. Instructions to install driver software
+#: src/app-window.vala:275
+#| msgid "You need to install driver software for your scanner."
 msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
+"You need to <a href=\"install-firmware\">install driver software</a> for "
+"your scanner."
 msgstr ""
-"Escáner Sinxelo usa o marco de traballo de SANE para ser compatíbel coa "
-"maioría de escáneres existentes."
-
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
-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
-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
-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
-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
-msgid "Show release version"
-msgstr "Mostrar a versión de publicación"
-
-#. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
-msgid "Print debugging messages"
-msgstr "Mostrar mensaxes de depuración"
-
-#: ../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
-msgid "Failed to scan"
-msgstr "Produciuse un fallo ao escanear"
-
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
-msgid "[DEVICE...] - Scanning utility"
-msgstr "[DISPOSITIVO...] - Utilidade de escaneado"
-
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
-#, 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
-msgid "_Close"
-msgstr "_Pechar"
-
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../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»"
+"Precisa <a href=\"install-firmware\">instalar controladores</a> para o seu "
+"escáner."
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/app-window.vala:281
 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/app-window.vala:283
 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
-msgid "Additional software needed"
-msgstr "Precísase software adicional"
-
-#. Instructions to install driver software
-#: ../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
-msgid "Save As..."
-msgstr "Gardar como..."
+#: src/app-window.vala:298
+#| msgid "Save As..."
+msgid "Save As…"
+msgstr "Gardar como…"
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/app-window.vala:301 src/app-window.vala:471 src/app-window.vala:552
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/app-window.vala:302 src/app-window.vala:553
 msgid "_Save"
 msgstr "_Gardar"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/app-window.vala:310
 msgid "Scanned Document.pdf"
 msgstr "Documento escaneado.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#. Save dialog: Filter name to show only supported image files
+#: src/app-window.vala:316
 msgid "Image Files"
 msgstr "Ficheiros de imaxes"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/app-window.vala:326
 msgid "All Files"
 msgstr "Todos os ficheiros"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/app-window.vala:335
 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/app-window.vala:341
 msgid "JPEG (compressed)"
 msgstr "JPEG (comprimido)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/app-window.vala:347
 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
+#. Save dialog: Label for sabing in WEBP format
+#: src/app-window.vala:354
+#| msgid "JPEG (compressed)"
+msgid "WebP (compressed)"
+msgstr "WebP (comprimido)"
+
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
+#: src/app-window.vala:364
 msgid "File format:"
 msgstr "Formato do ficheiro:"
 
+#. Label in save dialog beside compression slider
+#: src/app-window.vala:376
+msgid "Compression:"
+msgstr "Compresión:"
+
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/app-window.vala:470
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr "Xa existe un ficheiro co nome «%s». Desexa substituílo?"
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/app-window.vala:473
+msgid "_Replace"
+msgstr "_Substituír"
+
+#: src/app-window.vala:512
+msgid "Saving"
+msgstr "Gardando"
+
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/app-window.vala:527
 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
-msgid "If you don't save, changes will be permanently lost."
+#: src/app-window.vala:550
+#| msgid "If you don't save, changes will be permanently lost."
+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/app-window.vala:591
 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/app-window.vala:593
 msgid "Discard Changes"
 msgstr "Rexeitar os cambios"
 
+#. Label shown when scan started
+#: src/app-window.vala:692
+#| msgid "Change _Scanner"
+msgid "Contacting scanner…"
+msgstr "Contactando co escáner…"
+
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/app-window.vala:800
 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/app-window.vala:812
 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/app-window.vala:990
 msgid "Combine sides"
 msgstr "Combinar lados"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/app-window.vala:1000
 msgid "Combine sides (reverse)"
 msgstr "Combinar lados (inverso)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/app-window.vala:1010
 msgid "Reverse"
 msgstr "Inverter"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/app-window.vala:1020
 msgid "Keep unchanged"
 msgstr "Manter sen cambios"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/app-window.vala:1250
 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/app-window.vala:1271
 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 +558,16 @@ msgstr ""
 "con este programa. Si no fuera así, vea <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/app-window.vala:1274
 msgid "About Simple Scan"
 msgstr "Acerca de Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/app-window.vala:1277
 msgid "Simple document scanning tool"
 msgstr "Ferramenta sinxela de escaneado de documentos"
 
-#: ../src/ui.vala:1487
+#: src/app-window.vala:1286
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -561,204 +578,548 @@ 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/app-window.vala:1308
 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
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:1310
 msgid "Quit without Saving"
 msgstr "Saír sen gardar"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/app-window.vala:1357
 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/app-window.vala:1359
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.brother.com\">Brother website</a>."
+"Drivers for this are available on the <a href=\"http://support.brother.com"
+"\">Brother website</a>."
 msgstr ""
 "Os controladores para este dispositivo están dispoñíbeis na páxina de <a "
 "href=\"http://support.brother.com\">Brother</a>."
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/app-window.vala:1363
 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/app-window.vala:1365
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://samsung.com/support\">Samsung website</a>."
+"Drivers for this are available on the <a href=\"http://samsung.com/support"
+"\">Samsung website</a>."
 msgstr ""
 "Os controladores para este dispositivo están dispoñíbeis na páxina de <a "
 "href=\"http://samsung.com/support\">Samsung</a>."
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/app-window.vala:1369
 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/app-window.vala:1374
 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/app-window.vala:1376
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.epson.com\">Epson website</a>."
+"Drivers for this are available on the <a href=\"http://support.epson.com"
+"\">Epson website</a>."
 msgstr ""
-"Os controladores están dispoñíbeis no sitio web de <a "
-"href=\"http://support.epson.com\">Epson</a>."
+"Os controladores están dispoñíbeis no sitio web de <a href=\"http://support."
+"epson.com\">Epson</a>."
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/app-window.vala:1380
 msgid "Install drivers"
 msgstr "Instalar controladores"
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/app-window.vala:1411
 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
-msgid "Installing drivers..."
-msgstr "Instalando os controladores..."
+#: src/app-window.vala:1423
+#| msgid "Installing drivers..."
+msgid "Installing drivers…"
+msgstr "Instalando os controladores…"
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/app-window.vala:1431
 msgid "Drivers installed successfully!"
 msgstr "Os controladores instaláronse correctamente."
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/app-window.vala:1441
 #, 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/app-window.vala:1447
 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/app-window.vala:1454
 #, c-format
-msgid "You need to install the %s package(s)."
-msgstr "Necesita instalar o paquete(s) %s."
+#| msgid "You need to install the %s package(s)."
+msgid "You need to install the %s package."
+msgid_plural "You need to install the %s packages."
+msgstr[0] "Necesita instalar o paquete %s."
+msgstr[1] "Necesita instalar o paquete %s."
+
+#. Title of preferences dialog
+#: src/app-window.vala:1568 src/app-window.vala:1591
+#: src/preferences-dialog.ui:53
+msgid "Preferences"
+msgstr "Preferencias"
+
+#: src/app-window.vala:1572
+msgid "Keyboard Shortcuts"
+msgstr "Atallos de teclado"
+
+#: src/app-window.vala:1573
+msgid "Help"
+msgstr "Axuda"
+
+#: src/app-window.vala:1574
+msgid "About"
+msgstr "Sobre"
+
+#: src/app-window.vala:1575
+msgid "Quit"
+msgstr "Saír"
+
+#: src/app-window.vala:1589
+#| msgid "_Email"
+msgid "Email"
+msgstr "Correo electrónico"
+
+#. Populate ActionBar (not supported in Glade)
+#. https://bugzilla.gnome.org/show_bug.cgi?id=769966
+#. Label on new document button
+#: src/app-window.vala:1599
+msgid "Start Again…"
+msgstr "Comezar de novo…"
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: src/app-window.vala:1616
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Xirar a páxina á esquerda (sentido contrario ao reloxo)"
+
+#. Tooltip for rotate right (clockwise) button
+#: src/app-window.vala:1623
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Xirar a páxina á dereita (sentido do reloxo)"
+
+#. Tooltip for crop button
+#: src/app-window.vala:1633
+msgid "Crop the selected page"
+msgstr "Recortar a páxina seleccionada"
+
+#. Tooltip for delete button
+#: src/app-window.vala:1649
+#| msgid "Crop the selected page"
+msgid "Delete the selected page"
+msgstr "Eliminar a páxina seleccionada"
+
+#. Text of button for cancelling save
+#: src/app-window.vala:1814
+#| msgid "_Cancel"
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. Button to submit authorization dialog
+#: src/authorize-dialog.ui:25
+msgid "_Authorize"
+msgstr "_Autorizar"
+
+#. Label beside username entry
+#: src/authorize-dialog.ui:99
+msgid "_Username for resource:"
+msgstr "Nome de _usuario para o recurso:"
+
+#. Label beside password entry
+#: src/authorize-dialog.ui:112
+msgid "_Password:"
+msgstr "_Contrasinal:"
+
+#: src/book.vala:331 src/book.vala:337
+#, c-format
+#| msgid "Unable to open help file"
+msgid "Unable to encode page %i"
+msgstr "Non é posíbel codificar a páxina %i"
+
+#: src/help-overlay.ui:12
+#| msgid "Scan"
+msgctxt "shortcut window"
+msgid "Scanning"
+msgstr "Escaneando"
+
+#: src/help-overlay.ui:17
+#| msgid "Scan a single page from the scanner"
+msgctxt "shortcut window"
+msgid "Scan a single page"
+msgstr "Escanear unha única páxina"
+
+#: src/help-overlay.ui:24
+#| msgid "Scan a single page from the scanner"
+msgctxt "shortcut window"
+msgid "Scan all pages from document feeder"
+msgstr "Escanear todas as páxinas do alimentador de documentos"
+
+#: src/help-overlay.ui:31
+#| msgid "Scan a single page from the scanner"
+msgctxt "shortcut window"
+msgid "Scan continuously from a flatbed scanner"
+msgstr "Escanear continuamente desde o escáner"
+
+#: src/help-overlay.ui:38
+msgctxt "shortcut window"
+msgid "Stop scan in progress"
+msgstr "Deter o escaneado en progreso"
+
+#: src/help-overlay.ui:46
+#| msgid "Document Scanner"
+msgctxt "shortcut window"
+msgid "Document Modification"
+msgstr "Modificación do documento"
+
+#: src/help-overlay.ui:51
+#| msgid "Move Left"
+msgctxt "shortcut window"
+msgid "Move page left"
+msgstr "Mover páxina á esquerda"
+
+#: src/help-overlay.ui:58
+#| msgid "Move Right"
+msgctxt "shortcut window"
+msgid "Move page right"
+msgstr "Mover páxina á dereita"
+
+#: src/help-overlay.ui:65
+#| msgid "Rotate the page to the left (counter-clockwise)"
+msgctxt "shortcut window"
+msgid "Rotate page to the left (anti-clockwise)"
+msgstr "Rotar a páxina á esquerda (sentido contrario ao reloxo)"
+
+#: src/help-overlay.ui:72
+#| msgid "Rotate the page to the right (clockwise)"
+msgctxt "shortcut window"
+msgid "Rotate page to the right (clockwise)"
+msgstr "Rotar a páxina á dereita (sentido do reloxo)"
+
+#: src/help-overlay.ui:79
+#| msgid "Crop the selected page"
+msgctxt "shortcut window"
+msgid "Delete page"
+msgstr "Eliminar páxina"
+
+#: src/help-overlay.ui:87
+#| msgid "Document Scanner"
+msgctxt "shortcut window"
+msgid "Document Management"
+msgstr "Xestión de documentos"
+
+#: src/help-overlay.ui:92
+#| msgid "Start a new document"
+msgctxt "shortcut window"
+msgid "Start new document"
+msgstr "Iniciar un novo documento"
+
+#: src/help-overlay.ui:99
+#| msgid "Scanned Document"
+msgctxt "shortcut window"
+msgid "Save scanned document"
+msgstr "Gardar o documento escaneado"
+
+#: src/help-overlay.ui:106
+#| msgid "Scanned Document"
+msgctxt "shortcut window"
+msgid "Email scanned document"
+msgstr "Enviar por correo-e o documento analizado "
+
+#: src/help-overlay.ui:113
+#| msgid "Scanned Document"
+msgctxt "shortcut window"
+msgid "Print scanned document"
+msgstr "Imprimir o documento analizado"
+
+#: src/help-overlay.ui:120
+msgctxt "shortcut window"
+msgid "Copy current page to clipboard"
+msgstr "Copiar a páxina actual ao portapapeis"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:113
+#| msgid "Change _Scanner"
+msgid "_Scanner"
+msgstr "_Escáner"
+
+#. Label beside scan side combo box
+#: src/preferences-dialog.ui:143
+#| msgid "Scan Side:"
+msgid "Scan Sides"
+msgstr "Escanear lados"
+
+#. Label beside page size combo box
+#: src/preferences-dialog.ui:160
+#| msgid "Page Size:"
+msgid "Page Size"
+msgstr "Tamaño da pantalla"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:191
+msgid "Front"
+msgstr "Anverso"
+
+#. Preferences Dialog: Toggle button to select scanning on the back side of a page
+#: src/preferences-dialog.ui:206
+msgid "Back"
+msgstr "Atrás"
+
+#. Preferences Dialog: Toggle button to select scanning on both sides of a page
+#: src/preferences-dialog.ui:221
+msgid "Both"
+msgstr "Ambos"
+
+#. Label beside page delay scale
+#: src/preferences-dialog.ui:260
+msgid "Delay"
+msgstr "Atraso"
+
+#. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
+#: src/preferences-dialog.ui:276
+msgid "Multiple pages from flatbed"
+msgstr "Varias páxinas do escáner"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:295
+msgid "3"
+msgstr "3"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:310
+msgid "5"
+msgstr "5"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:326
+msgid "7"
+msgstr "7"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:342
+msgid "10"
+msgstr "10"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:358
+msgid "15"
+msgstr "15"
+
+#. Label after page delay radio buttons
+#: src/preferences-dialog.ui:385
+msgid "Seconds"
+msgstr "Segundos"
+
+#. Preferences Dialog: Tab label for scanning settings
+#: src/preferences-dialog.ui:413
+#| msgid "Scan"
+msgid "Scanning"
+msgstr "Escaneando"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:436
+#| msgid "_Text Resolution:"
+msgid "_Text Resolution"
+msgstr "Resolución de _texto"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:452
+#| msgid "_Photo Resolution:"
+msgid "_Photo Resolution"
+msgstr "Resolución _fotográfica"
+
+#. Label beside brightness scale
+#: src/preferences-dialog.ui:505
+#| msgid "Brightness:"
+msgid "Brightness"
+msgstr "Brillo"
+
+#. Label beside contrast scale
+#: src/preferences-dialog.ui:521
+#| msgid "Contrast:"
+msgid "Contrast"
+msgstr "Contraste"
+
+#. Preferences Dialog: Tab for quality settings
+#: src/preferences-dialog.ui:576
+#| msgid "Quality:"
+msgid "Quality"
+msgstr "Calidade"
+
+#. Combo box value for automatic paper size
+#: src/preferences-dialog.vala:77
+msgid "Automatic"
+msgstr "Automático"
+
+#: src/preferences-dialog.vala:116
+msgid "Darker"
+msgstr "Máis escuro"
+
+#: src/preferences-dialog.vala:118
+msgid "Lighter"
+msgstr "Máis claro"
+
+#: src/preferences-dialog.vala:126
+msgid "Less"
+msgstr "Menos"
+
+#: src/preferences-dialog.vala:128
+msgid "More"
+msgstr "Máis"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/preferences-dialog.vala:440
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d ppp (predeterminada)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/preferences-dialog.vala:443
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d ppp (borrador)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/preferences-dialog.vala:446
 #, 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/preferences-dialog.vala:449
 #, c-format
 msgid "%d dpi"
 msgstr "%d ppp"
 
-#: ../src/ui.vala:1835
-msgid "New Document"
-msgstr "Novo documento"
+#. Error displayed when no scanners to scan with
+#: src/scanner.vala:844
+msgid "No scanners available.  Please connect a scanner."
+msgstr "Non hai escáneres dispoñíbeis. Conecte un escáner."
 
-#: ../src/ui.vala:1840
-msgid "Document"
-msgstr "Documento"
+#. Error displayed when cannot connect to scanner
+#: src/scanner.vala:874
+msgid "Unable to connect to scanner"
+msgstr "Non foi posíbel conectar co escáner"
 
-#: ../src/ui.vala:1844
-msgid "Email..."
-msgstr "Correo electrónico..."
+#. Error display when unable to start scan
+#: src/scanner.vala:1227
+msgid "Unable to start scan"
+msgstr "Non foi posíbel iniciar o escaneado"
 
-#: ../src/ui.vala:1845
-msgid "Print..."
-msgstr "Imprimir..."
+#. Error displayed when communication with scanner broken
+#: src/scanner.vala:1240 src/scanner.vala:1340
+msgid "Error communicating with scanner"
+msgstr "Produciuse un erro na comunicación co escáner"
 
-#: ../src/ui.vala:1853
-msgid "Help"
-msgstr "Axuda"
+#. Help string for command line --version flag
+#: src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "Mostrar a versión de publicación"
 
-#: ../src/ui.vala:1854
-msgid "About"
-msgstr "Sobre"
+#. Help string for command line --debug flag
+#: src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Mostrar mensaxes de depuración"
 
-#: ../src/ui.vala:1855
-msgid "Quit"
-msgstr "Saír"
+#: 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"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
-msgid "Change _Scanner"
-msgstr "Cambiar o _escáner"
+#. Title of error dialog when scan failed
+#: src/simple-scan.vala:392
+msgid "Failed to scan"
+msgstr "Produciuse un fallo ao escanear"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
-msgid "_Install Drivers"
-msgstr "_Instalar controladores"
+#. Attempt to inhibit the screensaver when scanning
+#: src/simple-scan.vala:407
+msgid "Scan in progress"
+msgstr "Escaneo en progreso"
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
-msgid "Automatic"
-msgstr "Automático"
+#. Arguments and description for --help text
+#: src/simple-scan.vala:584
+#| msgid "[DEVICE...] - Scanning utility"
+msgid "[DEVICE…] — Scanning utility"
+msgstr "[DISPOSITIVO...] — Utilidade de escaneado"
 
-#: ../src/ui.vala:1947
-msgid "Darker"
-msgstr "Máis escuro"
+#. Text printed out when an unknown command-line argument provided
+#: src/simple-scan.vala:595
+#, c-format
+#| msgid ""
+#| "Run '%s --help' to see a full list of available command line options."
+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:1949
-msgid "Lighter"
-msgstr "Máis claro"
+#~ msgid "Front and Back"
+#~ msgstr "Anverso e reverso"
 
-#: ../src/ui.vala:1957
-msgid "Less"
-msgstr "Menos"
+#~ msgid "New"
+#~ msgstr "Novo"
 
-#: ../src/ui.vala:1959
-msgid "More"
-msgstr "Máis"
+#~ msgid "Rotate Left"
+#~ msgstr "Rotar á esquerda"
 
-#: ../src/ui.vala:1967
-msgid "Minimum"
-msgstr "Mínimo"
+#~ msgid "Rotate Right"
+#~ msgstr "Rotar á dereita"
 
-#: ../src/ui.vala:1969
-msgid "Maximum"
-msgstr "Máximo"
+#~ msgid "Crop"
+#~ msgstr "Recortar"
 
-#: ../src/ui.vala:2008
-msgid "Saving document..."
-msgstr "Gardando o documento..."
+#~ msgid "Scan S_ource:"
+#~ msgstr "_Orixe de escaneo:"
 
-#: ../src/ui.vala:2173
-#, c-format
-msgid "Saving page %d out of %d"
-msgstr "Gardando páxina %d de %d"
+#~ msgid "New Document"
+#~ msgstr "Novo documento"
+
+#~ msgid "Document"
+#~ msgstr "Documento"
+
+#~ msgid "Email..."
+#~ msgstr "Correo electrónico..."
+
+#~ msgid "Print..."
+#~ msgstr "Imprimir..."
+
+#~ msgid "_Install Drivers"
+#~ msgstr "_Instalar controladores"
+
+#~ msgid "Minimum"
+#~ msgstr "Mínimo"
+
+#~ msgid "Maximum"
+#~ msgstr "Máximo"
+
+#~ msgid "Saving document..."
+#~ msgstr "Gardando o documento..."
+
+#~ msgid "Saving page %d out of %d"
+#~ msgstr "Gardando páxina %d de %d"
 
 #~ msgid "4&#xD7;6"
 #~ msgstr "4&#xD7;6"
 
-#, c-format
 #~ msgid ""
 #~ "Usage:\n"
 #~ "  %s [DEVICE...] - Scanning utility"
@@ -772,9 +1133,6 @@ msgstr "Gardando páxina %d de %d"
 #~ msgid "Files missing"
 #~ msgstr "Faltan ficheiros"
 
-#~ msgid "Device to scan from"
-#~ msgstr "Dispositivo desde o que escanear"
-
 #~ msgid "Direction of scan"
 #~ msgstr "Dirección de escaneado"
 
@@ -782,30 +1140,26 @@ msgstr "Gardando páxina %d de %d"
 #~ msgstr "Altura da imaxe escaneada en píxeles"
 
 #~ msgid ""
-#~ "The direction of the scanner across the scanned page. It can be one of the "
-#~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+#~ "The direction of the scanner across the scanned page. It can be one of "
+#~ "the following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-"
+#~ "left'"
 #~ msgstr ""
-#~ "A dirección do escáner a través da páxina escaneada. Pode ser calquera dos "
-#~ "seguintes: «top-to-bottom» «bottom-to-top» «left-to-right» «right-to-left»"
-
-#~ msgid "Type of document being scanned"
-#~ msgstr "Tipo de documento que está sendo escaneado"
+#~ "A dirección do escáner a través da páxina escaneada. Pode ser calquera "
+#~ "dos seguintes: «top-to-bottom» «bottom-to-top» «left-to-right» «right-to-"
+#~ "left»"
 
 #~ msgid ""
 #~ "Type of document being scanned. 'text' for text documents, 'photo' for "
 #~ "photos. This setting decides on the scan resolution, colors and post-"
 #~ "processing."
 #~ msgstr ""
-#~ "O tipo de documento que se vai a escanear. «text» para documentos de texto, "
-#~ "«photo» para fotos. Esta opción determina a resolución, as cores e o "
-#~ "postprocesamento do escaneado."
+#~ "O tipo de documento que se vai a escanear. «text» para documentos de "
+#~ "texto, «photo» para fotos. Esta opción determina a resolución, as cores e "
+#~ "o postprocesamento do escaneado."
 
 #~ msgid "TRUE if the application window is maximized"
 #~ msgstr "VERDADEIRO se a xanela do aplicativo está maximizada"
 
-#~ msgid "SANE device to acquire images from."
-#~ msgstr "Dispositivo SANE desde o que adquirir as imaxes."
-
 #~ msgid "Width of scanned image in pixels"
 #~ msgstr "Largura da imaxe escaneada"
 
@@ -815,7 +1169,6 @@ msgstr "Gardando páxina %d de %d"
 #~ msgid "Window width in pixels"
 #~ msgstr "Largura da xanela en píxeles"
 
-#, c-format
 #~ msgid ""
 #~ "Help Options:\n"
 #~ "  -d, --debug                     Print debugging messages\n"
@@ -831,84 +1184,28 @@ msgstr "Gardando páxina %d de %d"
 #~ "  --help-all                      Mostra todas as opcións de axuda\n"
 #~ "  --help-gtk                      Mostra as opcións de GTK+"
 
-#~ msgid "Resolution for text scans"
-#~ msgstr "Resolución para o escaneado de texto"
-
-#~ msgid "Resolution for photo scans"
-#~ msgstr "Resolución para o escaneado de fotos"
-
 #~ msgid "Resolution of last scanned image"
 #~ msgstr "Resolución da última imaxe escaneada"
 
 #~ msgid "The resolution in dots-per-inch of the previously scanned image."
 #~ msgstr "Resolución en puntos por polgada da imaxe escaneada anteriormente."
 
-#~ msgid "The resolution in dots-per-inch to use when scanning text."
-#~ msgstr "Resolución en puntos por polgada a usar cando se escanean textos."
-
-#~ msgid "The resolution in dots-per-inch to use when scanning photos."
-#~ msgstr "Resolución en puntos por polgada a usar cando se escanean fotos."
-
-#~ msgid ""
-#~ "The directory to save files to. Defaults to the documents directory if unset."
-#~ msgstr ""
-#~ "O directorio no que se gardarán os ficheiros. Por omisión usarase o "
-#~ "directorio de documentos."
-
-#~ msgid "Scanned Document"
-#~ msgstr "Documento escaneado"
-
 #~ msgid "Select File _Type"
 #~ msgstr "Elixa o _tipo de ficheiro"
 
-#~ msgid "Directory to save files to"
-#~ msgstr "Directorio no que gardar os ficheiros"
-
-#~ msgid "Page side to scan"
-#~ msgstr "Cara da páxina a escanear"
-
-#~ msgid "Height of paper in tenths of a mm"
-#~ msgstr "Altura do papel en décimas de mm"
-
 #~ msgid ""
-#~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+#~ "The page side to scan. It can be one of the following: 'both' 'front' "
+#~ "'back'"
 #~ msgstr ""
 #~ "A cara da páxina que desexe escanear. Pode ser un dos seguintes: «ambos», "
 #~ "«anverso» e «recverso»"
 
-#~ msgid ""
-#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
-#~ msgstr ""
-#~ "A largura do papel en décimas de mm (ou 0 para a detección automática do "
-#~ "papel)."
-
-#~ msgid ""
-#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
-#~ msgstr ""
-#~ "A altura do papel en décimas de mm (ou 0 para a detección automática do "
-#~ "papel)."
-
-#~ msgid "Width of paper in tenths of a mm"
-#~ msgstr "Largura do papel en décimas de mm"
-
-#~ msgid "The page side to scan."
-#~ msgstr "O lado da páxina a escanear."
-
-#~ msgid ""
-#~ "Type of document being scanned. This setting decides on the scan resolution, "
-#~ "colors and post-processing."
-#~ msgstr ""
-#~ "Tipo de documento a escanear. Esta opción decide a resolución, cores e post-"
-#~ "procesado do escaneado"
-
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "A dirección do escáner sobre a páxina escaneada."
 
 #~ msgid ""
-#~ "The width of scanned image in pixels. This value is updated to what the last "
-#~ "scanned page was."
+#~ "The width of scanned image in pixels. This value is updated to what the "
+#~ "last scanned page was."
 #~ msgstr ""
 #~ "A largura da imaxe escaneada. Este valor actualizase co que tivo a última "
 #~ "páxina escaneada."
@@ -920,7 +1217,6 @@ msgstr "Gardando páxina %d de %d"
 #~ "A altura da imaxe escaneada. Este valor actualizase co que tivo a última "
 #~ "páxina escaneada."
 
-#, c-format
 #~ msgid ""
 #~ "GTK+ Options:\n"
 #~ "  --class=CLASS                   Program class as used by the window "
@@ -940,22 +1236,5 @@ msgstr "Gardando páxina %d de %d"
 #~ "  --screen=SCREEN                 Pantalla X a usar\n"
 #~ "  --sync                          Facer chamadas X síncronas\n"
 #~ "  --gtk-module=MODULES            Cargar módulos GTK+ adicionais\n"
-#~ "  --g-fatal-warnings              Converter todos os avisos en erros fatais"
-
-#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
-#~ msgstr "Axuste de contraste de -100 a 100 (0 é ningún)."
-
-#~ msgid "Contrast of scan"
-#~ msgstr "Contraste do escaneo"
-
-#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
-#~ msgstr "Axuste de brillo de -100 a 100 (0 é ningún)."
-
-#~ msgid "Brightness of scan"
-#~ msgstr "Brillo do escaneo"
-
-#~ msgid "Quality value to use for JPEG compression."
-#~ msgstr "Valor de calidade a usar na compresión JPEG."
-
-#~ msgid "Quality value to use for JPEG compression"
-#~ msgstr "Valor de calidade a usar na compresión JPEG"
+#~ "  --g-fatal-warnings              Converter todos os avisos en erros "
+#~ "fatais"
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..c1cb0f6 100644
--- a/po/he.po
+++ b/po/he.po
@@ -7,296 +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:01+0000\n"
-"Last-Translator: Robert Ancell <robert.ancell@canonical.com>\n"
+"POT-Creation-Date: 2017-04-16 08:54-0400\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"
+"Language: he\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-25 06:10+0000\n"
+"X-Generator: Launchpad (build 18361)\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
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: 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 "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:498
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:509
 msgid "A_6"
 msgstr "A_6"
 
 #. 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 "4×6"
 
 #. 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 ""
+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 ""
+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 "שמירת המסמך לקובץ"
 
-#: ../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 "חיתוך"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: 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 "סריקת מסמכים"
 
@@ -308,7 +322,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 +333,209 @@ 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:844
 msgid "No scanners available.  Please connect a scanner."
 msgstr "אין סורקים זמינים. נא לחבר סורק."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:874
 msgid "Unable to connect to scanner"
 msgstr "לא ניתן להתחבר לסורק"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1227
 msgid "Unable to start scan"
 msgstr "לא ניתן להתחיל בסריקה"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: 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
+#: 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:332 src/ui.vala:1655 src/ui.vala:1935
 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:341
 #, 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:389
 msgid "No scanners detected"
 msgstr "לא נמצאו סורקים"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:391
 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:396
 msgid "Additional software needed"
 msgstr "נדרשות תכניות נוספות"
 
 #. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:398
 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: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 "_שמירה"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:522
 msgid "Scanned Document.pdf"
 msgstr "מסמך סרוק.pdf"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:528
 msgid "Image Files"
 msgstr "קובצי תמונה"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:534
 msgid "All Files"
 msgstr "כל הקבצים"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:543
 msgid "PDF (multi-page document)"
 msgstr "PDF (מסמך מרובה עמודים)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:549
 msgid "JPEG (compressed)"
 msgstr "JPEG (דחוס)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:555
 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: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:650
+#: src/ui.vala:698
 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:721
 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:763
 msgid "Save current document?"
 msgstr "האם לשמור את המסמך הנוכחי?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:765
 msgid "Discard Changes"
 msgstr "התעלמות מהשינויים"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:1056
 msgid "Unable to save image for preview"
 msgstr "לא ניתן לשמור את התמונה לתצוגה מקדימה"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1068
 msgid "Unable to open image preview application"
 msgstr "לא ניתן לפתוח את היישום להצגה מקדימה של תמונות"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1270
 msgid "Combine sides"
 msgstr "שילוב צדדים"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1280
 msgid "Combine sides (reverse)"
 msgstr "שילוב צדדים (הפוך)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1290
 msgid "Reverse"
 msgstr "היפוך"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1300
 msgid "Keep unchanged"
 msgstr "להשאיר ללא שינוי"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1504
 msgid "Unable to open help file"
 msgstr "לא ניתן לפתוח את קובץ העזרה"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: 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"
@@ -537,16 +562,16 @@ msgstr ""
 "ניתן לעיין ב־<http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1528
 msgid "About Simple Scan"
 msgstr "על אודות Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1531
 msgid "Simple document scanning tool"
 msgstr "כלי פשוט לסריקת מסמכים"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1540
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -559,22 +584,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:1562
 msgid "Save document before quitting?"
 msgstr "האם לשמור את המסמך בטרם היציאה?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1564
 msgid "Quit without Saving"
 msgstr "לצאת ללא שמירה"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1632
 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:1634
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
@@ -583,12 +608,12 @@ msgstr ""
 "Brother</a>."
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1638
 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:1640
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
@@ -597,17 +622,17 @@ msgstr ""
 "Samsung</a>."
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1644
 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:1649
 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:1651
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
@@ -616,138 +641,138 @@ msgstr ""
 "Epson</a>."
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1655
 msgid "Install drivers"
 msgstr "התקנת מנהלי התקן"
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1686
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "לאחר ההתקנה יהיה עליך להפעיל מחדש את סריקה פשוטה."
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1698
 msgid "Installing drivers..."
 msgstr "מנהלי ההתקן מותקנים…"
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1706
 msgid "Drivers installed successfully!"
 msgstr "מנהלי ההתקנים הותקנו בהצלחה!"
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1716
 #, 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:1722
 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:1729
 #, 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:1833
 #, 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:1836
 #, 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:1839
 #, 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:1842
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../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 "יציאה"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1937
 msgid "Change _Scanner"
 msgstr "ב_חירה בסורק אחר"
 
 #. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1939
 msgid "_Install Drivers"
 msgstr "הת_קנת מנהלי התקן"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: 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 "נשמר העמוד %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..85b10bb 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -6,515 +6,523 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-07-29 12:47+1200\n"
-"PO-Revision-Date: 2016-11-26 12:08+0000\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
+"product=simple-scan&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-08-13 21:51+0000\n"
+"PO-Revision-Date: 2017-08-18 22:23+0200\n"
 "Last-Translator: gogo <trebelnik2@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
+"Language: hr\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-07-25 17:32+0000\n"
+"X-Generator: Poedit 1.8.7.1\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#. Button to submit authorization dialog
-#: data/simple-scan.ui:24
-msgid "_Authorize"
-msgstr "_Ovlasti"
+#: data/org.gnome.SimpleScan.gschema.xml:11
+msgid "Device to scan from"
+msgstr "Uređaj za skeniranje"
 
-#. Label beside username entry
-#: data/simple-scan.ui:102
-msgid "_Username for resource:"
-msgstr "_Korisničko ime za izvor:"
+#: data/org.gnome.SimpleScan.gschema.xml:12
+msgid "SANE device to acquire images from."
+msgstr "SANE uređaj iz kojeg se dobiva slika."
 
-#. Label beside password entry
-#: data/simple-scan.ui:117
-msgid "_Password:"
-msgstr "_Lozinka:"
+#: data/org.gnome.SimpleScan.gschema.xml:20
+msgid "Type of document being scanned"
+msgstr "Vrsta dokumenat koji se skenira"
 
-#. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
-msgid "Front and Back"
-msgstr "Prednja i stražnja"
+#: data/org.gnome.SimpleScan.gschema.xml:21
+msgid ""
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+msgstr ""
+"Vrsta dokumenta koji se skenira. Ova postavka određuje razlučivost, boju i "
+"naknadnu obradu."
 
-#. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
-msgid "Front"
-msgstr "Prednja"
+#: data/org.gnome.SimpleScan.gschema.xml:25
+msgid "Width of paper in tenths of a mm"
+msgstr "Širina papira u desetinkama milimetra"
 
-#. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
-msgid "Back"
-msgstr "Stražnja"
+#: data/org.gnome.SimpleScan.gschema.xml:26
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"Širina papira u desetinkama milimetra (ili 0 za automatsko prepoznavanje "
+"papira)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:30
+msgid "Height of paper in tenths of a mm"
+msgstr "Visina papira u desetinkama milimetra"
+
+#: data/org.gnome.SimpleScan.gschema.xml:31
+msgid ""
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"Visina papira u desetinkama milimetra (ili 0 za automatsko prepoznavanje "
+"papira)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:35
+msgid "Brightness of scan"
+msgstr "Svjetlina skeniranja"
+
+#: data/org.gnome.SimpleScan.gschema.xml:36
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr "Prilagodba svjetline od -100 do 100 (0 za nepromijenjeno)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:40
+msgid "Contrast of scan"
+msgstr "Kontrast skeniranja"
+
+#: data/org.gnome.SimpleScan.gschema.xml:41
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr "Prilagodba kontrasta od -100 do 100 (0 za nepromijenjeno)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:45
+msgid "Resolution for text scans"
+msgstr "Razlučivost skeniranja teksta"
+
+#: data/org.gnome.SimpleScan.gschema.xml:46
+msgid "The resolution in dots-per-inch to use when scanning text."
+msgstr "Razlučivost u točkama po inču pri skeniranja teksta."
+
+#: data/org.gnome.SimpleScan.gschema.xml:50
+msgid "Resolution for photo scans"
+msgstr "Razlučivost skeniranja fotografija"
+
+#: data/org.gnome.SimpleScan.gschema.xml:51
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr "Razlučivost u točkama po inču pri skeniranju slika."
+
+#: data/org.gnome.SimpleScan.gschema.xml:55
+msgid "Page side to scan"
+msgstr "Stranica lista za skeniranje"
+
+#: data/org.gnome.SimpleScan.gschema.xml:56
+msgid "The page side to scan."
+msgstr "Stranica lista za skeniranje."
+
+#: data/org.gnome.SimpleScan.gschema.xml:60
+msgid "Directory to save files to"
+msgstr "Mapa za spremanje datoteka"
+
+#: data/org.gnome.SimpleScan.gschema.xml:61
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+"Mapa za spremanje datoteka. Ako nije postavljeno, koristi se mapa dokumenata."
+
+#: data/org.gnome.SimpleScan.gschema.xml:66
+msgid "Quality value to use for JPEG compression"
+msgstr "Vrijednost kvalitetete pri JPEG sažimanju"
+
+#: data/org.gnome.SimpleScan.gschema.xml:67
+msgid "Quality value to use for JPEG compression."
+msgstr "Vrijednost kvalitetete pri JPEG sažimanju."
+
+#: data/org.gnome.SimpleScan.gschema.xml:72
+msgid "Delay in millisecond between pages"
+msgstr "Odgoda u milisekundama između stranica"
+
+#: data/org.gnome.SimpleScan.gschema.xml:73
+msgid "Delay in millisecond between pages."
+msgstr "Odgoda u milisekundama između stranica."
 
 #. 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
+#. Set HeaderBar title here because Glade doesn't keep it translated
+#. https://bugzilla.gnome.org/show_bug.cgi?id=782753
+#. Title of scan window
+#: data/simple-scan.appdata.xml.in:6 data/simple-scan.desktop.in:3
+#: src/app-window.ui:76 src/app-window.vala:1560
 msgid "Simple Scan"
 msgstr "Skeniranje dokumenata"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
-msgid "_Document"
-msgstr "_Dokument"
+#: data/simple-scan.appdata.xml.in:7 data/simple-scan.desktop.in:5
+msgid "Scan Documents"
+msgstr "Skenirajte dokumente"
 
-#. Scan menu item
-#: data/simple-scan.ui:260
-msgid "Sc_an"
-msgstr "Sk_eniraj"
+#: 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 "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+"Istinski jednostavan način skeniranja dokumenata i fotografija. Možete "
+"izrezati loše dijelove fotografija i zakrenuti ih ako su pogrešno okrenute. "
+"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:14
+msgid "Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+"Skeniranje dokumenata koristi SANE radni okvir za podršku većine postojećih "
+"skenera."
+
+#: data/simple-scan.desktop.in:4
+msgid "Document Scanner"
+msgstr "Skener dokumenta"
+
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: data/simple-scan.desktop.in:7
+msgid "scan;scanner;flatbed;adf;"
+msgstr "skeniraj;skener;plosnat;adf;"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: data/simple-scan.desktop.in:10
+msgid "scanner"
+msgstr "scanner"
 
+#. Toolbar scan menu item to scan a single page from the scanner
 #. 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/app-window.ui:22 src/app-window.ui:123 src/app-window.ui:820
 msgid "Single _Page"
 msgstr "Jednu _stranicu"
 
+#. Toolbar scan menu item to scan all pages from a document feeder
 #. 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/app-window.ui:31 src/app-window.ui:133 src/app-window.ui:829
 msgid "All Pages From _Feeder"
 msgstr "Sve stranice iz _uvlakača"
 
-#. Menu entry to stop current scan
-#: data/simple-scan.ui:294
-msgid "_Stop Scan"
-msgstr "_Zaustavi skeniranje"
+#. Toolbar scan menu item to scan continuously from the flatbed
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/app-window.ui:40 src/app-window.ui:143 src/app-window.ui:838
+msgid "_Multiple Pages From Flatbed"
+msgstr "_Višestruke stranice iz plošnog skenera"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:853
 msgid "Text"
 msgstr "Tekst"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:863
 msgid "Photo"
 msgstr "Fotografija"
 
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: src/app-window.ui:91
+msgid "_Document"
+msgstr "_Dokument"
+
+#. Scan menu item
+#: src/app-window.ui:110
+msgid "Sc_an"
+msgstr "Sk_eniraj"
+
+#. Menu entry to stop current scan
+#: src/app-window.ui:154
+msgid "_Stop Scan"
+msgstr "_Zaustavi skeniranje"
+
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/app-window.ui:196 src/app-window.vala:967 src/app-window.vala:1590
 msgid "Reorder Pages"
 msgstr "Presloži stranice"
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/app-window.ui:215
 msgid "_Email"
 msgstr "_E-pošta"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/app-window.ui:280
 msgid "_Page"
 msgstr "_Stranica"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/app-window.ui:290
 msgid "Rotate _Left"
 msgstr "Zakreni _lijevo"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/app-window.ui:300
 msgid "Rotate _Right"
 msgstr "Zakreni _desno"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/app-window.ui:310
 msgid "_Crop"
 msgstr "_Izreži"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/app-window.ui:320
 msgid "_None"
 msgstr "_Ništa"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/app-window.ui:331
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/app-window.ui:342
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/app-window.ui:353
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/app-window.ui:364
 msgid "_Letter"
 msgstr "_Pismo"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/app-window.ui:375
 msgid "Le_gal"
 msgstr "Pr_avno"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/app-window.ui:386
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/app-window.ui:397
 msgid "_Custom"
 msgstr "_Prilagođeno"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/app-window.ui:415
 msgid "_Rotate Crop"
 msgstr "_Zakreni isječak"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/app-window.ui:428
 msgid "Move Left"
 msgstr "Pomakni ulijevo"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/app-window.ui:437
 msgid "Move Right"
 msgstr "Pomakni udesno"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/app-window.ui:474
 msgid "_Help"
 msgstr "_Priručnik"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/app-window.ui:482
 msgid "_Contents"
 msgstr "_Priručnik"
 
-#. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
-msgid "Start a new document"
-msgstr "Započni novi dokument"
-
-#: data/simple-scan.ui:675
-msgid "New"
-msgstr "Novo"
-
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/app-window.ui:520 src/app-window.ui:720
 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/app-window.ui:522 src/app-window.ui:716
 msgid "Scan"
 msgstr "Skeniraj"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/app-window.ui:538 src/app-window.ui:787
 msgid "Save document to a file"
 msgstr "Spremi dokument u datoteku"
 
-#: ../src/ui.vala:1842
+#: src/app-window.ui:540
 msgid "Save"
 msgstr "Spremi"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/app-window.ui:555 src/app-window.ui:700
 msgid "Stop the current scan"
 msgstr "Zaustavi trenutno skeniranje"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/app-window.ui:556 src/app-window.ui:697
 msgid "Stop"
 msgstr "Zaustavi"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "Zakreni stranicu ulijevo (obrnuto od kazaljke na satu)"
-
-#. Label on rotate page left (anti-clockwise) item
-#: data/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
-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
-msgid "Rotate Right"
-msgstr "Zakreni udesno"
-
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
-msgid "Crop the selected page"
-msgstr "Izreži odabranu stranicu"
-
-#: data/simple-scan.ui:781
-msgid "Crop"
-msgstr "Izreži"
-
-#: ../src/ui.vala:1849
-msgid "Preferences"
-msgstr "Osobitosti"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1048
-msgid "Scan S_ource:"
-msgstr "_Izvor skeniranja:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1079
-msgid "_Text Resolution:"
-msgstr "_Razlučivost teksta:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1095
-msgid "_Photo Resolution:"
-msgstr "_Razlučivost slike:"
-
-#. Label beside scan side combo box
-#: data/simple-scan.ui:1139
-msgid "Scan Side:"
-msgstr "Stranica skeniranja:"
+#. Label shown when searching for scanners
+#: src/app-window.ui:611
+msgid "Searching for Scanners…"
+msgstr "Pretraživanje skenera. . ."
 
-#. Label beside page size combo box
-#: data/simple-scan.ui:1169
-msgid "Page Size:"
-msgstr "Veličina stranice:"
-
-#. Label beside brightness scale
-#: data/simple-scan.ui:1199
-msgid "Brightness:"
-msgstr "Svjetlina:"
-
-#. Label beside contrast scale
-#: data/simple-scan.ui:1229
-msgid "Contrast:"
-msgstr "Kontrast:"
-
-#. Label beside quality scale
-#: data/simple-scan.ui:1260
-msgid "Quality:"
-msgstr "Kvaliteta:"
-
-#: data/simple-scan.desktop.in:4
-msgid "Document Scanner"
-msgstr "Skener dokumenta"
-
-#: data/simple-scan.desktop.in:5
-msgid "Scan Documents"
-msgstr "Skenirajte dokumente"
+#: src/app-window.vala:237 src/app-window.vala:1380
+msgid "_Close"
+msgstr "_Zatvori"
 
-#: data/simple-scan.desktop.in:6
-msgid "scan;scanner;flatbed;adf;"
-msgstr "skeniraj;skener;plosnat;adf;"
+#. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
+#: src/app-window.vala:246
+#, c-format
+msgid "Username and password required to access “%s”"
+msgstr "Korisničko ime i lozinka su potrebni za pristup “%s”"
 
-#: data/simple-scan.desktop.in:8
-msgid "scanner"
-msgstr "skener"
+#. Label shown when detected a scanner
+#: src/app-window.vala:266 src/app-window.vala:584
+msgid "Ready to Scan"
+msgstr "Spreman za skeniranje"
 
-#: data/simple-scan.appdata.xml.in:8
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-"Istinski jednostavan način skeniranja dokumenata i fotografija. Možete "
-"izrezati loše dijelove fotografija i zakrenuti ih ako su pogrešno okrenute. "
-"Možete ispisati vaše skenirane dokumente ili fotografije, izvesti ih u pdf "
-"ili ih spremiti u različite slikovne formate."
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: src/app-window.vala:273
+msgid "Additional software needed"
+msgstr "Potreban je dodatan softver"
 
-#: data/simple-scan.appdata.xml.in:13
+#. Instructions to install driver software
+#: src/app-window.vala:275
 msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
-"Skeniranje dokumenata koristi SANE radni okvir za podršku većine postojećih "
-"skenera."
-
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
-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
-msgid "Unable to connect to scanner"
-msgstr "Nemoguće povezivanje sa skenerom"
-
-#. Error display when unable to start scan
-#: ../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
-msgid "Error communicating with scanner"
-msgstr "Greška pri komunikaciji sa skenerom"
-
-#. Help string for command line --version flag
-#: ../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
-msgid "Print debugging messages"
-msgstr "Ispiši poruke otklanjanja grešaka"
-
-#: ../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
-msgid "Failed to scan"
-msgstr "Neuspjelo skeniranje"
-
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
-msgid "[DEVICE...] - Scanning utility"
-msgstr "[UREĐAJ...] - Alat za skeniranje"
-
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
-#, c-format
-msgid "Run '%s --help' to see a full list of available command line options."
+"You need to <a href=\"install-firmware\">install driver software</a> for "
+"your scanner."
 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
-msgid "_Close"
-msgstr "_Zatvori"
-
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../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'"
+"Morate <a href=\"install-firmware\">instalirati upravljački program</a> za "
+"vaš skener."
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/app-window.vala:281
 msgid "No scanners detected"
 msgstr "Nema otkrivenih skenera"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/app-window.vala:283
 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
-msgid "Additional software needed"
-msgstr "Potreban je dodatan softver"
-
-#. Instructions to install driver software
-#: ../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
-msgid "Save As..."
-msgstr "Spremi kao..."
+#: src/app-window.vala:298
+msgid "Save As…"
+msgstr "Spremi kao…"
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/app-window.vala:301 src/app-window.vala:471 src/app-window.vala:552
 msgid "_Cancel"
 msgstr "_Odustani"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/app-window.vala:302 src/app-window.vala:553
 msgid "_Save"
 msgstr "_Spremi"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/app-window.vala:310
 msgid "Scanned Document.pdf"
 msgstr "Skenirani dokument.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#. Save dialog: Filter name to show only supported image files
+#: src/app-window.vala:316
 msgid "Image Files"
 msgstr "Slikovne datoteke"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/app-window.vala:326
 msgid "All Files"
 msgstr "Sve datoteke"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/app-window.vala:335
 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/app-window.vala:341
 msgid "JPEG (compressed)"
 msgstr "JPEG (sažeto)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/app-window.vala:347
 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
+#. Save dialog: Label for sabing in WEBP format
+#: src/app-window.vala:354
+msgid "WebP (compressed)"
+msgstr "WebP (sažeto)"
+
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
+#: src/app-window.vala:364
 msgid "File format:"
 msgstr "Format datoteke:"
 
+#. Label in save dialog beside compression slider
+#: src/app-window.vala:376
+msgid "Compression:"
+msgstr "Sažimanje:"
+
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/app-window.vala:470
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr "Datoteka naziva “%s” već postoji.  Želite li ju zamijeniti?"
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/app-window.vala:473
+msgid "_Replace"
+msgstr "_Zamijeni"
+
+#: src/app-window.vala:512
+msgid "Saving"
+msgstr "Spremanje"
+
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/app-window.vala:527
 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
-msgid "If you don't save, changes will be permanently lost."
+#: src/app-window.vala:550
+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/app-window.vala:591
 msgid "Save current document?"
 msgstr "Spremi trenutni dokument?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/app-window.vala:593
 msgid "Discard Changes"
 msgstr "Odbaci promjene"
 
+#. Label shown when scan started
+#: src/app-window.vala:692
+msgid "Contacting scanner…"
+msgstr "Kontaktiranje skenera. . ."
+
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/app-window.vala:800
 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/app-window.vala:812
 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/app-window.vala:990
 msgid "Combine sides"
 msgstr "Kombiniraj strane"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/app-window.vala:1000
 msgid "Combine sides (reverse)"
 msgstr "Kombiniraj strane (obrnuto)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/app-window.vala:1010
 msgid "Reverse"
 msgstr "Obrnuto"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/app-window.vala:1020
 msgid "Keep unchanged"
 msgstr "Zadrži nepromijenjeno"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/app-window.vala:1250
 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/app-window.vala:1271
 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 +551,16 @@ msgstr ""
 "program. Ako niste, posjetite <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/app-window.vala:1274
 msgid "About Simple Scan"
 msgstr "O skeniranju dokumenata"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/app-window.vala:1277
 msgid "Simple document scanning tool"
 msgstr "Alat za jednostavno skeniranje"
 
-#: ../src/ui.vala:1487
+#: src/app-window.vala:1286
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -562,401 +570,543 @@ msgstr ""
 "  Saša Teković https://launchpad.net/~hseagle2015\n"
 "  Tina Kružić https://launchpad.net/~tina-kruzic\n"
 "  gogo https://launchpad.net/~trebelnik-stefina\n"
-"  jfk- https://launchpad.net/~jfk-\n"
 "  student4 https://launchpad.net/~iputnik-msn"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/app-window.vala:1308
 msgid "Save document before quitting?"
 msgstr "Spremi dokument prije zatvaranja?"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:1310
 msgid "Quit without Saving"
 msgstr "Zatvori bez spremanja"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/app-window.vala:1357
 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/app-window.vala:1359
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.brother.com\">Brother website</a>."
+"Drivers for this are available on the <a href=\"http://support.brother.com"
+"\">Brother website</a>."
 msgstr ""
-"Upravljački programi su dostupni na <a "
-"href=\"http://support.brother.com\">Brother web stranici</a>."
+"Upravljački programi su dostupni na <a href=\"http://support.brother.com"
+"\">Brother web stranici</a>."
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/app-window.vala:1363
 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/app-window.vala:1365
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://samsung.com/support\">Samsung website</a>."
+"Drivers for this are available on the <a href=\"http://samsung.com/support"
+"\">Samsung website</a>."
 msgstr ""
-"Upravljački programi su dostupni na <a "
-"href=\"http://samsung.com/support\">Samsung web stranici</a>."
+"Upravljački programi su dostupni na <a href=\"http://samsung.com/support"
+"\">Samsung web stranici</a>."
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/app-window.vala:1369
 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/app-window.vala:1374
 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/app-window.vala:1376
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.epson.com\">Epson website</a>."
+"Drivers for this are available on the <a href=\"http://support.epson.com"
+"\">Epson website</a>."
 msgstr ""
-"Upravljački programi za ovaj pisač su dostupi na <a "
-"href=\"http://support.epson.com\">Epson web stranici</a>."
+"Upravljački programi za ovaj pisač su dostupi na <a href=\"http://support."
+"epson.com\">Epson web stranici</a>."
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/app-window.vala:1380
 msgid "Install drivers"
 msgstr "Instaliraj upravljački program"
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/app-window.vala:1411
 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
-msgid "Installing drivers..."
+#: src/app-window.vala:1423
+msgid "Installing drivers…"
 msgstr "Instalacija upravljačkih programa..."
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/app-window.vala:1431
 msgid "Drivers installed successfully!"
 msgstr "Upravljački programi su uspješno instalirani!"
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/app-window.vala:1441
 #, 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/app-window.vala:1447
 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/app-window.vala:1454
 #, c-format
-msgid "You need to install the %s package(s)."
-msgstr "Morate instalirati %s package(s)."
+msgid "You need to install the %s package."
+msgid_plural "You need to install the %s packages."
+msgstr[0] "Morate instalirati %s paket."
+msgstr[1] "Morate instalirati %s paketa."
+msgstr[2] "Morate instalirati %s paketa."
+
+#. Title of preferences dialog
+#: src/app-window.vala:1568 src/app-window.vala:1591
+#: src/preferences-dialog.ui:53
+msgid "Preferences"
+msgstr "Osobitosti"
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
-#, c-format
-msgid "%d dpi (default)"
-msgstr "%d dpi (zadano)"
+#: src/app-window.vala:1572
+msgid "Keyboard Shortcuts"
+msgstr "Prečaci tipkovnice"
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
-#, c-format
-msgid "%d dpi (draft)"
-msgstr "%d dpi (skica)"
+#: src/app-window.vala:1573
+msgid "Help"
+msgstr "Priručnik"
 
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
-#, c-format
-msgid "%d dpi (high resolution)"
-msgstr "%d dpi (visoka razlučivost)"
+#: src/app-window.vala:1574
+msgid "About"
+msgstr "O programu"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/app-window.vala:1575
+msgid "Quit"
+msgstr "Zatvori"
+
+#: src/app-window.vala:1589
+msgid "Email"
+msgstr "E-pošta"
+
+#. Populate ActionBar (not supported in Glade)
+#. https://bugzilla.gnome.org/show_bug.cgi?id=769966
+#. Label on new document button
+#: src/app-window.vala:1599
+msgid "Start Again…"
+msgstr "Ponovno pokreni..."
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: src/app-window.vala:1616
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Zakreni stranicu ulijevo (obrnuto od kazaljke na satu)"
+
+#. Tooltip for rotate right (clockwise) button
+#: src/app-window.vala:1623
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Zakreni stranicu udesno (u smjeru kazaljke na satu)"
+
+#. Tooltip for crop button
+#: src/app-window.vala:1633
+msgid "Crop the selected page"
+msgstr "Izreži odabranu stranicu"
+
+#. Tooltip for delete button
+#: src/app-window.vala:1649
+msgid "Delete the selected page"
+msgstr "Obriši odabranu stranicu"
+
+#. Text of button for cancelling save
+#: src/app-window.vala:1814
+msgid "Cancel"
+msgstr "Odustani"
+
+#. Button to submit authorization dialog
+#: src/authorize-dialog.ui:25
+msgid "_Authorize"
+msgstr "_Ovlasti"
+
+#. Label beside username entry
+#: src/authorize-dialog.ui:99
+msgid "_Username for resource:"
+msgstr "_Korisničko ime za izvor:"
+
+#. Label beside password entry
+#: src/authorize-dialog.ui:112
+msgid "_Password:"
+msgstr "_Lozinka:"
+
+#: src/book.vala:331 src/book.vala:337
 #, c-format
-msgid "%d dpi"
-msgstr "%d dpi"
+msgid "Unable to encode page %i"
+msgstr "Nemoguće dekôdiranje stranice %i"
 
-#: ../src/ui.vala:1835
-msgid "New Document"
-msgstr "Novi dokument"
+#: src/help-overlay.ui:12
+msgctxt "shortcut window"
+msgid "Scanning"
+msgstr "Skeniraj"
 
-#: ../src/ui.vala:1840
-msgid "Document"
-msgstr "Dokument"
+#: src/help-overlay.ui:17
+msgctxt "shortcut window"
+msgid "Scan a single page"
+msgstr "Skeniraj jednu stranicu"
 
-#: ../src/ui.vala:1844
-msgid "Email..."
-msgstr "E-pošta..."
+#: src/help-overlay.ui:24
+msgctxt "shortcut window"
+msgid "Scan all pages from document feeder"
+msgstr "Skeniraj jednu stranicu sa uvlakača dokumenta"
 
-#: ../src/ui.vala:1845
-msgid "Print..."
-msgstr "Ispiši…"
+#: src/help-overlay.ui:31
+msgctxt "shortcut window"
+msgid "Scan continuously from a flatbed scanner"
+msgstr "Skeniraj jednu stranicu sa plošnog skenera"
 
-#: ../src/ui.vala:1853
-msgid "Help"
-msgstr "Priručnik"
+#: src/help-overlay.ui:38
+msgctxt "shortcut window"
+msgid "Stop scan in progress"
+msgstr "Zaustavi trenutno skeniranje"
 
-#: ../src/ui.vala:1854
-msgid "About"
-msgstr "O programu"
+#: src/help-overlay.ui:46
+msgctxt "shortcut window"
+msgid "Document Modification"
+msgstr "Promjena dokumenta"
 
-#: ../src/ui.vala:1855
-msgid "Quit"
-msgstr "Zatvori"
+#: src/help-overlay.ui:51
+msgctxt "shortcut window"
+msgid "Move page left"
+msgstr "Pomakni stranicu ulijevo"
+
+#: src/help-overlay.ui:58
+msgctxt "shortcut window"
+msgid "Move page right"
+msgstr "Pomakni stranicu udesno"
+
+#: src/help-overlay.ui:65
+msgctxt "shortcut window"
+msgid "Rotate page to the left (anti-clockwise)"
+msgstr "Zakreni stranicu ulijevo (obrnuto od kazaljke na satu)"
+
+#: src/help-overlay.ui:72
+msgctxt "shortcut window"
+msgid "Rotate page to the right (clockwise)"
+msgstr "Zakreni stranicu udesno (u smjeru kazaljke na satu)"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
-msgid "Change _Scanner"
-msgstr "Promijeni _skener"
+#: src/help-overlay.ui:79
+msgctxt "shortcut window"
+msgid "Delete page"
+msgstr "Obriši stranicu"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
-msgid "_Install Drivers"
-msgstr "_Instaliraj upravljačke programe"
+#: src/help-overlay.ui:87
+msgctxt "shortcut window"
+msgid "Document Management"
+msgstr "Upravljanje dokumentima"
+
+#: src/help-overlay.ui:92
+msgctxt "shortcut window"
+msgid "Start new document"
+msgstr "Započni novi dokument"
+
+#: src/help-overlay.ui:99
+msgctxt "shortcut window"
+msgid "Save scanned document"
+msgstr "Spremi trenutni dokument"
+
+#: src/help-overlay.ui:106
+msgctxt "shortcut window"
+msgid "Email scanned document"
+msgstr "E-pošta skenira dokument"
+
+#: src/help-overlay.ui:113
+msgctxt "shortcut window"
+msgid "Print scanned document"
+msgstr "Ispiši skenirani dokument"
+
+#: src/help-overlay.ui:120
+msgctxt "shortcut window"
+msgid "Copy current page to clipboard"
+msgstr "Kopiraj trenutnu stranicu u međuspremnik"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:113
+msgid "_Scanner"
+msgstr "_Skener"
+
+#. Label beside scan side combo box
+#: src/preferences-dialog.ui:143
+msgid "Scan Sides"
+msgstr "Stranica skeniranja"
+
+#. Label beside page size combo box
+#: src/preferences-dialog.ui:160
+msgid "Page Size"
+msgstr "Veličina stranice"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:191
+msgid "Front"
+msgstr "Prednja"
+
+#. Preferences Dialog: Toggle button to select scanning on the back side of a page
+#: src/preferences-dialog.ui:206
+msgid "Back"
+msgstr "Stražnja"
+
+#. Preferences Dialog: Toggle button to select scanning on both sides of a page
+#: src/preferences-dialog.ui:221
+msgid "Both"
+msgstr "Obje"
+
+#. Label beside page delay scale
+#: src/preferences-dialog.ui:260
+msgid "Delay"
+msgstr "Odgoda"
+
+#. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
+#: src/preferences-dialog.ui:276
+msgid "Multiple pages from flatbed"
+msgstr "Višestruke stranice iz plošnog skenera"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:295
+msgid "3"
+msgstr "3"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:310
+msgid "5"
+msgstr "5"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:326
+msgid "7"
+msgstr "7"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:342
+msgid "10"
+msgstr "10"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:358
+msgid "15"
+msgstr "15"
+
+#. Label after page delay radio buttons
+#: src/preferences-dialog.ui:385
+msgid "Seconds"
+msgstr "Sekune"
+
+#. Preferences Dialog: Tab label for scanning settings
+#: src/preferences-dialog.ui:413
+msgid "Scanning"
+msgstr "Skeniranje"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:436
+msgid "_Text Resolution"
+msgstr "_Razlučivost teksta"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:452
+msgid "_Photo Resolution"
+msgstr "_Razlučivost slike"
+
+#. Label beside brightness scale
+#: src/preferences-dialog.ui:505
+msgid "Brightness"
+msgstr "Svjetlina"
+
+#. Label beside contrast scale
+#: src/preferences-dialog.ui:521
+msgid "Contrast"
+msgstr "Kontrast"
+
+#. Preferences Dialog: Tab for quality settings
+#: src/preferences-dialog.ui:576
+msgid "Quality"
+msgstr "Kvaliteta"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/preferences-dialog.vala:77
 msgid "Automatic"
 msgstr "Automatska"
 
-#: ../src/ui.vala:1947
+#: src/preferences-dialog.vala:116
 msgid "Darker"
 msgstr "Tamnije"
 
-#: ../src/ui.vala:1949
+#: src/preferences-dialog.vala:118
 msgid "Lighter"
 msgstr "Svjetlije"
 
-#: ../src/ui.vala:1957
+#: src/preferences-dialog.vala:126
 msgid "Less"
 msgstr "Manje"
 
-#: ../src/ui.vala:1959
+#: src/preferences-dialog.vala:128
 msgid "More"
 msgstr "Više"
 
-#: ../src/ui.vala:1967
-msgid "Minimum"
-msgstr "Najmanje"
-
-#: ../src/ui.vala:1969
-msgid "Maximum"
-msgstr "Najviše"
-
-#: ../src/ui.vala:2008
-msgid "Saving document..."
-msgstr "Spremanje dokumenta..."
-
-#: ../src/ui.vala:2173
+#. Preferences dialog: Label for default resolution in resolution list
+#: src/preferences-dialog.vala:440
 #, c-format
-msgid "Saving page %d out of %d"
-msgstr "Spremanje stranice %d od %d"
-
-#~ msgid "4&#xD7;6"
-#~ msgstr "4&#xD7;6"
+msgid "%d dpi (default)"
+msgstr "%d dpi (zadano)"
 
-#~ msgid "Device to scan from"
-#~ msgstr "Uređaj za skeniranje"
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: src/preferences-dialog.vala:443
+#, c-format
+msgid "%d dpi (draft)"
+msgstr "%d dpi (skica)"
 
-#~ msgid "Direction of scan"
-#~ msgstr "Smjer skeniranja"
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: src/preferences-dialog.vala:446
+#, c-format
+msgid "%d dpi (high resolution)"
+msgstr "%d dpi (visoka razlučivost)"
 
-#~ msgid ""
-#~ "The direction of the scanner across the scanned page. It can be one of the "
-#~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
-#~ msgstr ""
-#~ "Smjer skenera preko skeniranih stranica. Može biti: 's vrha na dno' 's dna "
-#~ "na vrh' 's lijeva na desno \",\" s desna na lijevo \""
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: src/preferences-dialog.vala:449
+#, c-format
+msgid "%d dpi"
+msgstr "%d dpi"
 
-#~ msgid "Height of scanned image in pixels"
-#~ msgstr "Visina skenirane slike u pikselima"
+#. Error displayed when no scanners to scan with
+#: src/scanner.vala:844
+msgid "No scanners available.  Please connect a scanner."
+msgstr "Nema dostupnih skenera. Molim spojite skener."
 
-#~ msgid "TRUE if the application window is maximized"
-#~ msgstr "ISTINA ako je prozor aplikacije maksimalan"
+#. Error displayed when cannot connect to scanner
+#: src/scanner.vala:874
+msgid "Unable to connect to scanner"
+msgstr "Nemoguće povezivanje sa skenerom"
 
-#~ msgid ""
-#~ "The height of scanned image in pixels. This value is updated to what the "
-#~ "last scanned page was."
-#~ msgstr ""
-#~ "Visina skenirane slike u pikselima. Ova vrijednost se ažurira na vrijednost "
-#~ "zadnje skenirane stranice."
+#. Error display when unable to start scan
+#: src/scanner.vala:1227
+msgid "Unable to start scan"
+msgstr "Nemoguće pokretanje skenera"
 
-#~ msgid "SANE device to acquire images from."
-#~ msgstr "SANE uređaj iz kojeg se dobiva slika."
+#. Error displayed when communication with scanner broken
+#: src/scanner.vala:1240 src/scanner.vala:1340
+msgid "Error communicating with scanner"
+msgstr "Greška pri komunikaciji sa skenerom"
 
-#~ msgid "Resolution of last scanned image"
-#~ msgstr "Rezolucija zadnje skenirane slike"
+#. Help string for command line --version flag
+#: src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "Prikaži inačicu izdanja"
 
-#~ msgid ""
-#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
-#~ msgstr ""
-#~ "Širina papira u desetinkama milimetra (ili 0 za automatsko prepoznavanje "
-#~ "papira)."
+#. Help string for command line --debug flag
+#: src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Ispiši poruke otklanjanja grešaka"
 
-#~ msgid "Width of paper in tenths of a mm"
-#~ msgstr "Širina papira u desetinkama milimetra"
+#: 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"
 
-#~ msgid "Height of paper in tenths of a mm"
-#~ msgstr "Visina papira u desetinkama milimetra"
+#. Title of error dialog when scan failed
+#: src/simple-scan.vala:392
+msgid "Failed to scan"
+msgstr "Neuspjelo skeniranje"
 
-#~ msgid ""
-#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
-#~ msgstr ""
-#~ "Visina papira u desetinkama milimetra (ili 0 za automatsko prepoznavanje "
-#~ "papira)."
+#. Attempt to inhibit the screensaver when scanning
+#: src/simple-scan.vala:407
+msgid "Scan in progress"
+msgstr "Skeniranje je u tijeku"
 
-#~ msgid "Type of document being scanned"
-#~ msgstr "Vrsta dokumenat koji se skenira"
+#. Arguments and description for --help text
+#: src/simple-scan.vala:584
+msgid "[DEVICE…] — Scanning utility"
+msgstr "[UREĐAJ…] — Pomagalo skeniranja"
 
-#~ msgid ""
-#~ "Type of document being scanned. 'text' for text documents, 'photo' for "
-#~ "photos. This setting decides on the scan resolution, colors and post-"
-#~ "processing."
-#~ msgstr ""
-#~ "Vrsta dokumenata koji se skenira. 'tekst' za tekstualne dokumente, 'slika' "
-#~ "za slike. Ova postavka odlučuje o rezoluciji skeniranja, boji i obradi nakon "
-#~ "skeniranja."
+#. Text printed out when an unknown command-line argument provided
+#: src/simple-scan.vala:595
+#, c-format
+msgid "Run “%s --help” to see a full list of available command line options."
+msgstr ""
+"Pokreni “%s --help” kako biste vidjeli potpuni popis mogućnosti naredbenog "
+"redka."
 
-#~ msgid "The resolution in dots-per-inch of the previously scanned image."
-#~ msgstr "Rezolucija u točkama po inču prethodno skenirane slike."
+#~ msgid "Saving document…"
+#~ msgstr "Spremanje dokumenta..."
 
-#~ msgid "Width of scanned image in pixels"
-#~ msgstr "Širina skenirane slike u pikselima"
+#~ msgid "Saving page %d out of %d"
+#~ msgstr "Spremanje stranice %d od %d"
 
-#~ msgid ""
-#~ "The width of scanned image in pixels. This value is updated to what the last "
-#~ "scanned page was."
-#~ msgstr ""
-#~ "Širina skenirane slike u pikselima. Ova vrijednost se ažurira na vrijednost "
-#~ "zadnje skenirane stranice."
+#~ msgid "Save As..."
+#~ msgstr "Spremi kao..."
 
-#~ msgid "Window width in pixels"
-#~ msgstr "Širina prozora u pikselima"
+#~ msgid "Crop"
+#~ msgstr "Izreži"
 
-#, c-format
-#~ msgid ""
-#~ "Help Options:\n"
-#~ "  -d, --debug                     Print debugging messages\n"
-#~ "  -v, --version                   Show release version\n"
-#~ "  -h, --help                      Show help options\n"
-#~ "  --help-all                      Show all help options\n"
-#~ "  --help-gtk                      Show GTK+ options"
-#~ msgstr ""
-#~ "Pomoćne opcije:\n"
-#~ "  -d, --debug Ispiši poruke za debuggiranje\n"
-#~ "  -v, --version Prikaži verziju programa\n"
-#~ "  -h, --help Prikaži pomoćne opcije\n"
-#~ "  --help-all Prikaži sve pomoćne opcije\n"
-#~ "  --help-gtk Prikaži GTK+ opcije"
+#~ msgid "New"
+#~ msgstr "Novo"
 
-#~ msgid "Window height in pixels"
-#~ msgstr "Visina prozora u pikselima"
+#~ msgid "Scan S_ource:"
+#~ msgstr "_Izvor skeniranja:"
 
-#, c-format
-#~ msgid ""
-#~ "Usage:\n"
-#~ "  %s [DEVICE...] - Scanning utility"
-#~ msgstr ""
-#~ "Upotreba:\n"
-#~ "  %s [UREĐAJ...] - Korist skeniranja"
+#~ msgid "Username and password required to access '%s'"
+#~ msgstr "Korisničko ime i lozinka su potrebni za pristup '%s'"
 
-#~ msgid "Scanned Document"
-#~ msgstr "Skenirani dokument"
+#~ msgid "If you don't save, changes will be permanently lost."
+#~ msgstr "Ako ne spremite, promjene će biti trajno izgubljene."
 
-#, c-format
-#~ msgid ""
-#~ "GTK+ Options:\n"
-#~ "  --class=CLASS                   Program class as used by the window "
-#~ "manager\n"
-#~ "  --name=NAME                     Program name as used by the window "
-#~ "manager\n"
-#~ "  --screen=SCREEN                 X screen to use\n"
-#~ "  --sync                          Make X calls synchronous\n"
-#~ "  --gtk-module=MODULES            Load additional GTK+ modules\n"
-#~ "  --g-fatal-warnings              Make all warnings fatal"
-#~ msgstr ""
-#~ "GTK+ Opcije:\n"
-#~ "  --class=CLASS Klasa programa koju koristi upravitelj prozora\n"
-#~ "  --name=NAME Ime programa koji koristi upravitelj prozora\n"
-#~ "  --screen=SCREEN X zaslon za korištenje\n"
-#~ "  --sync Učinite X pozive sinkroniziranima\n"
-#~ "  --gtk-module=MODULES Učitavanje dodatnih GTK+ modula\n"
-#~ "  -g-fatal-warnings Učinite sva upozorenja kobnima"
+#~ msgid "[DEVICE...] - Scanning utility"
+#~ msgstr "[UREĐAJ...] - Alat za skeniranje"
 
-#~ msgid "Files missing"
-#~ msgstr "Nedostaju datoteke"
+#~ msgid "Rotate Right"
+#~ msgstr "Zakreni udesno"
 
-#~ msgid ""
-#~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
-#~ msgstr "Strana lista za skeniranje. Može biti: 'obje' 'prednja' 'stražnja'"
+#~ msgid "Rotate Left"
+#~ msgstr "Zakreni lijevo"
 
 #~ msgid ""
-#~ "Type of document being scanned. This setting decides on the scan resolution, "
-#~ "colors and post-processing."
+#~ "Run '%s --help' to see a full list of available command line options."
 #~ msgstr ""
-#~ "Vrsta dokumenta koji se skenira. Ova postavka određuje razlučivost, boju i "
-#~ "naknadnu obradu."
-
-#~ msgid "The direction of the scanner across the scanned page."
-#~ msgstr "Smjer skenera preko skenirane stranice."
-
-#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
-#~ msgstr "Prilagodba kontrasta od -100 do 100 (0 za nepromijenjeno)."
+#~ "Pokrenite '%s --help'  kako biste vidjeli potpuni popis dostupnih "
+#~ "mogućnosti naredbenog retka."
 
-#~ msgid "Contrast of scan"
-#~ msgstr "Kontrast skeniranja"
+#~ msgid "Change _Scanner"
+#~ msgstr "Promijeni _skener"
 
-#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
-#~ msgstr "Prilagodba svjetline od -100 do 100 (0 za nepromijenjeno)."
+#~ msgid "Minimum"
+#~ msgstr "Najmanje"
 
-#~ msgid "Brightness of scan"
-#~ msgstr "Svjetlina skeniranja"
+#~ msgid "Maximum"
+#~ msgstr "Najviše"
 
-#~ msgid "Resolution for text scans"
-#~ msgstr "Razlučivost skeniranja teksta"
+#~ msgid "Saving document..."
+#~ msgstr "Spremanje dokumenta..."
 
-#~ msgid "The resolution in dots-per-inch to use when scanning text."
-#~ msgstr "Razlučivost u točkama po inču pri skeniranja teksta."
+#~ msgid "Front and Back"
+#~ msgstr "Prednja i stražnja"
 
-#~ msgid "The page side to scan."
-#~ msgstr "Stranica lista za skeniranje."
+#~ msgid "Email..."
+#~ msgstr "E-pošta..."
 
-#~ msgid "Quality value to use for JPEG compression."
-#~ msgstr "Vrijednost kvalitetete pri JPEG sažimanju."
+#~ msgid "Document"
+#~ msgstr "Dokument"
 
-#~ msgid "Page side to scan"
-#~ msgstr "Stranica lista za skeniranje"
+#~ msgid "New Document"
+#~ msgstr "Novi dokument"
 
-#~ msgid "Quality value to use for JPEG compression"
-#~ msgstr "Vrijednost kvalitetete pri JPEG sažimanju"
-
-#~ msgid "Resolution for photo scans"
-#~ msgstr "Razlučivost skeniranja fotografija"
-
-#~ msgid "The resolution in dots-per-inch to use when scanning photos."
-#~ msgstr "Razlučivost u točkama po inču pri skeniranju slika."
-
-#~ msgid ""
-#~ "The directory to save files to. Defaults to the documents directory if unset."
-#~ msgstr ""
-#~ "Direktorij za spremanje datoteka. Ako nije postavljeno, koristi se "
-#~ "direktorij dokumenata."
+#~ msgid "Print..."
+#~ msgstr "Ispiši…"
 
-#~ msgid "Directory to save files to"
-#~ msgstr "Direktorij za spremanje datoteka"
+#~ msgid "You need to install driver software for your scanner."
+#~ msgstr "Morate instalirati upravljački program za vaš skener."
 
-#~ msgid "Select File _Type"
-#~ msgstr "Odaberi _vrstu datoteke"
+#~ msgid "_Install Drivers"
+#~ msgstr "_Instaliraj upravljačke programe"
 
-#~ msgid "Please check your installation"
-#~ msgstr "Provjerite vašu instalaciju"
+#~ msgid "Installing drivers..."
+#~ msgstr "Instalacija upravljačkih programa..."
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..2a80984 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,518 +1,526 @@
 # Hungarian translation for simple-scan
 # Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
 # This file is distributed under the same license as the simple-scan package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
 #
+# Gabor Kelemen <kelemeng at ubuntu dot com>, 2017.
+# Balázs Úr <urbalazs at gmail dot com>, 2017.
 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-02-18 14:14+0000\n"
-"Last-Translator: Gabor Kelemen <kelemeng@openscope.org>\n"
-"Language-Team: Hungarian <hu@li.org>\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
+"product=simple-scan&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-08-13 21:51+0000\n"
+"PO-Revision-Date: 2017-09-05 17:53+0200\n"
+"Last-Translator: Balázs Úr <urbalazs@gmail.com>\n"
+"Language-Team: Hungarian <openscope at googlegroups dot com>\n"
+"Language: hu\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-25 06:10+0000\n"
+"X-Generator: Lokalize 1.2\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. Button to submit authorization dialog
-#: data/simple-scan.ui:24
-msgid "_Authorize"
-msgstr "_Felhatalmazás"
+#: data/org.gnome.SimpleScan.gschema.xml:11
+msgid "Device to scan from"
+msgstr "A szkennelő eszköz"
 
-#. Label beside username entry
-#: data/simple-scan.ui:102
-msgid "_Username for resource:"
-msgstr "_Felhasználónév az erőforráshoz:"
+#: data/org.gnome.SimpleScan.gschema.xml:12
+msgid "SANE device to acquire images from."
+msgstr "Képek beszerzése erről a SANE eszközről."
 
-#. Label beside password entry
-#: data/simple-scan.ui:117
-msgid "_Password:"
-msgstr "_Jelszó:"
+#: data/org.gnome.SimpleScan.gschema.xml:20
+msgid "Type of document being scanned"
+msgstr "A szkennelt dokumentum típusa"
+
+#: data/org.gnome.SimpleScan.gschema.xml:21
+msgid ""
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+msgstr ""
+"A szkennelt dokumentum típusa. Ez a beállítás meghatározza a beolvasott "
+"oldal felbontását, színeit és utófeldolgozását."
 
-#. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
-msgid "Front and Back"
-msgstr "Előlap és hátlap"
+#: data/org.gnome.SimpleScan.gschema.xml:25
+msgid "Width of paper in tenths of a mm"
+msgstr "Papír szélessége tizedmilliméterben"
 
-#. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
-msgid "Front"
-msgstr "Előlap"
+#: data/org.gnome.SimpleScan.gschema.xml:26
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"Papír szélessége tizedmilliméterben (0 az automatikus papírfelismeréshez)."
 
-#. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
-msgid "Back"
-msgstr "Hátlap"
+#: data/org.gnome.SimpleScan.gschema.xml:30
+msgid "Height of paper in tenths of a mm"
+msgstr "Papír magassága tizedmilliméterben"
+
+#: data/org.gnome.SimpleScan.gschema.xml:31
+msgid ""
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"Papír magassága tizedmilliméterben (0 az automatikus papírfelismeréshez)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:35
+msgid "Brightness of scan"
+msgstr "A beolvasás fényereje"
 
+#: data/org.gnome.SimpleScan.gschema.xml:36
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr "A fényerő változtatása -100-tól 100-ig (0=nincs)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:40
+msgid "Contrast of scan"
+msgstr "A beolvasás kontrasztja"
+
+#: data/org.gnome.SimpleScan.gschema.xml:41
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr "A kontraszt változtatása -100-tól 100-ig (0=nincs)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:45
+msgid "Resolution for text scans"
+msgstr "Szövegek szkennelésének felbontása"
+
+#: data/org.gnome.SimpleScan.gschema.xml:46
+msgid "The resolution in dots-per-inch to use when scanning text."
+msgstr "Szövegek szkennelésnél használandó  DPI felbontás."
+
+#: data/org.gnome.SimpleScan.gschema.xml:50
+msgid "Resolution for photo scans"
+msgstr "Fotók szkennelésének felbontása"
+
+#: data/org.gnome.SimpleScan.gschema.xml:51
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr "Fotók szkennelésnél használandó  DPI felbontás."
+
+#: data/org.gnome.SimpleScan.gschema.xml:55
+msgid "Page side to scan"
+msgstr "Lapok szkennelendő oldala"
+
+#: data/org.gnome.SimpleScan.gschema.xml:56
+msgid "The page side to scan."
+msgstr "A lap szkennelendő oldala."
+
+#: data/org.gnome.SimpleScan.gschema.xml:60
+msgid "Directory to save files to"
+msgstr "Fájlok mentése ebbe a könyvtárba"
+
+#: data/org.gnome.SimpleScan.gschema.xml:61
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+"A fájlok mentésének helye. Alapértelmezésben a Dokumentumok mappa, ha nincs "
+"beállítva."
+
+#: data/org.gnome.SimpleScan.gschema.xml:66
+msgid "Quality value to use for JPEG compression"
+msgstr "A minőségi tényező megadása a JPEG tömörítéshez"
+
+#: data/org.gnome.SimpleScan.gschema.xml:67
+msgid "Quality value to use for JPEG compression."
+msgstr "A minőségi tényező megadása a JPEG tömörítéshez."
+
+#: data/org.gnome.SimpleScan.gschema.xml:72
+msgid "Delay in millisecond between pages"
+msgstr "A lapok közti késleltetés ezredmásodpercben"
+
+#: data/org.gnome.SimpleScan.gschema.xml:73
+msgid "Delay in millisecond between pages."
+msgstr "A lapok közti késleltetés ezredmásodpercben."
+
+#. Title of scan window
+#. Set HeaderBar title here because Glade doesn't keep it translated
+#. https://bugzilla.gnome.org/show_bug.cgi?id=782753
 #. 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
+#: data/simple-scan.appdata.xml.in:6 data/simple-scan.desktop.in:3
+#: src/app-window.ui:76 src/app-window.vala:1560
 msgid "Simple Scan"
-msgstr "Simple Scan"
+msgstr "Szkenner"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
-msgid "_Document"
-msgstr "_Dokumentum"
+#: data/simple-scan.appdata.xml.in:7 data/simple-scan.desktop.in:5
+msgid "Scan Documents"
+msgstr "Dokumentumok szkennelése"
 
-#. Scan menu item
-#: data/simple-scan.ui:260
-msgid "Sc_an"
-msgstr "Sz_kennelés"
+#: 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 "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+"Igazán egyszerű megoldás dokumentumok és fényképek szkennelésére. Levághatja "
+"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:14
+msgid "Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+"A Szkenner a SANE keretrendszert használja a legtöbb létező szkenner "
+"támogatása érdekében."
+
+#: data/simple-scan.desktop.in:4
+msgid "Document Scanner"
+msgstr "Dokumentumbeolvasó"
 
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: data/simple-scan.desktop.in:7
+msgid "scan;scanner;flatbed;adf;"
+msgstr "szkennelés;szkenner;beolvasó;síkágyas;adf;"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: data/simple-scan.desktop.in:10
+msgid "scanner"
+msgstr "scanner"
+
+#. Toolbar scan menu item to scan a single page from the scanner
 #. 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/app-window.ui:22 src/app-window.ui:123 src/app-window.ui:820
 msgid "Single _Page"
 msgstr "Egy _oldal"
 
+#. Toolbar scan menu item to scan all pages from a document feeder
 #. 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/app-window.ui:31 src/app-window.ui:133 src/app-window.ui:829
 msgid "All Pages From _Feeder"
 msgstr "Minden oldal az _adagolóból"
 
-#. Menu entry to stop current scan
-#: data/simple-scan.ui:294
-msgid "_Stop Scan"
-msgstr "_Szkennelés megállítása"
+#. Toolbar scan menu item to scan continuously from the flatbed
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/app-window.ui:40 src/app-window.ui:143 src/app-window.ui:838
+msgid "_Multiple Pages From Flatbed"
+msgstr "_Több lap a síkágyról"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:853
 msgid "Text"
 msgstr "Szöveg"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:863
 msgid "Photo"
 msgstr "Fénykép"
 
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: src/app-window.ui:91
+msgid "_Document"
+msgstr "_Dokumentum"
+
+#. Scan menu item
+#: src/app-window.ui:110
+msgid "Sc_an"
+msgstr "Sz_kennelés"
+
+#. Menu entry to stop current scan
+#: src/app-window.ui:154
+msgid "_Stop Scan"
+msgstr "_Szkennelés megállítása"
+
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/app-window.ui:196 src/app-window.vala:967 src/app-window.vala:1590
 msgid "Reorder Pages"
 msgstr "Oldalak újrarendezése"
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/app-window.ui:215
 msgid "_Email"
 msgstr "_E-mail"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/app-window.ui:280
 msgid "_Page"
 msgstr "_Oldal"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/app-window.ui:290
 msgid "Rotate _Left"
 msgstr "Forgatás b_alra"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/app-window.ui:300
 msgid "Rotate _Right"
 msgstr "Forgatás _jobbra"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/app-window.ui:310
 msgid "_Crop"
 msgstr "_Vágás"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/app-window.ui:320
 msgid "_None"
 msgstr "_Nincs vágás"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/app-window.ui:331
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/app-window.ui:342
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/app-window.ui:353
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/app-window.ui:364
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/app-window.ui:375
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/app-window.ui:386
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/app-window.ui:397
 msgid "_Custom"
 msgstr "_Egyéni"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/app-window.ui:415
 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/app-window.ui:428
 msgid "Move Left"
 msgstr "Mozgatás balra"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/app-window.ui:437
 msgid "Move Right"
 msgstr "Mozgatás jobbra"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/app-window.ui:474
 msgid "_Help"
 msgstr "_Súgó"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/app-window.ui:482
 msgid "_Contents"
 msgstr "_Tartalom"
 
-#. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
-msgid "Start a new document"
-msgstr "Új dokumentum létrehozása"
-
-#: data/simple-scan.ui:675
-msgid "New"
-msgstr "Új"
-
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/app-window.ui:520 src/app-window.ui:720
 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/app-window.ui:522 src/app-window.ui:716
 msgid "Scan"
 msgstr "Szkennelés"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/app-window.ui:538 src/app-window.ui:787
 msgid "Save document to a file"
 msgstr "Dokumentum fájlba mentése"
 
-#: ../src/ui.vala:1842
+#: src/app-window.ui:540
 msgid "Save"
 msgstr "Mentés"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/app-window.ui:555 src/app-window.ui:700
 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/app-window.ui:556 src/app-window.ui:697
 msgid "Stop"
 msgstr "Leállít"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "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
-msgid "Rotate Left"
-msgstr "Forgatás balra"
-
-#. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
-msgid "Rotate the page to the right (clockwise)"
-msgstr "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
-msgid "Rotate Right"
-msgstr "Forgatás jobbra"
-
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
-msgid "Crop the selected page"
-msgstr "A kiválasztott oldal vágása"
-
-#: data/simple-scan.ui:781
-msgid "Crop"
-msgstr "Vágás"
-
-#: ../src/ui.vala:1849
-msgid "Preferences"
-msgstr "Beállítások"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1048
-msgid "Scan S_ource:"
-msgstr "Szkennelés _forrása:"
+#. Label shown when searching for scanners
+#: src/app-window.ui:611
+msgid "Searching for Scanners…"
+msgstr "Szkennerek keresése…"
 
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1079
-msgid "_Text Resolution:"
-msgstr "_Szöveg felbontása:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1095
-msgid "_Photo Resolution:"
-msgstr "_Fotó felbontása:"
-
-#. Label beside scan side combo box
-#: data/simple-scan.ui:1139
-msgid "Scan Side:"
-msgstr "Oldal szkennelése:"
-
-#. Label beside page size combo box
-#: data/simple-scan.ui:1169
-msgid "Page Size:"
-msgstr "Oldalméret:"
-
-#. Label beside brightness scale
-#: data/simple-scan.ui:1199
-msgid "Brightness:"
-msgstr "Fényerő:"
-
-#. Label beside contrast scale
-#: data/simple-scan.ui:1229
-msgid "Contrast:"
-msgstr "Kontraszt:"
-
-#. Label beside quality scale
-#: data/simple-scan.ui:1260
-msgid "Quality:"
-msgstr "Minőség:"
-
-#: data/simple-scan.desktop.in:4
-msgid "Document Scanner"
-msgstr "Dokumentumbeolvasó"
-
-#: data/simple-scan.desktop.in:5
-msgid "Scan Documents"
-msgstr "Dokumentumok szkennelése"
+#: src/app-window.vala:237 src/app-window.vala:1380
+msgid "_Close"
+msgstr "_Bezárás"
 
-#: data/simple-scan.desktop.in:6
-msgid "scan;scanner;flatbed;adf;"
-msgstr "szkennelés;szkenner;beolvasó;síkágyas;adf;"
+#. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
+#: src/app-window.vala:246
+#, 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"
 
-#: data/simple-scan.desktop.in:8
-msgid "scanner"
-msgstr ""
+#. Label shown when detected a scanner
+#: src/app-window.vala:266 src/app-window.vala:584
+msgid "Ready to Scan"
+msgstr "Szkennelésre kész"
 
-#: data/simple-scan.appdata.xml.in:8
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-"Igazán egyszerű megoldás dokumentumok és fényképek szkennelésére. Levághatja "
-"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."
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: src/app-window.vala:273
+msgid "Additional software needed"
+msgstr "További szoftverek szükségesek"
 
-#: data/simple-scan.appdata.xml.in:13
+#. Instructions to install driver software
+#: src/app-window.vala:275
 msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
-"A Simple Scan a SANE keretrendszert használja a legtöbb létező szkenner "
-"támogatása érdekében."
-
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
-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
-msgid "Unable to connect to scanner"
-msgstr "Nem sikerült csatlakozni a szkennerhez"
-
-#. Error display when unable to start scan
-#: ../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
-msgid "Error communicating with scanner"
-msgstr "Kommunikációs hiba a szkennerrel"
-
-#. Help string for command line --version flag
-#: ../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
-msgid "Print debugging messages"
-msgstr "Hibakeresési üzenetek kiírása"
-
-#: ../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
-msgid "Failed to scan"
-msgstr "A szkennelés meghiúsult"
-
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
-msgid "[DEVICE...] - Scanning utility"
-msgstr "[ESZKÖZ…] – Szkennelő segédprogram"
-
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
-#, c-format
-msgid "Run '%s --help' to see a full list of available command line options."
+"You need to <a href=\"install-firmware\">install driver software</a> for "
+"your scanner."
 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
-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
-#, 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"
+"A szkennerhez <a href=\"install-firmware\">illesztőprogramot kell "
+"telepíteni</a>."
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/app-window.vala:281
 msgid "No scanners detected"
 msgstr "Nem található szkenner"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/app-window.vala:283
 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
-msgid "Additional software needed"
-msgstr "További szoftverek szükségesek"
-
-#. Instructions to install driver software
-#: ../src/ui.vala:384
-msgid "You need to install driver software for your scanner."
-msgstr "A szkennerhez illesztőprogramot kell telepíteni."
+msgstr "Ellenőrizze, hogy a szkenner csatlakoztatva van, és be van-e kapcsolva"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
-msgid "Save As..."
+#: src/app-window.vala:298
+msgid "Save As…"
 msgstr "Mentés másként…"
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/app-window.vala:301 src/app-window.vala:471 src/app-window.vala:552
 msgid "_Cancel"
 msgstr "_Mégse"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/app-window.vala:302 src/app-window.vala:553
 msgid "_Save"
 msgstr "_Mentés"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/app-window.vala:310
 msgid "Scanned Document.pdf"
 msgstr "Szkennelt dokumentum.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#. Save dialog: Filter name to show only supported image files
+#: src/app-window.vala:316
 msgid "Image Files"
 msgstr "Képfájlok"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/app-window.vala:326
 msgid "All Files"
 msgstr "Minden fájl"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/app-window.vala:335
 msgid "PDF (multi-page document)"
 msgstr "PDF (többoldalas dokumentum)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/app-window.vala:341
 msgid "JPEG (compressed)"
 msgstr "JPEG (tömörített)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/app-window.vala:347
 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
+#. Save dialog: Label for sabing in WEBP format
+#: src/app-window.vala:354
+msgid "WebP (compressed)"
+msgstr "WebP (tömörített)"
+
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
+#: src/app-window.vala:364
 msgid "File format:"
 msgstr "Fájlformátum:"
 
+#. Label in save dialog beside compression slider
+#: src/app-window.vala:376
+msgid "Compression:"
+msgstr "Tömörítés:"
+
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/app-window.vala:470
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr "Már létezik „%s” nevű fájl. Le akarja cserélni?"
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/app-window.vala:473
+msgid "_Replace"
+msgstr "_Csere"
+
+#: src/app-window.vala:512
+msgid "Saving"
+msgstr "Mentés"
+
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/app-window.vala:527
 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
-msgid "If you don't save, changes will be permanently lost."
+#: src/app-window.vala:550
+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/app-window.vala:591
 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/app-window.vala:593
 msgid "Discard Changes"
 msgstr "Módosítások eldobása"
 
+#. Label shown when scan started
+#: src/app-window.vala:692
+msgid "Contacting scanner…"
+msgstr "Kapcsolatfelvétel a szkennerrel…"
+
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/app-window.vala:800
 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/app-window.vala:812
 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/app-window.vala:990
 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/app-window.vala:1000
 msgid "Combine sides (reverse)"
 msgstr "Oldalak egyesítése (fordított)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/app-window.vala:1010
 msgid "Reverse"
 msgstr "Fordított"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/app-window.vala:1020
 msgid "Keep unchanged"
 msgstr "Maradjon változatlan"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/app-window.vala:1250
 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/app-window.vala:1271
 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,18 +548,20 @@ msgstr ""
 "meg, itt elolvashatja: <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/app-window.vala:1274
 msgid "About Simple Scan"
-msgstr "Simple Scan névjegye"
+msgstr "Szkenner névjegye"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/app-window.vala:1277
 msgid "Simple document scanning tool"
 msgstr "Egyszerű dokumentumszkennelés"
 
-#: ../src/ui.vala:1487
+#: src/app-window.vala:1286
 msgid "translator-credits"
 msgstr ""
+"Meskó Balázs <meskobalazs at fedoraproject dot org>\n"
+"\n"
 "Launchpad Contributions:\n"
 "  Gabor Kelemen https://launchpad.net/~kelemeng\n"
 "  Muszela Balázs https://launchpad.net/~bazsi86-deactivatedaccount\n"
@@ -566,400 +576,463 @@ 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/app-window.vala:1308
 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
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:1310
 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/app-window.vala:1357
 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/app-window.vala:1359
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.brother.com\">Brother website</a>."
+"Drivers for this are available on the <a href=\"http://support.brother.com"
+"\">Brother website</a>."
 msgstr ""
 "Ehhez a <a href=\"http://support.brother.com\">Brother weboldaláról</a> "
 "érhetők el illesztőprogramok."
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/app-window.vala:1363
 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/app-window.vala:1365
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://samsung.com/support\">Samsung website</a>."
+"Drivers for this are available on the <a href=\"http://samsung.com/support"
+"\">Samsung website</a>."
 msgstr ""
 "Ehhez a <a href=\"http://samsung.com/support\">Samsung weboldaláról</a> "
 "érhetők el illesztőprogramok."
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/app-window.vala:1369
 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/app-window.vala:1374
 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/app-window.vala:1376
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.epson.com\">Epson website</a>."
+"Drivers for this are available on the <a href=\"http://support.epson.com"
+"\">Epson website</a>."
 msgstr ""
 "Ehhez az <a href=\"http://support.epson.com\">Epson weboldaláról</a> érhetők "
 "el illesztőprogramok."
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/app-window.vala:1380
 msgid "Install drivers"
 msgstr "Illesztőprogramok telepítése"
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/app-window.vala:1411
 msgid "Once installed you will need to restart Simple Scan."
-msgstr "A telepítés után újra kell indítania a Simple Scant."
+msgstr "A telepítés után újra kell indítania a Szkennert."
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
-msgid "Installing drivers..."
+#: src/app-window.vala:1423
+msgid "Installing drivers…"
 msgstr "Illesztőprogramok telepítése…"
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/app-window.vala:1431
 msgid "Drivers installed successfully!"
-msgstr "Az illesztőprogramok sikeresen telepítve"
+msgstr "Az illesztőprogramok sikeresen telepítve!"
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/app-window.vala:1441
 #, 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/app-window.vala:1447
 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/app-window.vala:1454
 #, c-format
-msgid "You need to install the %s package(s)."
-msgstr "Telepíteni kell a következő csomagokat: %s."
+msgid "You need to install the %s package."
+msgid_plural "You need to install the %s packages."
+msgstr[0] "Telepíteni kell a következő csomagot: %s."
+msgstr[1] "Telepíteni kell a következő csomagokat: %s."
+
+#. Title of preferences dialog
+#: src/app-window.vala:1568 src/app-window.vala:1591
+#: src/preferences-dialog.ui:53
+msgid "Preferences"
+msgstr "Beállítások"
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
-#, c-format
-msgid "%d dpi (default)"
-msgstr "%d dpi (alapértelmezett)"
+#: src/app-window.vala:1572
+msgid "Keyboard Shortcuts"
+msgstr "Gyorsbillentyűk"
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
-#, c-format
-msgid "%d dpi (draft)"
-msgstr "%d dpi (vázlat)"
+#: src/app-window.vala:1573
+msgid "Help"
+msgstr "Súgó"
 
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
-#, c-format
-msgid "%d dpi (high resolution)"
-msgstr "%d dpi (nagy felbontás)"
+#: src/app-window.vala:1574
+msgid "About"
+msgstr "Névjegy"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/app-window.vala:1575
+msgid "Quit"
+msgstr "Kilépés"
+
+#: src/app-window.vala:1589
+msgid "Email"
+msgstr "Küldés e-mailben"
+
+#. Populate ActionBar (not supported in Glade)
+#. https://bugzilla.gnome.org/show_bug.cgi?id=769966
+#. Label on new document button
+#: src/app-window.vala:1599
+msgid "Start Again…"
+msgstr "Újrakezdés…"
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: src/app-window.vala:1616
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Az oldal elforgatása balra (az óra járásával ellentétesen)"
+
+#. Tooltip for rotate right (clockwise) button
+#: src/app-window.vala:1623
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Az oldal elforgatása jobbra (az óra járásával egyezően)"
+
+#. Tooltip for crop button
+#: src/app-window.vala:1633
+msgid "Crop the selected page"
+msgstr "A kiválasztott oldal vágása"
+
+#. Tooltip for delete button
+#: src/app-window.vala:1649
+msgid "Delete the selected page"
+msgstr "A kiválasztott oldal törlése"
+
+#. Text of button for cancelling save
+#: src/app-window.vala:1814
+msgid "Cancel"
+msgstr "Mégse"
+
+#. Button to submit authorization dialog
+#: src/authorize-dialog.ui:25
+msgid "_Authorize"
+msgstr "_Felhatalmazás"
+
+#. Label beside username entry
+#: src/authorize-dialog.ui:99
+msgid "_Username for resource:"
+msgstr "_Felhasználónév az erőforráshoz:"
+
+#. Label beside password entry
+#: src/authorize-dialog.ui:112
+msgid "_Password:"
+msgstr "_Jelszó:"
+
+#: src/book.vala:331 src/book.vala:337
 #, c-format
-msgid "%d dpi"
-msgstr "%d dpi"
+msgid "Unable to encode page %i"
+msgstr "A(z) %i. lap nem kódolható"
 
-#: ../src/ui.vala:1835
-msgid "New Document"
-msgstr "Új dokumentum"
+#: src/help-overlay.ui:12
+msgctxt "shortcut window"
+msgid "Scanning"
+msgstr "Szkennelés"
 
-#: ../src/ui.vala:1840
-msgid "Document"
-msgstr "Dokumentum"
+#: src/help-overlay.ui:17
+msgctxt "shortcut window"
+msgid "Scan a single page"
+msgstr "Egy oldal szkennelése"
+
+#: src/help-overlay.ui:24
+msgctxt "shortcut window"
+msgid "Scan all pages from document feeder"
+msgstr "Minden oldal szkennelése az adagolóból"
+
+#: src/help-overlay.ui:31
+msgctxt "shortcut window"
+msgid "Scan continuously from a flatbed scanner"
+msgstr "Folyamatos szkennelés síkágyas szkennerről"
+
+#: src/help-overlay.ui:38
+msgctxt "shortcut window"
+msgid "Stop scan in progress"
+msgstr "Folyamatban lévő szkennelés leállítása"
+
+#: src/help-overlay.ui:46
+msgctxt "shortcut window"
+msgid "Document Modification"
+msgstr "Dokumentum módosítás"
+
+#: src/help-overlay.ui:51
+msgctxt "shortcut window"
+msgid "Move page left"
+msgstr "Lap mozgatása balra"
+
+#: src/help-overlay.ui:58
+msgctxt "shortcut window"
+msgid "Move page right"
+msgstr "Lap mozgatása jobbra"
+
+#: src/help-overlay.ui:65
+msgctxt "shortcut window"
+msgid "Rotate page to the left (anti-clockwise)"
+msgstr "Az oldal elforgatása balra (az óra járásával ellentétesen)"
 
-#: ../src/ui.vala:1844
-msgid "Email..."
-msgstr "E-mail…"
+#: src/help-overlay.ui:72
+msgctxt "shortcut window"
+msgid "Rotate page to the right (clockwise)"
+msgstr "Az oldal elforgatása jobbra (az óra járásával egyezően)"
 
-#: ../src/ui.vala:1845
-msgid "Print..."
-msgstr "Nyomtatás…"
+#: src/help-overlay.ui:79
+msgctxt "shortcut window"
+msgid "Delete page"
+msgstr "Lap törlése"
 
-#: ../src/ui.vala:1853
-msgid "Help"
-msgstr "Súgó"
+#: src/help-overlay.ui:87
+msgctxt "shortcut window"
+msgid "Document Management"
+msgstr "Dokumentumkezelés"
 
-#: ../src/ui.vala:1854
-msgid "About"
-msgstr "Névjegy"
+#: src/help-overlay.ui:92
+msgctxt "shortcut window"
+msgid "Start new document"
+msgstr "Új dokumentum létrehozása"
 
-#: ../src/ui.vala:1855
-msgid "Quit"
-msgstr "Kilépés"
+#: src/help-overlay.ui:99
+msgctxt "shortcut window"
+msgid "Save scanned document"
+msgstr "Beszkennelt dokumentum mentése"
+
+#: src/help-overlay.ui:106
+msgctxt "shortcut window"
+msgid "Email scanned document"
+msgstr "Beszkennelt dokumentum küldése e-mailben"
+
+#: src/help-overlay.ui:113
+msgctxt "shortcut window"
+msgid "Print scanned document"
+msgstr "Beszkennelt dokumentum nyomtatása"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
-msgid "Change _Scanner"
-msgstr "_Szkennerváltás"
+#: src/help-overlay.ui:120
+msgctxt "shortcut window"
+msgid "Copy current page to clipboard"
+msgstr "Jelenlegi lap másolása a vágólapra"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
-msgid "_Install Drivers"
-msgstr "_Illesztőprogramok telepítése"
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:113
+msgid "_Scanner"
+msgstr "Szk_enner"
+
+#. Label beside scan side combo box
+#: src/preferences-dialog.ui:143
+msgid "Scan Sides"
+msgstr "Szélek szkennelése"
+
+#. Label beside page size combo box
+#: src/preferences-dialog.ui:160
+msgid "Page Size"
+msgstr "Oldalméret"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:191
+msgid "Front"
+msgstr "Előlap"
+
+#. Preferences Dialog: Toggle button to select scanning on the back side of a page
+#: src/preferences-dialog.ui:206
+msgid "Back"
+msgstr "Hátlap"
+
+#. Preferences Dialog: Toggle button to select scanning on both sides of a page
+#: src/preferences-dialog.ui:221
+msgid "Both"
+msgstr "Mindkettő"
+
+#. Label beside page delay scale
+#: src/preferences-dialog.ui:260
+msgid "Delay"
+msgstr "Késleltetés"
+
+#. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
+#: src/preferences-dialog.ui:276
+#| msgid "Multiple page from flatbed"
+msgid "Multiple pages from flatbed"
+msgstr "Több lap a síkágyról"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:295
+msgid "3"
+msgstr "3"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:310
+msgid "5"
+msgstr "5"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:326
+msgid "7"
+msgstr "7"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:342
+msgid "10"
+msgstr "10"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:358
+msgid "15"
+msgstr "15"
+
+#. Label after page delay radio buttons
+#: src/preferences-dialog.ui:385
+msgid "Seconds"
+msgstr "másodperc"
+
+#. Preferences Dialog: Tab label for scanning settings
+#: src/preferences-dialog.ui:413
+msgid "Scanning"
+msgstr "Szkennelés"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:436
+msgid "_Text Resolution"
+msgstr "Szöveg _felbontása"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:452
+msgid "_Photo Resolution"
+msgstr "_Fotó felbontása"
+
+#. Label beside brightness scale
+#: src/preferences-dialog.ui:505
+msgid "Brightness"
+msgstr "Fényerő"
+
+#. Label beside contrast scale
+#: src/preferences-dialog.ui:521
+msgid "Contrast"
+msgstr "Kontraszt"
+
+#. Preferences Dialog: Tab for quality settings
+#: src/preferences-dialog.ui:576
+msgid "Quality"
+msgstr "Minőség"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/preferences-dialog.vala:77
 msgid "Automatic"
 msgstr "Automatikus"
 
-#: ../src/ui.vala:1947
+#: src/preferences-dialog.vala:116
 msgid "Darker"
 msgstr "Sötétebb"
 
-#: ../src/ui.vala:1949
+#: src/preferences-dialog.vala:118
 msgid "Lighter"
 msgstr "Világosabb"
 
-#: ../src/ui.vala:1957
+#: src/preferences-dialog.vala:126
 msgid "Less"
 msgstr "Kevesebb"
 
-#: ../src/ui.vala:1959
+#: src/preferences-dialog.vala:128
 msgid "More"
 msgstr "Több"
 
-#: ../src/ui.vala:1967
-msgid "Minimum"
-msgstr "Minimum"
+#. Preferences dialog: Label for default resolution in resolution list
+#: src/preferences-dialog.vala:440
+#, c-format
+msgid "%d dpi (default)"
+msgstr "%d dpi (alapértelmezett)"
 
-#: ../src/ui.vala:1969
-msgid "Maximum"
-msgstr "Maximum"
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: src/preferences-dialog.vala:443
+#, c-format
+msgid "%d dpi (draft)"
+msgstr "%d dpi (vázlat)"
 
-#: ../src/ui.vala:2008
-msgid "Saving document..."
-msgstr "Dokumentum mentése..."
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: src/preferences-dialog.vala:446
+#, c-format
+msgid "%d dpi (high resolution)"
+msgstr "%d dpi (nagy felbontás)"
 
-#: ../src/ui.vala:2173
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: src/preferences-dialog.vala:449
 #, c-format
-msgid "Saving page %d out of %d"
-msgstr "%d. oldal mentése, összesen %d"
+msgid "%d dpi"
+msgstr "%d dpi"
 
-#~ msgid "4&#xD7;6"
-#~ msgstr "4&#xD7;6"
+#. Error displayed when no scanners to scan with
+#: src/scanner.vala:844
+msgid "No scanners available.  Please connect a scanner."
+msgstr "Nem található szkenner. Csatlakoztasson egyet."
 
-#~ msgid "Files missing"
-#~ msgstr "Hiányzó fájl"
+#. Error displayed when cannot connect to scanner
+#: src/scanner.vala:874
+msgid "Unable to connect to scanner"
+msgstr "Nem sikerült csatlakozni a szkennerhez"
 
-#, c-format
-#~ msgid ""
-#~ "Usage:\n"
-#~ "  %s [DEVICE...] - Scanning utility"
-#~ msgstr ""
-#~ "Használat:\n"
-#~ "  %s [ESZKÖZ...] - Szkennelő segédprogram"
+#. Error display when unable to start scan
+#: src/scanner.vala:1227
+msgid "Unable to start scan"
+msgstr "Nem sikerült elindítani a szkennelést"
 
-#~ msgid "Please check your installation"
-#~ msgstr "Ellenőrizze a telepítést"
+#. Error displayed when communication with scanner broken
+#: src/scanner.vala:1240 src/scanner.vala:1340
+msgid "Error communicating with scanner"
+msgstr "Kommunikációs hiba a szkennerrel"
 
-#, c-format
-#~ msgid ""
-#~ "GTK+ Options:\n"
-#~ "  --class=CLASS                   Program class as used by the window "
-#~ "manager\n"
-#~ "  --name=NAME                     Program name as used by the window "
-#~ "manager\n"
-#~ "  --screen=SCREEN                 X screen to use\n"
-#~ "  --sync                          Make X calls synchronous\n"
-#~ "  --gtk-module=MODULES            Load additional GTK+ modules\n"
-#~ "  --g-fatal-warnings              Make all warnings fatal"
-#~ msgstr ""
-#~ "GTK+ beállításai\n"
-#~ "  --class=OSZTÁLY                 A program osztálya, ahogy az ablakkezelő "
-#~ "használja\n"
-#~ "  --name=NÉV                      A programnév, ahogy az ablakkezelő "
-#~ "használja\n"
-#~ "  --display=MEGJELENÍTŐ           Használandó X-megjelenítő\n"
-#~ "  --screen=KÉPERNYŐ               Használandó X-képernyő\n"
-#~ "  --sync                          Legyenek szinkron X-hívások\n"
-#~ "  --gtk-module=MODULOK            További GTK+ modulok betöltése\n"
-#~ "  --g-fatal-warnings              Minden figyelmeztetés végzetes legyen"
-
-#~ msgid "Device to scan from"
-#~ msgstr "A szkennelő eszkőz"
-
-#~ msgid "Direction of scan"
-#~ msgstr "A szkennelés íránya"
-
-#~ msgid "Type of document being scanned"
-#~ msgstr "A szkennelt dokumentum típusa"
-
-#~ msgid "TRUE if the application window is maximized"
-#~ msgstr "Igaz, ha az alkalmazás teljes képernyős módban van"
-
-#~ msgid "SANE device to acquire images from."
-#~ msgstr "Képek beszerzése erről a SANE eszközről"
-
-#~ msgid ""
-#~ "The direction of the scanner across the scanned page. It can be one of the "
-#~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
-#~ msgstr ""
-#~ "A szkennelés iránya, a lehetséges értékek a következők: „top-to-bottom” "
-#~ "(fentről lefelé), „bottom-to-top” (lentről felfelé)  „left-to-right” (balról "
-#~ "jobbra), „right-to-left” (jobbról balra)"
-
-#~ msgid ""
-#~ "Type of document being scanned. 'text' for text documents, 'photo' for "
-#~ "photos. This setting decides on the scan resolution, colors and post-"
-#~ "processing."
-#~ msgstr ""
-#~ "A szkennelt dokumentum típusa. „text” a szöveges dokumentumokhoz, „photo” a "
-#~ "fotókhoz. Ez a beállítás határozza meg a szkennelt dokumentum felbontását, "
-#~ "színeit és utófeldolgozását."
-
-#~ msgid "Window height in pixels"
-#~ msgstr "Ablak magassága képpontban"
-
-#~ msgid "Window width in pixels"
-#~ msgstr "Ablak szélessége képpontban"
+#. Help string for command line --version flag
+#: src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "Verziószám megjelenítése"
 
-#, c-format
-#~ msgid ""
-#~ "Help Options:\n"
-#~ "  -d, --debug                     Print debugging messages\n"
-#~ "  -v, --version                   Show release version\n"
-#~ "  -h, --help                      Show help options\n"
-#~ "  --help-all                      Show all help options\n"
-#~ "  --help-gtk                      Show GTK+ options"
-#~ msgstr ""
-#~ "Súgókapcsolók:\n"
-#~ "  -d, --debug Hibakeresési üzenetek megjelenítése\n"
-#~ "  -v, --version Verziószám megjelenítése\n"
-#~ "  -h,  --help Súgókapcsolók megjelenítése\n"
-#~ "  -help-all Minden súgókapcsoló megjelenítése\n"
-#~ "  --help-gtk GTK+ kapcsolók megjelenítése"
-
-#~ msgid "Height of scanned image in pixels"
-#~ msgstr "A szkennelt kép magassága képpontban"
-
-#~ msgid ""
-#~ "The width of scanned image in pixels. This value is updated to what the last "
-#~ "scanned page was."
-#~ msgstr ""
-#~ "A szkennelt kép szélessége képpontban. Mindig a legutolsó szkennelés "
-#~ "eredményét veszi fel."
-
-#~ msgid ""
-#~ "The height of scanned image in pixels. This value is updated to what the "
-#~ "last scanned page was."
-#~ msgstr ""
-#~ "A szkennelt kép magassága képpontban. Mindig a legutolsó szkennelés "
-#~ "eredményét veszi fel."
-
-#~ msgid "Width of scanned image in pixels"
-#~ msgstr "A szkennelt kép szélessége képpontban"
-
-#~ msgid "Resolution for text scans"
-#~ msgstr "Szövegek szkennelésének felbontása"
-
-#~ msgid "Resolution for photo scans"
-#~ msgstr "Fotók szkennelésének felbontása"
-
-#~ msgid "The resolution in dots-per-inch of the previously scanned image."
-#~ msgstr "Az utoljára beszkennelt kép DPI felbontása."
-
-#~ msgid "Resolution of last scanned image"
-#~ msgstr "Az utoljára beszkennelt kép felbontása"
-
-#~ msgid "Scanned Document"
-#~ msgstr "Beszkennelt dokumentum"
-
-#~ msgid "Select File _Type"
-#~ msgstr "Válasszon fájl_típust"
-
-#~ msgid "The resolution in dots-per-inch to use when scanning text."
-#~ msgstr "Szövegek szkennelésnél használandó  DPI felbontás."
-
-#~ msgid "The resolution in dots-per-inch to use when scanning photos."
-#~ msgstr "Fotók szkennelésnél használandó  DPI felbontás."
-
-#~ msgid "Directory to save files to"
-#~ msgstr "Fájlok mentése ebbe a könyvtárba"
-
-#~ msgid ""
-#~ "The directory to save files to. Defaults to the documents directory if unset."
-#~ msgstr ""
-#~ "A fájlok mentésének helye. Alapértelmezésben a Dokumentumok mappa, ha nincs "
-#~ "beállítva."
-
-#~ msgid "Height of paper in tenths of a mm"
-#~ msgstr "Papír magassága tizedmilliméterben"
-
-#~ msgid "Width of paper in tenths of a mm"
-#~ msgstr "Papír szélessége tizedmilliméterben"
-
-#~ msgid ""
-#~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
-#~ msgstr ""
-#~ "Lapok szkennelendő oldala. A lehetséges értékek: „both” (mindkettő) „front” "
-#~ "(előlap), „back” (hátlap)"
-
-#~ msgid "Page side to scan"
-#~ msgstr "Lapok szkennelendő oldala"
-
-#~ msgid ""
-#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
-#~ msgstr ""
-#~ "Papír magassága tizedmilliméterben (0 az automatikus papírfelismeréshez)."
-
-#~ msgid ""
-#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
-#~ msgstr ""
-#~ "Papír szélessége tizedmilliméterben (0 az automatikus papírfelismeréshez)."
-
-#~ msgid "The page side to scan."
-#~ msgstr "A lap szkennelendő oldala."
-
-#~ msgid ""
-#~ "Type of document being scanned. This setting decides on the scan resolution, "
-#~ "colors and post-processing."
-#~ msgstr ""
-#~ "A szkennelt dokumentum típusa. Ez a beállítás meghatározza a beolvasott "
-#~ "oldal felbontását, színeit és utófeldolgozását."
-
-#~ msgid "The direction of the scanner across the scanned page."
-#~ msgstr "A szkennelés iránya a szkennelt lap fölött."
+#. Help string for command line --debug flag
+#: src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Hibakeresési üzenetek kiírása"
 
-#~ msgid "Quality value to use for JPEG compression."
-#~ msgstr "A minőségi tényező megadása a JPEG tömörítéshez."
+#: src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+msgstr "A Szkenner régebbi verzióival készült PDF fájlok javítása"
 
-#~ msgid "Contrast of scan"
-#~ msgstr "A beolvasás kontrasztja"
+#. Title of error dialog when scan failed
+#: src/simple-scan.vala:392
+msgid "Failed to scan"
+msgstr "A szkennelés meghiúsult"
 
-#~ msgid "Quality value to use for JPEG compression"
-#~ msgstr "A minőségi tényező megadása a JPEG tömörítéshez"
+#. Attempt to inhibit the screensaver when scanning
+#: src/simple-scan.vala:407
+msgid "Scan in progress"
+msgstr "Szkennelés folyamatban"
 
-#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
-#~ msgstr "A kontraszt változtatása -100-tól 100-ig (0=nincs)."
+#. Arguments and description for --help text
+#: src/simple-scan.vala:584
+msgid "[DEVICE…] — Scanning utility"
+msgstr "[ESZKÖZ…] – Szkennelő segédprogram"
 
-#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
-#~ msgstr "A fényerő változtatása -100-tól 100-ig (0=nincs)."
+#. Text printed out when an unknown command-line argument provided
+#: src/simple-scan.vala:595
+#, 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."
 
-#~ msgid "Brightness of scan"
-#~ msgstr "A beolvasás fényereje"
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..9e28bce 100644
--- a/po/hy.po
+++ b/po/hy.po
@@ -7,296 +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"
+"POT-Creation-Date: 2017-04-16 08:54-0400\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"
+"Language: hy\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-25 06:09+0000\n"
+"X-Generator: Launchpad (build 18361)\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
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: 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 "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:498
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:509
 msgid "A_6"
 msgstr "A_6"
 
 #. 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 ""
 
-#: ../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 ""
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: 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 ""
 
@@ -308,7 +322,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 +330,207 @@ 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:844
 msgid "No scanners available.  Please connect a scanner."
 msgstr ""
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:874
 msgid "Unable to connect to scanner"
 msgstr ""
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1227
 msgid "Unable to start scan"
 msgstr ""
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: 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
+#: 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:332 src/ui.vala:1655 src/ui.vala:1935
 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:341
 #, 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:389
 msgid "No scanners detected"
 msgstr ""
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:391
 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:396
 msgid "Additional software needed"
 msgstr ""
 
 #. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:398
 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: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 ""
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:522
 msgid "Scanned Document.pdf"
 msgstr ""
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:528
 msgid "Image Files"
 msgstr ""
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:534
 msgid "All Files"
 msgstr ""
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:543
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:549
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:555
 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: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:650
+#: src/ui.vala:698
 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:721
 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:763
 msgid "Save current document?"
 msgstr ""
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:765
 msgid "Discard Changes"
 msgstr ""
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:1056
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1068
 msgid "Unable to open image preview application"
 msgstr ""
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1270
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1280
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1290
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1300
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1504
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: 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"
@@ -522,205 +547,205 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1528
 msgid "About Simple Scan"
 msgstr ""
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1531
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1540
 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:1562
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1564
 msgid "Quit without Saving"
 msgstr ""
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1632
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1634
 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:1638
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1640
 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:1644
 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:1649
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1651
 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:1655
 msgid "Install drivers"
 msgstr ""
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1686
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1698
 msgid "Installing drivers..."
 msgstr ""
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1706
 msgid "Drivers installed successfully!"
 msgstr ""
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1716
 #, 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:1722
 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:1729
 #, 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:1833
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1836
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1839
 #, 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: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 ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1937
 msgid "Change _Scanner"
 msgstr ""
 
 #. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1939
 msgid "_Install Drivers"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: 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/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..216b76c 100644
--- a/po/id.po
+++ b/po/id.po
@@ -1,517 +1,526 @@
 # Indonesian translation for simple-scan
 # Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
 # This file is distributed under the same license as the simple-scan package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+# Andika Triwidada <andika@gmail.com>, 2017
+# Kukuh Syafaat <syafaatkukuh@gmail.com>, 2017
 #
 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"
+"Project-Id-Version: simple-scan master\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
+"product=simple-scan&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-08-07 02:27+0000\n"
+"PO-Revision-Date: 2017-08-09 15:17+0700\n"
+"Last-Translator: Kukuh Syafaat <syafaatkukuh@gmail.com>\n"
 "Language-Team: Indonesian <id@li.org>\n"
+"Language: id\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-25 06:10+0000\n"
+"X-Generator: Poedit 2.0.3\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#. Button to submit authorization dialog
-#: data/simple-scan.ui:24
-msgid "_Authorize"
-msgstr "Otoris_asikan"
+#: data/org.gnome.SimpleScan.gschema.xml:11
+msgid "Device to scan from"
+msgstr "Perangkat untuk memindai"
 
-#. Label beside username entry
-#: data/simple-scan.ui:102
-msgid "_Username for resource:"
-msgstr "Nama pengg_una untuk sumber daya:"
+#: data/org.gnome.SimpleScan.gschema.xml:12
+msgid "SANE device to acquire images from."
+msgstr "Perangkat SANE yang dipakai untuk mengambil gambar."
 
-#. Label beside password entry
-#: data/simple-scan.ui:117
-msgid "_Password:"
-msgstr "_Sandi:"
+#: data/org.gnome.SimpleScan.gschema.xml:20
+msgid "Type of document being scanned"
+msgstr "Tipe dokumen yang akan dipindai"
+
+#: data/org.gnome.SimpleScan.gschema.xml:21
+msgid ""
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+msgstr ""
+"Tipe dokumen yang akan dipindai. Pengaturan ini menentukan resolusi, warna, "
+"dan pasca-proses pemindaian."
 
-#. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
-msgid "Front and Back"
-msgstr "Depan dan Belakang"
+#: data/org.gnome.SimpleScan.gschema.xml:25
+msgid "Width of paper in tenths of a mm"
+msgstr "Lebar kertas dalam persepuluhan milimeter"
 
-#. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
-msgid "Front"
-msgstr "Depan"
+#: data/org.gnome.SimpleScan.gschema.xml:26
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"Lebar kertas dalam persepuluhan mm (atau 0 untuk deteksi kertas otomatis)."
 
-#. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
-msgid "Back"
-msgstr "Belakang"
+#: data/org.gnome.SimpleScan.gschema.xml:30
+msgid "Height of paper in tenths of a mm"
+msgstr "Panjang kertas dalam persepuluh mm"
+
+#: data/org.gnome.SimpleScan.gschema.xml:31
+msgid ""
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"Panjang kertas dalam sepersepuluh mm (atau 0 jika kertas dideteksi otomatis)"
+
+#: data/org.gnome.SimpleScan.gschema.xml:35
+msgid "Brightness of scan"
+msgstr "Kecerahan pemindaian"
 
+#: data/org.gnome.SimpleScan.gschema.xml:36
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr "Penyesuaian kecerahan dari -100 ke 100 (0 berarti nihil)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:40
+msgid "Contrast of scan"
+msgstr "Kontras pemindaian"
+
+#: data/org.gnome.SimpleScan.gschema.xml:41
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr "Penyesuaian kontras dari -100 ke 100 (0 berarti nihil)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:45
+msgid "Resolution for text scans"
+msgstr "Resolusi untuk pemindaian teks"
+
+#: data/org.gnome.SimpleScan.gschema.xml:46
+msgid "The resolution in dots-per-inch to use when scanning text."
+msgstr "Resolusi dalam dots-per-inch yang digunakan dalam pemindaian teks."
+
+#: data/org.gnome.SimpleScan.gschema.xml:50
+msgid "Resolution for photo scans"
+msgstr "Resolusi untuk pemindaian foto"
+
+#: data/org.gnome.SimpleScan.gschema.xml:51
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr "Resolusi dalam dots-per-inch yang digunakan dalam pemindaian foto."
+
+#: data/org.gnome.SimpleScan.gschema.xml:55
+msgid "Page side to scan"
+msgstr "Sisi halaman yang dipindai"
+
+#: data/org.gnome.SimpleScan.gschema.xml:56
+msgid "The page side to scan."
+msgstr "Sisi halaman yang dipindai."
+
+#: data/org.gnome.SimpleScan.gschema.xml:60
+msgid "Directory to save files to"
+msgstr "Simpan berkas ke direktori"
+
+#: data/org.gnome.SimpleScan.gschema.xml:61
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+"Direktori tempat menyimpan berkas. Akan disimpan ke direktori dokumen jika "
+"belum diset."
+
+#: data/org.gnome.SimpleScan.gschema.xml:66
+msgid "Quality value to use for JPEG compression"
+msgstr "Nilai kualitas yang akan dipakai untuk kompresi JPEG"
+
+#: data/org.gnome.SimpleScan.gschema.xml:67
+msgid "Quality value to use for JPEG compression."
+msgstr "Nilai kualitas yang akan dipakai untuk kompresi JPEG."
+
+#: data/org.gnome.SimpleScan.gschema.xml:72
+msgid "Delay in millisecond between pages"
+msgstr "Tundaan dalam mili detik antar halaman"
+
+#: data/org.gnome.SimpleScan.gschema.xml:73
+msgid "Delay in millisecond between pages."
+msgstr "Tundaan dalam mili detik antar halaman."
+
+#. Title of scan window
+#. Set HeaderBar title here because Glade doesn't keep it translated
+#. https://bugzilla.gnome.org/show_bug.cgi?id=782753
 #. 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
+#: data/simple-scan.appdata.xml.in:6 data/simple-scan.desktop.in:3
+#: src/app-window.ui:76 src/app-window.vala:1560
 msgid "Simple Scan"
 msgstr "Pemindai Ringkas"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
-msgid "_Document"
-msgstr "_Dokumen"
+#: data/simple-scan.appdata.xml.in:7 data/simple-scan.desktop.in:5
+msgid "Scan Documents"
+msgstr "Pindai Dokumen"
 
-#. Scan menu item
-#: data/simple-scan.ui:260
-msgid "Sc_an"
-msgstr "Pind_ai"
+#: 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 "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+"Cara mudah untuk memindai dokumen dan foto. Anda dapat membuang bagian yang "
+"jelek dari suatu foto dan memutarnya bila itu terbalik. Anda dapat mencetak "
+"pindaian Anda, mengekspor ke pdf, atau menyimpan ke sejumlah format berkas."
+
+#: data/simple-scan.appdata.xml.in:14
+msgid "Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+"Simple Scan memakai framework SANE untuk mendukung kebanyakan pemindai yang "
+"ada."
+
+#: data/simple-scan.desktop.in:4
+msgid "Document Scanner"
+msgstr "Pelarik Dokumen"
 
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: data/simple-scan.desktop.in:7
+msgid "scan;scanner;flatbed;adf;"
+msgstr "scan;scanner;pelarik;pemindai;flatbed;adf;"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: data/simple-scan.desktop.in:10
+msgid "scanner"
+msgstr "scanner"
+
+#. Toolbar scan menu item to scan a single page from the scanner
 #. 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/app-window.ui:22 src/app-window.ui:123 src/app-window.ui:820
 msgid "Single _Page"
 msgstr "Satu _Halaman"
 
+#. Toolbar scan menu item to scan all pages from a document feeder
 #. 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/app-window.ui:31 src/app-window.ui:133 src/app-window.ui:829
 msgid "All Pages From _Feeder"
 msgstr "Semua Halaman Dari _Feeder"
 
-#. Menu entry to stop current scan
-#: data/simple-scan.ui:294
-msgid "_Stop Scan"
-msgstr "Berhenti _Memindai"
+#. Toolbar scan menu item to scan continuously from the flatbed
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/app-window.ui:40 src/app-window.ui:143 src/app-window.ui:838
+msgid "_Multiple Pages From Flatbed"
+msgstr "Beberapa Hala_man Dari Flatbed"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:853
 msgid "Text"
 msgstr "Teks"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:863
 msgid "Photo"
 msgstr "Foto"
 
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: src/app-window.ui:91
+msgid "_Document"
+msgstr "_Dokumen"
+
+#. Scan menu item
+#: src/app-window.ui:110
+msgid "Sc_an"
+msgstr "Pind_ai"
+
+#. Menu entry to stop current scan
+#: src/app-window.ui:154
+msgid "_Stop Scan"
+msgstr "Berhenti _Memindai"
+
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/app-window.ui:196 src/app-window.vala:967 src/app-window.vala:1590
 msgid "Reorder Pages"
 msgstr "Atur Ulang Halaman"
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/app-window.ui:215
 msgid "_Email"
 msgstr "Sur_el"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/app-window.ui:280
 msgid "_Page"
 msgstr "_Halaman"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/app-window.ui:290
 msgid "Rotate _Left"
-msgstr ""
+msgstr "Putar _Kiri"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/app-window.ui:300
 msgid "Rotate _Right"
-msgstr ""
+msgstr "Putar Ka_nan"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/app-window.ui:310
 msgid "_Crop"
-msgstr ""
+msgstr "_Potong"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/app-window.ui:320
 msgid "_None"
 msgstr "_Nihil"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/app-window.ui:331
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/app-window.ui:342
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/app-window.ui:353
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/app-window.ui:364
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/app-window.ui:375
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/app-window.ui:386
 msgid "4×6"
 msgstr "4x6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/app-window.ui:397
 msgid "_Custom"
 msgstr "_Ubahan"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/app-window.ui:415
 msgid "_Rotate Crop"
 msgstr "Puta_r dan Potong"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/app-window.ui:428
 msgid "Move Left"
 msgstr "Pindah Ke Kiri"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/app-window.ui:437
 msgid "Move Right"
 msgstr "Pindah Ke Kanan"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/app-window.ui:474
 msgid "_Help"
-msgstr ""
+msgstr "Ba_ntuan"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/app-window.ui:482
 msgid "_Contents"
 msgstr "_Isi"
 
-#. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
-msgid "Start a new document"
-msgstr ""
-
-#: data/simple-scan.ui:675
-msgid "New"
-msgstr ""
-
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/app-window.ui:520 src/app-window.ui:720
 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/app-window.ui:522 src/app-window.ui:716
 msgid "Scan"
 msgstr "Pindai"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/app-window.ui:538 src/app-window.ui:787
 msgid "Save document to a file"
-msgstr ""
+msgstr "Simpan hasil dalam berkas"
 
-#: ../src/ui.vala:1842
+#: src/app-window.ui:540
 msgid "Save"
-msgstr ""
+msgstr "Simpan"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/app-window.ui:555 src/app-window.ui:700
 msgid "Stop the current scan"
-msgstr ""
+msgstr "Hentikan pemindaian"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/app-window.ui:556 src/app-window.ui:697
 msgid "Stop"
-msgstr ""
-
-#. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "Putar halaman ke kiri (berlawanan arah jarum jam)"
-
-#. Label on rotate page left (anti-clockwise) item
-#: data/simple-scan.ui:750
-msgid "Rotate Left"
-msgstr ""
-
-#. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
-msgid "Rotate the page to the right (clockwise)"
-msgstr "Putar halaman ke kanan (searah jarum jam)"
-
-#. Label on rotate page right (clockwise) item
-#: data/simple-scan.ui:765
-msgid "Rotate Right"
-msgstr ""
-
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
-msgid "Crop the selected page"
-msgstr ""
-
-#: data/simple-scan.ui:781
-msgid "Crop"
-msgstr ""
-
-#: ../src/ui.vala:1849
-msgid "Preferences"
-msgstr "Preferensi"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1048
-msgid "Scan S_ource:"
-msgstr "_Sumber Pindai:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1079
-msgid "_Text Resolution:"
-msgstr "Resolusi _Teks:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1095
-msgid "_Photo Resolution:"
-msgstr "Resolusi _Foto:"
-
-#. Label beside scan side combo box
-#: data/simple-scan.ui:1139
-msgid "Scan Side:"
-msgstr ""
+msgstr "Stop"
 
-#. Label beside page size combo box
-#: data/simple-scan.ui:1169
-msgid "Page Size:"
-msgstr ""
-
-#. Label beside brightness scale
-#: data/simple-scan.ui:1199
-msgid "Brightness:"
-msgstr "Kecerahan:"
-
-#. Label beside contrast scale
-#: data/simple-scan.ui:1229
-msgid "Contrast:"
-msgstr "Kontras:"
-
-#. Label beside quality scale
-#: data/simple-scan.ui:1260
-msgid "Quality:"
-msgstr "Kualitas:"
-
-#: data/simple-scan.desktop.in:4
-msgid "Document Scanner"
-msgstr "Pelarik Dokumen"
+#. Label shown when searching for scanners
+#: src/app-window.ui:611
+msgid "Searching for Scanners…"
+msgstr "Mencari Pemindai…"
 
-#: data/simple-scan.desktop.in:5
-msgid "Scan Documents"
-msgstr "Pindai Dokumen"
+#: src/app-window.vala:237 src/app-window.vala:1380
+msgid "_Close"
+msgstr "_Tutup"
 
-#: data/simple-scan.desktop.in:6
-msgid "scan;scanner;flatbed;adf;"
-msgstr "scan;scanner;pelarik;pemindai;flatbed;adf;"
+#. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
+#: src/app-window.vala:246
+#, c-format
+msgid "Username and password required to access “%s”"
+msgstr "Nama pengguna dan kata sandi dibutuhkan untuk mengakses \"%s\""
 
-#: data/simple-scan.desktop.in:8
-msgid "scanner"
-msgstr ""
+#. Label shown when detected a scanner
+#: src/app-window.vala:266 src/app-window.vala:584
+msgid "Ready to Scan"
+msgstr "Siap Memindai"
 
-#: data/simple-scan.appdata.xml.in:8
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-"Cara mudah untuk memindai dokumen dan foto. Anda dapat membuang bagian yang "
-"jelek dari suatu foto dan memutarnya bila itu terbalik. Anda dapat mencetak "
-"pindaian Anda, mengekspor ke pdf, atau menyimpan ke sejumlah format berkas."
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: src/app-window.vala:273
+msgid "Additional software needed"
+msgstr "Perlu perangkat lunak tambahan"
 
-#: data/simple-scan.appdata.xml.in:13
+#. Instructions to install driver software
+#: src/app-window.vala:275
 msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
+"You need to <a href=\"install-firmware\">install driver software</a> for "
+"your scanner."
 msgstr ""
-"Simple Scan memakai framework SANE untuk mendukung kebanyakan pemindai yang "
-"ada."
-
-#. Error displayed when no scanners to scan with
-#: ../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
-msgid "Unable to connect to scanner"
-msgstr "Tak dapat terhubung ke pemindai"
-
-#. Error display when unable to start scan
-#: ../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
-msgid "Error communicating with scanner"
-msgstr "Galat saat berhubungan dengan pemindai"
-
-#. Help string for command line --version flag
-#: ../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
-msgid "Print debugging messages"
-msgstr "Cetak pesan pengawakutuan"
-
-#: ../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
-msgid "Failed to scan"
-msgstr "Gagal memindai"
-
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
-msgid "[DEVICE...] - Scanning utility"
-msgstr "[PERANGKAT...] - Utilitas pemindaian"
-
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
-#, 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
-msgid "_Close"
-msgstr "_Tutup"
-
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
-#, c-format
-msgid "Username and password required to access '%s'"
-msgstr "Nama pengguna dan kata sandi dibutuhkan untuk mengakses '%s'"
+"Anda perlu <a href=\"install-firmware\">memasang perangkat lunak penggerak</"
+"a> bagi pemindai Anda."
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/app-window.vala:281
 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/app-window.vala:283
 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
-msgid "Additional software needed"
-msgstr "Perlu perangkat lunak tambahan"
-
-#. Instructions to install driver software
-#: ../src/ui.vala:384
-msgid "You need to install driver software for your scanner."
-msgstr "Anda perlu memasang perangkat lunak penggerak bagi pemindai Anda."
+msgstr "Mohon periksa apakah pemindai Anda terhubung dan dalam keadaan menyala"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
-msgid "Save As..."
+#: src/app-window.vala:298
+msgid "Save As…"
 msgstr "Simpan Sebagai..."
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/app-window.vala:301 src/app-window.vala:471 src/app-window.vala:552
 msgid "_Cancel"
 msgstr "_Batal"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/app-window.vala:302 src/app-window.vala:553
 msgid "_Save"
 msgstr "_Simpan"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/app-window.vala:310
 msgid "Scanned Document.pdf"
 msgstr "Dokumen Hasil Pindai.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#. Save dialog: Filter name to show only supported image files
+#: src/app-window.vala:316
 msgid "Image Files"
 msgstr "Berkas Citra"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/app-window.vala:326
 msgid "All Files"
 msgstr "Semua Berkas"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/app-window.vala:335
 msgid "PDF (multi-page document)"
 msgstr "PDF (dokumen multi-halaman)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/app-window.vala:341
 msgid "JPEG (compressed)"
 msgstr "JPEG (terkompresi)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/app-window.vala:347
 msgid "PNG (lossless)"
 msgstr "PNG (lossless)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#. Save dialog: Label for sabing in WEBP format
+#: src/app-window.vala:354
+msgid "WebP (compressed)"
+msgstr "WebP (terkompresi)"
+
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
+#: src/app-window.vala:364
 msgid "File format:"
 msgstr "Format berkas:"
 
+#. Label in save dialog beside compression slider
+#: src/app-window.vala:376
+msgid "Compression:"
+msgstr "Kompresi:"
+
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/app-window.vala:470
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr "Berkas dengan nama \"%s\" sudah ada. Apakah Anda ingin menimpanya?"
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/app-window.vala:473
+msgid "_Replace"
+msgstr "_Timpa"
+
+#: src/app-window.vala:512
+msgid "Saving"
+msgstr "Menyimpan"
+
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/app-window.vala:527
 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
-msgid "If you don't save, changes will be permanently lost."
+#: src/app-window.vala:550
+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/app-window.vala:591
 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/app-window.vala:593
 msgid "Discard Changes"
 msgstr "Buang Perubahan"
 
+#. Label shown when scan started
+#: src/app-window.vala:692
+msgid "Contacting scanner…"
+msgstr "Menghubungi pemindai…"
+
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/app-window.vala:800
 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/app-window.vala:812
 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/app-window.vala:990
 msgid "Combine sides"
 msgstr "Kombinasikan sisi-sisi"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/app-window.vala:1000
 msgid "Combine sides (reverse)"
 msgstr "Kombinasikan sisi-sisi (balik)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/app-window.vala:1010
 msgid "Reverse"
 msgstr "Balikkan"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/app-window.vala:1020
 msgid "Keep unchanged"
 msgstr "Biarkan tak berubah"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/app-window.vala:1250
 msgid "Unable to open help file"
 msgstr "Tak dapat membuka berkas bantuan"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/app-window.vala:1271
 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,18 +548,20 @@ msgstr ""
 "bersama program ini. Bila tidak, lihat <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/app-window.vala:1274
 msgid "About Simple Scan"
 msgstr "Tentang Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/app-window.vala:1277
 msgid "Simple document scanning tool"
 msgstr "Alat pemindai dokumen sederhana"
 
-#: ../src/ui.vala:1487
+#: src/app-window.vala:1286
 msgid "translator-credits"
 msgstr ""
+"Kukuh Syafaat <syafaatkukuh@gmail.com>, 2017.\n"
+"\n"
 "Launchpad Contributions:\n"
 "  Abdul Munif Hanafi https://launchpad.net/~nafica-coroz\n"
 "  Andika Triwidada https://launchpad.net/~andika\n"
@@ -567,327 +578,460 @@ msgstr ""
 "  jemmy surya https://launchpad.net/~jemmy"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/app-window.vala:1308
 msgid "Save document before quitting?"
 msgstr "Simpan dokumen sebelum keluar"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:1310
 msgid "Quit without Saving"
 msgstr "Keluar tanpa menyimpan"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/app-window.vala:1357
 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/app-window.vala:1359
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.brother.com\">Brother website</a>."
+"Drivers for this are available on the <a href=\"http://support.brother.com"
+"\">Brother website</a>."
 msgstr ""
 "Penggerak bagi ini tersedia di <a href=\"http://support.brother.com\">situs "
 "web Brother</a>."
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/app-window.vala:1363
 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/app-window.vala:1365
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://samsung.com/support\">Samsung website</a>."
+"Drivers for this are available on the <a href=\"http://samsung.com/support"
+"\">Samsung website</a>."
 msgstr ""
 "Penggerak bagi ini tersedia di <a href=\"http://samsung.com/support\">situs "
 "web Samsung</a>."
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/app-window.vala:1369
 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/app-window.vala:1374
 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/app-window.vala:1376
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.epson.com\">Epson website</a>."
+"Drivers for this are available on the <a href=\"http://support.epson.com"
+"\">Epson website</a>."
 msgstr ""
 "Penggerak bagi ini tersedia di <a href=\"http://support.epson.com\">situs "
 "web Epson</a>."
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/app-window.vala:1380
 msgid "Install drivers"
 msgstr "Pasang penggerak"
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/app-window.vala:1411
 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
-msgid "Installing drivers..."
-msgstr "Memasang penggerak..."
+#: src/app-window.vala:1423
+msgid "Installing drivers…"
+msgstr "Memasang penggerak…"
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/app-window.vala:1431
 msgid "Drivers installed successfully!"
 msgstr "Penggerak sukses terpasang!"
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/app-window.vala:1441
 #, 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/app-window.vala:1447
 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
-#, 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
-#, c-format
-msgid "%d dpi (default)"
-msgstr "%d dpi (default)"
-
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/app-window.vala:1454
 #, c-format
-msgid "%d dpi (draft)"
-msgstr "%d dpi (draft)"
+msgid "You need to install the %s package."
+msgid_plural "You need to install the %s packages."
+msgstr[0] "Anda perlu memasang paket %s."
 
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../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
-#, c-format
-msgid "%d dpi"
-msgstr "%d dpi"
-
-#: ../src/ui.vala:1835
-msgid "New Document"
-msgstr "Dokumen Baru"
-
-#: ../src/ui.vala:1840
-msgid "Document"
-msgstr "Dokumen"
-
-#: ../src/ui.vala:1844
-msgid "Email..."
-msgstr "Surel..."
+#. Title of preferences dialog
+#: src/app-window.vala:1568 src/app-window.vala:1591
+#: src/preferences-dialog.ui:53
+msgid "Preferences"
+msgstr "Preferensi"
 
-#: ../src/ui.vala:1845
-msgid "Print..."
-msgstr "Cetak..."
+#: src/app-window.vala:1572
+msgid "Keyboard Shortcuts"
+msgstr "Pintasan Papan Tik"
 
-#: ../src/ui.vala:1853
+#: src/app-window.vala:1573
 msgid "Help"
 msgstr "Bantuan"
 
-#: ../src/ui.vala:1854
+#: src/app-window.vala:1574
 msgid "About"
 msgstr "Perihal"
 
-#: ../src/ui.vala:1855
+#: src/app-window.vala:1575
 msgid "Quit"
 msgstr "Keluar"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
-msgid "Change _Scanner"
-msgstr "Ganti _Pemindai"
+#: src/app-window.vala:1589
+msgid "Email"
+msgstr "Surel"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
-msgid "_Install Drivers"
-msgstr "_Pasang Penggerak"
+#. Populate ActionBar (not supported in Glade)
+#. https://bugzilla.gnome.org/show_bug.cgi?id=769966
+#. Label on new document button
+#: src/app-window.vala:1599
+msgid "Start Again…"
+msgstr "Mulai lagi…"
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
-msgid "Automatic"
-msgstr "Otomatis"
+#. Tooltip for rotate left (counter-clockwise) button
+#: src/app-window.vala:1616
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Putar halaman ke kiri (berlawanan arah jarum jam)"
 
-#: ../src/ui.vala:1947
-msgid "Darker"
-msgstr "Lebih Gelap"
+#. Tooltip for rotate right (clockwise) button
+#: src/app-window.vala:1623
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Putar halaman ke kanan (searah jarum jam)"
 
-#: ../src/ui.vala:1949
-msgid "Lighter"
-msgstr "Lebih Terang"
+#. Tooltip for crop button
+#: src/app-window.vala:1633
+msgid "Crop the selected page"
+msgstr "Potong halaman yang dipilih"
 
-#: ../src/ui.vala:1957
-msgid "Less"
-msgstr "Kurang"
+#. Tooltip for delete button
+#: src/app-window.vala:1649
+msgid "Delete the selected page"
+msgstr "Hapus halaman yang dipilih"
 
-#: ../src/ui.vala:1959
-msgid "More"
-msgstr "Lebih"
+#. Text of button for cancelling save
+#: src/app-window.vala:1814
+msgid "Cancel"
+msgstr "Batal"
 
-#: ../src/ui.vala:1967
-msgid "Minimum"
-msgstr "Minimum"
+#. Button to submit authorization dialog
+#: src/authorize-dialog.ui:25
+msgid "_Authorize"
+msgstr "Otoris_asikan"
 
-#: ../src/ui.vala:1969
-msgid "Maximum"
-msgstr "Maksimum"
+#. Label beside username entry
+#: src/authorize-dialog.ui:99
+msgid "_Username for resource:"
+msgstr "Nama pengg_una untuk sumber daya:"
 
-#: ../src/ui.vala:2008
-msgid "Saving document..."
-msgstr "Menyimpan dokumen..."
+#. Label beside password entry
+#: src/authorize-dialog.ui:112
+msgid "_Password:"
+msgstr "_Sandi:"
 
-#: ../src/ui.vala:2173
+#: src/book.vala:331 src/book.vala:337
 #, c-format
-msgid "Saving page %d out of %d"
-msgstr "Menyimpan halaman %d dari %d"
-
-#~ msgid "Resolution for photo scans"
-#~ msgstr "Resolusi untuk pemindaian foto"
-
-#~ msgid "Resolution for text scans"
-#~ msgstr "Resolusi untuk pemindaian teks"
-
-#~ msgid "Files missing"
-#~ msgstr "Berkas hilang"
-
-#~ msgid "Page side to scan"
-#~ msgstr "Sisi halaman yang dipindai"
+msgid "Unable to encode page %i"
+msgstr "Tak dapat mengkodekan halaman %i"
+
+#: src/help-overlay.ui:12
+msgctxt "shortcut window"
+msgid "Scanning"
+msgstr "Memindai"
+
+#: src/help-overlay.ui:17
+msgctxt "shortcut window"
+msgid "Scan a single page"
+msgstr "Pindai sebuah halaman"
+
+#: src/help-overlay.ui:24
+msgctxt "shortcut window"
+msgid "Scan all pages from document feeder"
+msgstr "Pindai semua halaman dari pengumpan dokumen"
+
+#: src/help-overlay.ui:31
+msgctxt "shortcut window"
+msgid "Scan continuously from a flatbed scanner"
+msgstr "Scan terus menerus dari pemindai flatbed"
+
+#: src/help-overlay.ui:38
+msgctxt "shortcut window"
+msgid "Stop scan in progress"
+msgstr "Hentikan pemindaian yang sedang berlangsung"
+
+#: src/help-overlay.ui:46
+msgctxt "shortcut window"
+msgid "Document Modification"
+msgstr "Modifikasi Dokumen"
+
+#: src/help-overlay.ui:51
+msgctxt "shortcut window"
+msgid "Move page left"
+msgstr "Pindahkan halaman ke kiri"
+
+#: src/help-overlay.ui:58
+msgctxt "shortcut window"
+msgid "Move page right"
+msgstr "Pindahkan halaman ke kanan"
+
+#: src/help-overlay.ui:65
+msgctxt "shortcut window"
+msgid "Rotate page to the left (anti-clockwise)"
+msgstr "Putar halaman ke kiri (berlawanan arah jarum jam)"
 
-#~ msgid "Height of paper in tenths of a mm"
-#~ msgstr "Panjang kertas dalam persepuluh mm"
+#: src/help-overlay.ui:72
+msgctxt "shortcut window"
+msgid "Rotate page to the right (clockwise)"
+msgstr "Putar halaman ke kanan (searah jarum jam)"
 
-#~ msgid "Resolution of last scanned image"
-#~ msgstr "Resolusi pemindaian terakhir"
+#: src/help-overlay.ui:79
+msgctxt "shortcut window"
+msgid "Delete page"
+msgstr "Hapus halaman"
+
+#: src/help-overlay.ui:87
+msgctxt "shortcut window"
+msgid "Document Management"
+msgstr "Pengelolaan Dokumen"
+
+#: src/help-overlay.ui:92
+msgctxt "shortcut window"
+msgid "Start new document"
+msgstr "Mulai dokumen baru"
+
+#: src/help-overlay.ui:99
+msgctxt "shortcut window"
+msgid "Save scanned document"
+msgstr "Simpan dokumen yang dipindai"
+
+#: src/help-overlay.ui:106
+msgctxt "shortcut window"
+msgid "Email scanned document"
+msgstr "Kirim surel dokumen pindaian"
+
+#: src/help-overlay.ui:113
+msgctxt "shortcut window"
+msgid "Print scanned document"
+msgstr "Cetak dokumen pindaian"
+
+#: src/help-overlay.ui:120
+msgctxt "shortcut window"
+msgid "Copy current page to clipboard"
+msgstr "Salin halaman ini ke papan klip"
 
-#~ msgid "Directory to save files to"
-#~ msgstr "Simpan berkas ke direktori"
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:113
+msgid "_Scanner"
+msgstr "_Pemindai"
 
-#~ msgid "Direction of scan"
-#~ msgstr "Arah pemindaian"
+#. Label beside scan side combo box
+#: src/preferences-dialog.ui:143
+msgid "Scan Sides"
+msgstr "Bidang Pindai:"
 
-#~ msgid "The page side to scan."
-#~ msgstr "Sisi halaman yang dipindai."
+#. Label beside page size combo box
+#: src/preferences-dialog.ui:160
+msgid "Page Size"
+msgstr "Ukuran Halaman"
 
-#~ msgid "The direction of the scanner across the scanned page."
-#~ msgstr "Arah pemindaian terhadap halaman yang dipindai."
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:191
+msgid "Front"
+msgstr "Depan"
 
-#~ msgid ""
-#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
-#~ msgstr ""
-#~ "Panjang kertas dalam sepersepuluh mm (atau 0 jika kertas dideteksi otomatis)"
+#. Preferences Dialog: Toggle button to select scanning on the back side of a page
+#: src/preferences-dialog.ui:206
+msgid "Back"
+msgstr "Belakang"
 
-#~ msgid "TRUE if the application window is maximized"
-#~ msgstr "TRUE jika jendela aplikasi dimaksimalkan"
+#. Preferences Dialog: Toggle button to select scanning on both sides of a page
+#: src/preferences-dialog.ui:221
+msgid "Both"
+msgstr "Keduanya"
+
+#. Label beside page delay scale
+#: src/preferences-dialog.ui:260
+msgid "Delay"
+msgstr "Tunda"
+
+#. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
+#: src/preferences-dialog.ui:276
+msgid "Multiple pages from flatbed"
+msgstr "Beberapa halaman dari flatbed"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:295
+msgid "3"
+msgstr "3"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:310
+msgid "5"
+msgstr "5"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:326
+msgid "7"
+msgstr "7"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:342
+msgid "10"
+msgstr "10"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:358
+msgid "15"
+msgstr "15"
+
+#. Label after page delay radio buttons
+#: src/preferences-dialog.ui:385
+msgid "Seconds"
+msgstr "Detik"
+
+#. Preferences Dialog: Tab label for scanning settings
+#: src/preferences-dialog.ui:413
+msgid "Scanning"
+msgstr "Memindai"
 
-#~ msgid "The resolution in dots-per-inch of the previously scanned image."
-#~ msgstr "Resolusi dalam dots-per-inch dari gambar sebelumnya."
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:436
+msgid "_Text Resolution"
+msgstr "Resolusi _Teks"
 
-#~ msgid ""
-#~ "The directory to save files to. Defaults to the documents directory if unset."
-#~ msgstr ""
-#~ "Direktori tempat menyimpan berkas. Akan disimpan ke direktori dokumen jika "
-#~ "belum diset."
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:452
+msgid "_Photo Resolution"
+msgstr "Resolusi _Foto"
 
-#~ msgid "Type of document being scanned"
-#~ msgstr "Tipe dokumen yang akan dipindai"
+#. Label beside brightness scale
+#: src/preferences-dialog.ui:505
+msgid "Brightness"
+msgstr "Kecerahan"
 
-#~ msgid "Window height in pixels"
-#~ msgstr "Tinggi jendela dalam piksel"
+#. Label beside contrast scale
+#: src/preferences-dialog.ui:521
+msgid "Contrast"
+msgstr "Kontras"
 
-#~ msgid "Window width in pixels"
-#~ msgstr "Lebar jendela dalam piksel"
+#. Preferences Dialog: Tab for quality settings
+#: src/preferences-dialog.ui:576
+msgid "Quality"
+msgstr "Kualitas"
 
-#~ msgid "Device to scan from"
-#~ msgstr "Perangkat untuk memindai"
+#. Combo box value for automatic paper size
+#: src/preferences-dialog.vala:77
+msgid "Automatic"
+msgstr "Otomatis"
 
-#~ msgid "Height of scanned image in pixels"
-#~ msgstr "Tinggi gambar terpindai dalam piksel"
+#: src/preferences-dialog.vala:116
+msgid "Darker"
+msgstr "Lebih Gelap"
 
-#~ msgid ""
-#~ "The width of scanned image in pixels. This value is updated to what the last "
-#~ "scanned page was."
-#~ msgstr ""
-#~ "Lebar gambar terpindai dalam piksel. Nilai ini diupdate sesuai halaman "
-#~ "terakhir yang pernah dipindai."
+#: src/preferences-dialog.vala:118
+msgid "Lighter"
+msgstr "Lebih Terang"
 
-#~ msgid ""
-#~ "The height of scanned image in pixels. This value is updated to what the "
-#~ "last scanned page was."
-#~ msgstr ""
-#~ "Tinggi gambar terpindai dalam piksel. Nilai ini diupdate sesuai halaman "
-#~ "terakhir yang pernah dipindai."
+#: src/preferences-dialog.vala:126
+msgid "Less"
+msgstr "Kurang"
 
-#~ msgid "Width of scanned image in pixels"
-#~ msgstr "Lebar gambar terpindai dalam piksel"
+#: src/preferences-dialog.vala:128
+msgid "More"
+msgstr "Lebih"
 
-#~ msgid "The resolution in dots-per-inch to use when scanning text."
-#~ msgstr "Resolusi dalam dots-per-inch yang digunakan dalam pemindaian teks."
+#. Preferences dialog: Label for default resolution in resolution list
+#: src/preferences-dialog.vala:440
+#, c-format
+msgid "%d dpi (default)"
+msgstr "%d dpi (default)"
 
-#~ msgid "Scanned Document"
-#~ msgstr "Dokumen Terpindai"
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: src/preferences-dialog.vala:443
+#, c-format
+msgid "%d dpi (draft)"
+msgstr "%d dpi (draft)"
 
-#~ msgid "Select File _Type"
-#~ msgstr "Pilih _Tipe Berkas"
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: src/preferences-dialog.vala:446
+#, c-format
+msgid "%d dpi (high resolution)"
+msgstr "%d dpi (resolusi tinggi)"
 
-#~ msgid ""
-#~ "Type of document being scanned. This setting decides on the scan resolution, "
-#~ "colors and post-processing."
-#~ msgstr ""
-#~ "Tipe dokumen yang akan dipindai. Pengaturan ini menentukan resolusi, warna, "
-#~ "dan pasca-proses pemindaian."
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: src/preferences-dialog.vala:449
+#, c-format
+msgid "%d dpi"
+msgstr "%d dpi"
 
-#~ msgid "SANE device to acquire images from."
-#~ msgstr "Perangkat SANE yang dipakai untuk mengambil gambar."
+#. Error displayed when no scanners to scan with
+#: src/scanner.vala:844
+msgid "No scanners available.  Please connect a scanner."
+msgstr "Tidak ada pemindai yang tersedia. Mohon hubungkan pemindai."
 
-#~ msgid "Width of paper in tenths of a mm"
-#~ msgstr "Lebar kertas dalam persepuluhan milimeter"
+#. Error displayed when cannot connect to scanner
+#: src/scanner.vala:874
+msgid "Unable to connect to scanner"
+msgstr "Tak dapat terhubung ke pemindai"
 
-#~ msgid ""
-#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
-#~ msgstr ""
-#~ "Lebar kertas dalam persepuluhan mm (atau 0 untuk deteksi kertas otomatis)."
+#. Error display when unable to start scan
+#: src/scanner.vala:1227
+msgid "Unable to start scan"
+msgstr "Tak dapat memulai pemindaian"
 
-#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
-#~ msgstr "Penyesuaian kontras dari -100 ke 100 (0 berarti nihil)."
+#. Error displayed when communication with scanner broken
+#: src/scanner.vala:1240 src/scanner.vala:1340
+msgid "Error communicating with scanner"
+msgstr "Galat saat berhubungan dengan pemindai"
 
-#~ msgid "Contrast of scan"
-#~ msgstr "Kontras pemindaian"
+#. Help string for command line --version flag
+#: src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "Tampilkan versi rilis"
 
-#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
-#~ msgstr "Penyesuaian kecerahan dari -100 ke 100 (0 berarti nihil)."
+#. Help string for command line --debug flag
+#: src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Cetak pesan pengawakutuan"
 
-#~ msgid "Brightness of scan"
-#~ msgstr "Kecerahan pemindaian"
+#: 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"
 
-#~ msgid "Quality value to use for JPEG compression."
-#~ msgstr "Nilai kualitas yang akan dipakai untuk kompresi JPEG."
+#. Title of error dialog when scan failed
+#: src/simple-scan.vala:392
+msgid "Failed to scan"
+msgstr "Gagal memindai"
 
-#~ msgid "Quality value to use for JPEG compression"
-#~ msgstr "Nilai kualitas yang akan dipakai untuk kompresi JPEG"
+#. Attempt to inhibit the screensaver when scanning
+#: src/simple-scan.vala:407
+msgid "Scan in progress"
+msgstr "Pemindaian sedang berlangsung"
 
-#~ msgid "The resolution in dots-per-inch to use when scanning photos."
-#~ msgstr "Resolusi dalam dots-per-inch yang digunakan dalam pemindaian foto."
+#. Arguments and description for --help text
+#: src/simple-scan.vala:584
+msgid "[DEVICE…] — Scanning utility"
+msgstr "[PERANGKAT...] — Utilitas pemindaian"
 
-#~ msgid "Please check your installation"
-#~ msgstr "Mohon periksa instalasi Anda"
+#. Text printed out when an unknown command-line argument provided
+#: src/simple-scan.vala:595
+#, c-format
+msgid "Run “%s --help” to see a full list of available command line options."
+msgstr ""
+"Jalankan \"%s --help\" untuk melihat daftar lengkap opsi yang tersedia."
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..398aa0a 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1,520 +1,538 @@
 # Italian translation for simple-scan
 # Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
 # This file is distributed under the same license as the simple-scan package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
+# Gianvito Cavasoli <gianvito@gmx.it>, 2017.
 #
 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-08-22 07:09+0000\n"
-"Last-Translator: Leonardo Corato <leocor@gmail.com>\n"
-"Language-Team: Italian <it@li.org>\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
+"product=simple-scan&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-08-13 21:51+0000\n"
+"PO-Revision-Date: 2017-09-09 14:44+0200\n"
+"Last-Translator: Gianvito Cavasoli <gianvito@gmx.it>\n"
+"Language-Team: Italiano <gnome-it-list@gnome.org>\n"
+"Language: it\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-25 06:10+0000\n"
+"X-Generator: Gtranslator 2.91.7\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. Button to submit authorization dialog
-#: data/simple-scan.ui:24
-msgid "_Authorize"
-msgstr "_Autorizza"
+#: data/org.gnome.SimpleScan.gschema.xml:11
+msgid "Device to scan from"
+msgstr "Dispositivo di acquisizione"
 
-#. Label beside username entry
-#: data/simple-scan.ui:102
-msgid "_Username for resource:"
-msgstr "_Nome utente per la risorsa:"
+#: data/org.gnome.SimpleScan.gschema.xml:12
+msgid "SANE device to acquire images from."
+msgstr "Dispositivo SANE da cui acquisire le immagini."
 
-#. Label beside password entry
-#: data/simple-scan.ui:117
-msgid "_Password:"
-msgstr "Pass_word:"
+#: data/org.gnome.SimpleScan.gschema.xml:20
+msgid "Type of document being scanned"
+msgstr "Tipo del documento da acquisire"
 
-#. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
-msgid "Front and Back"
-msgstr "Fronte e retro"
+#: data/org.gnome.SimpleScan.gschema.xml:21
+msgid ""
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+msgstr ""
+"Tipo del documento da acquisire. Questa impostazione influenza la "
+"risoluzione, il numero dei colori e l'elaborazione successiva "
+"all'acquisizione."
 
-#. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
-msgid "Front"
-msgstr "Fronte"
+#: data/org.gnome.SimpleScan.gschema.xml:25
+msgid "Width of paper in tenths of a mm"
+msgstr "Larghezza del foglio in decimi di mm"
 
-#. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
-msgid "Back"
-msgstr "Retro"
+#: data/org.gnome.SimpleScan.gschema.xml:26
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"La larghezza del foglio in decimi di mm (0 per il rilevamento automatico)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:30
+msgid "Height of paper in tenths of a mm"
+msgstr "Altezza del foglio in decimi di mm"
+
+#: data/org.gnome.SimpleScan.gschema.xml:31
+msgid ""
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"L'altezza del foglio in decimi di mm (0 per il rilevamento automatico)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:35
+msgid "Brightness of scan"
+msgstr "Luminosità dell'acquisizione"
+
+#: data/org.gnome.SimpleScan.gschema.xml:36
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr ""
+"La regolazione della luminosità da -100 a 100 (0 per alcuna luminosità)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:40
+msgid "Contrast of scan"
+msgstr "Contrasto dell'acquisizione"
+
+#: data/org.gnome.SimpleScan.gschema.xml:41
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr "La regolazione del contrasto da -100 a 100 (0 per alcun contrasto)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:45
+msgid "Resolution for text scans"
+msgstr "Risoluzione per acquisizione testo"
+
+#: data/org.gnome.SimpleScan.gschema.xml:46
+msgid "The resolution in dots-per-inch to use when scanning text."
+msgstr ""
+"La risoluzione in punti per pollice da usare per l'acquisizione di testi."
+
+#: data/org.gnome.SimpleScan.gschema.xml:50
+msgid "Resolution for photo scans"
+msgstr "Risoluzione per acquisizione foto"
+
+#: data/org.gnome.SimpleScan.gschema.xml:51
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr ""
+"La risoluzione in punti per pollice da usare per l'acquisizione di foto."
+
+#: data/org.gnome.SimpleScan.gschema.xml:55
+msgid "Page side to scan"
+msgstr "Lato della pagina da acquisire"
+
+#: data/org.gnome.SimpleScan.gschema.xml:56
+msgid "The page side to scan."
+msgstr "Lato della pagina da acquisire."
+
+#: data/org.gnome.SimpleScan.gschema.xml:60
+msgid "Directory to save files to"
+msgstr "Directory dove salvare i file"
+
+#: data/org.gnome.SimpleScan.gschema.xml:61
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+"La directory dove salvare i file. Il valore predefinito è la directory dei "
+"documenti."
+
+#: data/org.gnome.SimpleScan.gschema.xml:66
+msgid "Quality value to use for JPEG compression"
+msgstr "Indica il valore della qualità per la compressione JPEG"
+
+#: data/org.gnome.SimpleScan.gschema.xml:67
+msgid "Quality value to use for JPEG compression."
+msgstr "Indica il valore della qualità per la compressione JPEG"
+
+#: data/org.gnome.SimpleScan.gschema.xml:72
+msgid "Delay in millisecond between pages"
+msgstr "Ritardo tra le pagine in millisecondi"
+
+#: data/org.gnome.SimpleScan.gschema.xml:73
+msgid "Delay in millisecond between pages."
+msgstr "Ritardo tra le pagine in millisecondi."
 
 #. 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
+#. Set HeaderBar title here because Glade doesn't keep it translated
+#. https://bugzilla.gnome.org/show_bug.cgi?id=782753
+#. Title of scan window
+#: data/simple-scan.appdata.xml.in:6 data/simple-scan.desktop.in:3
+#: src/app-window.ui:76 src/app-window.vala:1560
 msgid "Simple Scan"
 msgstr "Simple Scan"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
-msgid "_Document"
-msgstr "_Documento"
+#: data/simple-scan.appdata.xml.in:7 data/simple-scan.desktop.in:5
+msgid "Scan Documents"
+msgstr "Acquisisci documenti"
 
-#. Scan menu item
-#: data/simple-scan.ui:260
-msgid "Sc_an"
-msgstr "_Acquisisci"
+#: 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 "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+"Un modo molto semplice per acquisire documenti e foto. È possibile "
+"ritagliare le parti non necessarie di una foto e ruotarla se è nel verso "
+"sbagliato. È anche possibile stampare i file acquisiti, esportarli in "
+"formato PDF o salvarli in vari formati di immagine."
+
+#: data/simple-scan.appdata.xml.in:14
+msgid "Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+"Simple Scan usa il framework SANE per supportare il maggior numero di "
+"scanner esistenti."
 
+#: data/simple-scan.desktop.in:4
+msgid "Document Scanner"
+msgstr "Scansiona documenti"
+
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: data/simple-scan.desktop.in:7
+msgid "scan;scanner;flatbed;adf;"
+msgstr "scan;scanner;scansiona;adf;acquisizione;"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: data/simple-scan.desktop.in:10
+msgid "scanner"
+msgstr "scanner"
+
+#. Toolbar scan menu item to scan a single page from the scanner
 #. 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/app-window.ui:22 src/app-window.ui:123 src/app-window.ui:820
 msgid "Single _Page"
 msgstr "_Pagina singola"
 
+#. Toolbar scan menu item to scan all pages from a document feeder
 #. 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/app-window.ui:31 src/app-window.ui:133 src/app-window.ui:829
 msgid "All Pages From _Feeder"
-msgstr "_Tutte le pagine dal caricatore"
+msgstr "_Tutte le pagine dall'alimentatore documenti"
 
-#. Menu entry to stop current scan
-#: data/simple-scan.ui:294
-msgid "_Stop Scan"
-msgstr "Ferma l'acqui_sizione"
+#. Toolbar scan menu item to scan continuously from the flatbed
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/app-window.ui:40 src/app-window.ui:143 src/app-window.ui:838
+msgid "_Multiple Pages From Flatbed"
+msgstr "Pagine _multiple dallo scanner"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:853
 msgid "Text"
 msgstr "Testo"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:863
 msgid "Photo"
 msgstr "Foto"
 
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: src/app-window.ui:91
+msgid "_Document"
+msgstr "_Documento"
+
+#. Scan menu item
+#: src/app-window.ui:110
+msgid "Sc_an"
+msgstr "_Acquisisci"
+
+#. Menu entry to stop current scan
+#: src/app-window.ui:154
+msgid "_Stop Scan"
+msgstr "Interrompi acqui_sizione"
+
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/app-window.ui:196 src/app-window.vala:967 src/app-window.vala:1590
 msgid "Reorder Pages"
 msgstr "Riordina pagine"
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/app-window.ui:215
 msgid "_Email"
 msgstr "_Email"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/app-window.ui:280
 msgid "_Page"
 msgstr "_Pagina"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/app-window.ui:290
 msgid "Rotate _Left"
 msgstr "Ruota a _sinistra"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/app-window.ui:300
 msgid "Rotate _Right"
 msgstr "Ruota a _destra"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/app-window.ui:310
 msgid "_Crop"
-msgstr "_Ritaglio"
+msgstr "_Ritaglia"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/app-window.ui:320
 msgid "_None"
 msgstr "_Nessuno"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/app-window.ui:331
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/app-window.ui:342
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/app-window.ui:353
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/app-window.ui:364
 msgid "_Letter"
-msgstr "US _Letter"
+msgstr "_Lettera"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/app-window.ui:375
 msgid "Le_gal"
-msgstr "Le_gal"
+msgstr "Le_gale"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/app-window.ui:386
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/app-window.ui:397
 msgid "_Custom"
 msgstr "_Personalizzato"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/app-window.ui:415
 msgid "_Rotate Crop"
 msgstr "_Ruota ritaglio"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/app-window.ui:428
 msgid "Move Left"
 msgstr "Sposta a sinistra"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/app-window.ui:437
 msgid "Move Right"
 msgstr "Sposta a destra"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/app-window.ui:474
 msgid "_Help"
 msgstr "A_iuto"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/app-window.ui:482
 msgid "_Contents"
 msgstr "_Sommario"
 
-#. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
-msgid "Start a new document"
-msgstr "Crea un nuovo documento"
-
-#: data/simple-scan.ui:675
-msgid "New"
-msgstr "Nuovo"
-
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/app-window.ui:520 src/app-window.ui:720
 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/app-window.ui:522 src/app-window.ui:716
 msgid "Scan"
 msgstr "Acquisisci"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/app-window.ui:538 src/app-window.ui:787
 msgid "Save document to a file"
-msgstr "Salva documento in un file"
+msgstr "Salva il documento su un file"
 
-#: ../src/ui.vala:1842
+#: src/app-window.ui:540
 msgid "Save"
 msgstr "Salva"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/app-window.ui:555 src/app-window.ui:700
 msgid "Stop the current scan"
 msgstr "Interrompe l'acquisizione in corso"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/app-window.ui:556 src/app-window.ui:697
 msgid "Stop"
-msgstr "Ferma"
-
-#. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "Ruota la pagina a sinistra (senso antiorario)"
-
-#. Label on rotate page left (anti-clockwise) item
-#: data/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
-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
-msgid "Rotate Right"
-msgstr "Ruota a destra"
-
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
-msgid "Crop the selected page"
-msgstr "Ritaglia la pagina selezionata"
-
-#: data/simple-scan.ui:781
-msgid "Crop"
-msgstr "Ritaglia"
-
-#: ../src/ui.vala:1849
-msgid "Preferences"
-msgstr "Preferenze"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1048
-msgid "Scan S_ource:"
-msgstr "S_orgente di acquisizione:"
+msgstr "Interrompi"
 
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1079
-msgid "_Text Resolution:"
-msgstr "Risoluzione _testo:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1095
-msgid "_Photo Resolution:"
-msgstr "_Risoluzione foto:"
+#. Label shown when searching for scanners
+#: src/app-window.ui:611
+msgid "Searching for Scanners…"
+msgstr "Ricerca degli scanner…"
 
-#. Label beside scan side combo box
-#: data/simple-scan.ui:1139
-msgid "Scan Side:"
-msgstr "Lato acquisizione:"
-
-#. Label beside page size combo box
-#: data/simple-scan.ui:1169
-msgid "Page Size:"
-msgstr "Dimensione pagina:"
-
-#. Label beside brightness scale
-#: data/simple-scan.ui:1199
-msgid "Brightness:"
-msgstr "Luminosità:"
-
-#. Label beside contrast scale
-#: data/simple-scan.ui:1229
-msgid "Contrast:"
-msgstr "Contrasto:"
-
-#. Label beside quality scale
-#: data/simple-scan.ui:1260
-msgid "Quality:"
-msgstr "Qualità:"
-
-#: data/simple-scan.desktop.in:4
-msgid "Document Scanner"
-msgstr "Scansiona documenti"
-
-#: data/simple-scan.desktop.in:5
-msgid "Scan Documents"
-msgstr "Acquisisci documenti"
+#: src/app-window.vala:237 src/app-window.vala:1380
+msgid "_Close"
+msgstr "_Chiudi"
 
-#: data/simple-scan.desktop.in:6
-msgid "scan;scanner;flatbed;adf;"
-msgstr "scan;scanner;scansiona;adf;"
+#. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
+#: src/app-window.vala:246
+#, c-format
+#| msgid "Username and password required to access '%s'"
+msgid "Username and password required to access “%s”"
+msgstr "Sono richiesti nome utente e password per accedere a «%s»"
 
-#: data/simple-scan.desktop.in:8
-msgid "scanner"
-msgstr ""
+#. Label shown when detected a scanner
+#: src/app-window.vala:266 src/app-window.vala:584
+#| msgid "Failed to scan"
+msgid "Ready to Scan"
+msgstr "Pronto per l'acquisizione"
 
-#: data/simple-scan.appdata.xml.in:8
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-"Un modo molto semplice per acquisire documenti e foto. È possibile "
-"ritagliare le parti non necessarie di una foto e ruotarla se è nel verso "
-"sbagliato. È anche possibile stampare i file acquisiti esportarli in formato "
-"PDF o salvarli in vari formati di immagine."
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: src/app-window.vala:273
+msgid "Additional software needed"
+msgstr "Software aggiuntivo necessario"
 
-#: data/simple-scan.appdata.xml.in:13
+#. Instructions to install driver software
+#: src/app-window.vala:275
+#| msgid "You need to install driver software for your scanner."
 msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
-"Simple Scan usa il framework SANE per supportare il maggior numero di "
-"scanner esistenti."
-
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
-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
-msgid "Unable to connect to scanner"
-msgstr "Impossibile connettersi allo scanner"
-
-#. Error display when unable to start scan
-#: ../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
-msgid "Error communicating with scanner"
-msgstr "Errore di comunicazione con lo scanner"
-
-#. Help string for command line --version flag
-#: ../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
-msgid "Print debugging messages"
-msgstr "Stampa i messaggi di debug"
-
-#: ../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
-msgid "Failed to scan"
-msgstr "Acquisizione non riuscita"
-
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
-msgid "[DEVICE...] - Scanning utility"
-msgstr "[DISPOSITIVO...] - Strumento per l'acquisizione"
-
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
-#, c-format
-msgid "Run '%s --help' to see a full list of available command line options."
+"You need to <a href=\"install-firmware\">install driver software</a> for "
+"your scanner."
 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
-msgid "_Close"
-msgstr "_Chiudi"
-
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../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»"
+"È necessario <a href=\"install-firmware\">installare il software del driver</"
+"a> dello scanner."
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/app-window.vala:281
 msgid "No scanners detected"
 msgstr "Nessuno scanner rilevato"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/app-window.vala:283
 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
-msgid "Additional software needed"
-msgstr "Software aggiuntivo necessario"
-
-#. Instructions to install driver software
-#: ../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
-msgid "Save As..."
-msgstr "Salva come..."
+#: src/app-window.vala:298
+#| msgid "Save As..."
+msgid "Save As…"
+msgstr "Salva come…"
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/app-window.vala:301 src/app-window.vala:471 src/app-window.vala:552
 msgid "_Cancel"
 msgstr "A_nnulla"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/app-window.vala:302 src/app-window.vala:553
 msgid "_Save"
 msgstr "_Salva"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/app-window.vala:310
 msgid "Scanned Document.pdf"
-msgstr "Documento-acquisito.pdf"
+msgstr "Documento acquisito.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#. Save dialog: Filter name to show only supported image files
+#: src/app-window.vala:316
 msgid "Image Files"
 msgstr "File immagine"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/app-window.vala:326
 msgid "All Files"
 msgstr "Tutti i file"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/app-window.vala:335
 msgid "PDF (multi-page document)"
 msgstr "PDF (documento multi-pagina)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/app-window.vala:341
 msgid "JPEG (compressed)"
 msgstr "JPEG (compresso)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/app-window.vala:347
 msgid "PNG (lossless)"
-msgstr "PNG (senza perdita di qualità)"
+msgstr "PNG (senza perdita)"
+
+#. Save dialog: Label for sabing in WEBP format
+#: src/app-window.vala:354
+#| msgid "JPEG (compressed)"
+msgid "WebP (compressed)"
+msgstr "WebP (compresso)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
+#: src/app-window.vala:364
 msgid "File format:"
 msgstr "Formato file:"
 
+#. Label in save dialog beside compression slider
+#: src/app-window.vala:376
+msgid "Compression:"
+msgstr "Compressione:"
+
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/app-window.vala:470
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr "Un file con il nome «%s» esiste già. Sostituirlo?"
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/app-window.vala:473
+msgid "_Replace"
+msgstr "_Sostituisci"
+
+#: src/app-window.vala:512
+msgid "Saving"
+msgstr "Salvataggio"
+
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/app-window.vala:527
 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
-msgid "If you don't save, changes will be permanently lost."
-msgstr "Se non si salva le modifiche andranno perse per sempre."
+#: src/app-window.vala:550
+#| msgid "If you don't save, changes will be permanently lost."
+msgid "If you don’t save, changes will be permanently lost."
+msgstr "Se non si salva, le modifiche saranno perse per sempre."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:708
+#: src/app-window.vala:591
 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/app-window.vala:593
 msgid "Discard Changes"
 msgstr "Scarta le modifiche"
 
+#. Label shown when scan started
+#: src/app-window.vala:692
+#| msgid "Change _Scanner"
+msgid "Contacting scanner…"
+msgstr "Scanner in contatto…"
+
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/app-window.vala:800
 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/app-window.vala:812
 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/app-window.vala:990
 msgid "Combine sides"
 msgstr "Unisci lati"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/app-window.vala:1000
 msgid "Combine sides (reverse)"
 msgstr "Unisci lati (inverso)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/app-window.vala:1010
 msgid "Reverse"
 msgstr "Inverso"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/app-window.vala:1020
 msgid "Keep unchanged"
 msgstr "Mantieni non modificato"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/app-window.vala:1250
 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/app-window.vala:1271
 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,457 +547,529 @@ 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 ""
-"Questo programma è software libero; è possibile ridistribuirlo e/o "
-"modificarlo\n"
-"secondo i termini della licenza GNU General Public License, come pubblicata\n"
-"dalla Free Software Foundation; versione 2 della Licenza, o (a scelta) una\n"
-"versione più recente.\n"
+"Questo programma è software libero; è possibile ridistribuirlo e/o\n"
+"modificarlo secondo i termini della GNU General Public License come\n"
+"pubblicato dalla Free Software Foundation; sia la versione 3 della\n"
+"licenza, o (a propria scelta) una versione successiva.\n"
 "\n"
-"Questo programma è distribuito nella speranza che possa risultare utile,\n"
-"ma SENZA ALCUNA GARANZIA, nemmeno la garanzia implicita di \n"
-"COMMERCIABILITÀ o APPLICABILITÀ PER UNO SCOPO PARTICOLARE. Per\n"
-"maggiori dettagli consultare la GNU General Public License.\n"
+"Questo programma è distribuito nella speranza che sia utile,\n"
+"ma SENZA ALCUNA GARANZIA, nemmeno la garanzia implicita di\n"
+"COMMERCIABILITÀ o IDONEITÀ PER UN PARTICOLARE SCOPO. Vedere la\n"
+"GNU General Public License per ulteriori dettagli.\n"
 "\n"
-"La traduzione in Italiano di questa licenza è solo a fini informativi. Per "
-"la licenza in Inglese con validità legale consultate "
-"<http://www.gnu.org/licenses/>."
+"Dovreste aver ricevuto una copia della GNU General Public License\n"
+"con questo programma. In caso contrario, vedere <http://www.gnu.org/licenses/"
+">."
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/app-window.vala:1274
 msgid "About Simple Scan"
 msgstr "Informazioni su Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/app-window.vala:1277
 msgid "Simple document scanning tool"
 msgstr "Semplice strumento per l'acquisizione di documenti"
 
-#: ../src/ui.vala:1487
+#: src/app-window.vala:1286
 msgid "translator-credits"
 msgstr ""
-"Launchpad Contributions:\n"
-"  Alberto https://launchpad.net/~pajeronda\n"
-"  Alessio Treglia https://launchpad.net/~quadrispro\n"
-"  Claudio Arseni https://launchpad.net/~claudio.arseni\n"
-"  DM74S https://launchpad.net/~danielsan474\n"
-"  Daniele Napolitano https://launchpad.net/~dnax88\n"
-"  Daniele Sapino https://launchpad.net/~daniele-sapino\n"
-"  Federico https://launchpad.net/~federico+\n"
-"  Federico Foschini https://launchpad.net/~undicizeri\n"
-"  Giasone https://launchpad.net/~giasone\n"
-"  Giovanni Mottola https://launchpad.net/~trottola-deactivatedaccount\n"
-"  Leonardo Corato https://launchpad.net/~leocor\n"
-"  Luca Reverberi https://launchpad.net/~socketreve\n"
-"  Marco Lazzaroni https://launchpad.net/~marcolazzaroni\n"
-"  Milo Casagrande https://launchpad.net/~milo\n"
-"  Paolo Sammicheli https://launchpad.net/~xdatap1\n"
-"  Sergio Santoro https://launchpad.net/~tauer92\n"
-"  Vincenzo Ninni https://launchpad.net/~wampon\n"
-"  alexinfurs https://launchpad.net/~alexinfurs\n"
-"  lory https://launchpad.net/~lorenzo-themax\n"
-"  matrobriva https://launchpad.net/~matrobriva\n"
-"  phede92 https://launchpad.net/~phede92"
+"Gianvito Cavasoli <gianvito@gmx.it>\n"
+"\n"
+"...e un ringraziamento ai precedenti traduttori da Rosetta."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/app-window.vala:1308
 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
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:1310
 msgid "Quit without Saving"
 msgstr "Esci senza salvare"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/app-window.vala:1357
 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/app-window.vala:1359
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.brother.com\">Brother website</a>."
+"Drivers for this are available on the <a href=\"http://support.brother.com"
+"\">Brother website</a>."
 msgstr ""
-"I driver per questo dispositivo sono disponibili sul <a "
-"href=\"http://support.brother.com\">sito web Brother</a>."
+"I driver per questo dispositivo sono disponibili sul <a href=\"http://"
+"support.brother.com\">sito web Brother</a>."
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/app-window.vala:1363
 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/app-window.vala:1365
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://samsung.com/support\">Samsung website</a>."
+"Drivers for this are available on the <a href=\"http://samsung.com/support"
+"\">Samsung website</a>."
 msgstr ""
-"I driver per questo dispositivo sono disponibili sul <a "
-"href=\"http://samsung.com/support\">sito web Samsung</a>."
+"I driver per questo dispositivo sono disponibili sul <a href=\"http://"
+"samsung.com/support\">sito web Samsung</a>."
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/app-window.vala:1369
 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/app-window.vala:1374
 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/app-window.vala:1376
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.epson.com\">Epson website</a>."
+"Drivers for this are available on the <a href=\"http://support.epson.com"
+"\">Epson website</a>."
 msgstr ""
 "I driver sono disponibili dal <a href=\"http://support.epson.com\">sito web "
 "Epson</a>."
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/app-window.vala:1380
 msgid "Install drivers"
-msgstr "Installazione dei driver"
+msgstr "Installare i driver"
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/app-window.vala:1411
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
-"Una volta completata l'installazione sarà necessario riavviare Simple Scan."
+"Una volta completata l'installazione sarà necessario riavviare "
+"l'applicazione."
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
-msgid "Installing drivers..."
-msgstr "Installazione dei driver..."
+#: src/app-window.vala:1423
+#| msgid "Installing drivers..."
+msgid "Installing drivers…"
+msgstr "Installazione dei driver…"
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/app-window.vala:1431
 msgid "Drivers installed successfully!"
 msgstr "Driver installati con successo."
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/app-window.vala:1441
 #, 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/app-window.vala:1447
 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/app-window.vala:1454
 #, 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
-#, c-format
-msgid "%d dpi (default)"
-msgstr "%d dpi (predefinita)"
-
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../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
-#, 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
-#, c-format
-msgid "%d dpi"
-msgstr "%d dpi"
-
-#: ../src/ui.vala:1835
-msgid "New Document"
-msgstr "Nuovo documento"
-
-#: ../src/ui.vala:1840
-msgid "Document"
-msgstr "Documento"
-
-#: ../src/ui.vala:1844
-msgid "Email..."
-msgstr "Email..."
+#| msgid "You need to install the %s package(s)."
+msgid "You need to install the %s package."
+msgid_plural "You need to install the %s packages."
+msgstr[0] "È necessario installare il pacchetto %s."
+msgstr[1] "È necessario installare i pacchetti %s."
+
+#. Title of preferences dialog
+#: src/app-window.vala:1568 src/app-window.vala:1591
+#: src/preferences-dialog.ui:53
+msgid "Preferences"
+msgstr "Preferenze"
 
-#: ../src/ui.vala:1845
-msgid "Print..."
-msgstr "Stampa..."
+#: src/app-window.vala:1572
+msgid "Keyboard Shortcuts"
+msgstr "Scorciatoie da tastiera"
 
-#: ../src/ui.vala:1853
+#: src/app-window.vala:1573
 msgid "Help"
 msgstr "Aiuto"
 
-#: ../src/ui.vala:1854
+#: src/app-window.vala:1574
 msgid "About"
 msgstr "Informazioni"
 
-#: ../src/ui.vala:1855
+#: src/app-window.vala:1575
 msgid "Quit"
 msgstr "Esci"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
-msgid "Change _Scanner"
-msgstr "Cambia _scanner"
+#: src/app-window.vala:1589
+#| msgid "_Email"
+msgid "Email"
+msgstr "Email"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
-msgid "_Install Drivers"
-msgstr "_Installa driver"
+#. Populate ActionBar (not supported in Glade)
+#. https://bugzilla.gnome.org/show_bug.cgi?id=769966
+#. Label on new document button
+#: src/app-window.vala:1599
+msgid "Start Again…"
+msgstr "Avvia di nuovo…"
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
-msgid "Automatic"
-msgstr "Automatico"
+#. Tooltip for rotate left (counter-clockwise) button
+#: src/app-window.vala:1616
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Ruota la pagina a sinistra (senso antiorario)"
 
-#: ../src/ui.vala:1947
-msgid "Darker"
-msgstr "Più scura"
+#. Tooltip for rotate right (clockwise) button
+#: src/app-window.vala:1623
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Ruota la pagina a destra (senso orario)"
 
-#: ../src/ui.vala:1949
-msgid "Lighter"
-msgstr "Più chiara"
+#. Tooltip for crop button
+#: src/app-window.vala:1633
+msgid "Crop the selected page"
+msgstr "Ritaglia la pagina selezionata"
 
-#: ../src/ui.vala:1957
-msgid "Less"
-msgstr "Minore"
+#. Tooltip for delete button
+#: src/app-window.vala:1649
+#| msgid "Crop the selected page"
+msgid "Delete the selected page"
+msgstr "Elimina la pagina selezionata"
 
-#: ../src/ui.vala:1959
-msgid "More"
-msgstr "Maggiore"
+#. Text of button for cancelling save
+#: src/app-window.vala:1814
+#| msgid "_Cancel"
+msgid "Cancel"
+msgstr "Annulla"
 
-#: ../src/ui.vala:1967
-msgid "Minimum"
-msgstr "Minima"
+#. Button to submit authorization dialog
+#: src/authorize-dialog.ui:25
+msgid "_Authorize"
+msgstr "_Autorizza"
 
-#: ../src/ui.vala:1969
-msgid "Maximum"
-msgstr "Massima"
+#. Label beside username entry
+#: src/authorize-dialog.ui:99
+msgid "_Username for resource:"
+msgstr "_Nome utente per la risorsa:"
 
-#: ../src/ui.vala:2008
-msgid "Saving document..."
-msgstr "Salvataggio del documento..."
+#. Label beside password entry
+#: src/authorize-dialog.ui:112
+msgid "_Password:"
+msgstr "Pass_word:"
 
-#: ../src/ui.vala:2173
+#: src/book.vala:331 src/book.vala:337
 #, c-format
-msgid "Saving page %d out of %d"
-msgstr "Salvataggio pagina %d di %d"
-
-#~ msgid "4&#xD7;6"
-#~ msgstr "4&#xD7;6"
-
-#~ msgid "Files missing"
-#~ msgstr "File mancanti"
+#| msgid "Unable to open help file"
+msgid "Unable to encode page %i"
+msgstr "Impossibile codificare la pagina %i"
+
+#: src/help-overlay.ui:12
+#| msgid "Scan"
+msgctxt "shortcut window"
+msgid "Scanning"
+msgstr "Acquisizione"
+
+#: src/help-overlay.ui:17
+#| msgid "Scan a single page from the scanner"
+msgctxt "shortcut window"
+msgid "Scan a single page"
+msgstr "Acquisisce una pagina singola"
+
+#: src/help-overlay.ui:24
+#| msgid "Scan a single page from the scanner"
+msgctxt "shortcut window"
+msgid "Scan all pages from document feeder"
+msgstr "Acquisisce tutte le pagine dall'alimentatore automatico di documenti "
+
+#: src/help-overlay.ui:31
+#| msgid "Scan a single page from the scanner"
+msgctxt "shortcut window"
+msgid "Scan continuously from a flatbed scanner"
+msgstr "Acquisisce continuamente da uno scanner"
+
+#: src/help-overlay.ui:38
+msgctxt "shortcut window"
+msgid "Stop scan in progress"
+msgstr "Interrompe l'acquisizione in corso"
 
-#~ msgid "Window height in pixels"
-#~ msgstr "Altezza della finestra in pixel"
+#: src/help-overlay.ui:46
+#| msgid "Document Scanner"
+msgctxt "shortcut window"
+msgid "Document Modification"
+msgstr "Modifiche al documento"
+
+#: src/help-overlay.ui:51
+#| msgid "Move Left"
+msgctxt "shortcut window"
+msgid "Move page left"
+msgstr "Sposta la pagina a sinistra"
+
+#: src/help-overlay.ui:58
+#| msgid "Move Right"
+msgctxt "shortcut window"
+msgid "Move page right"
+msgstr "Sposta la pagina a destra"
+
+#: src/help-overlay.ui:65
+#| msgid "Rotate the page to the left (counter-clockwise)"
+msgctxt "shortcut window"
+msgid "Rotate page to the left (anti-clockwise)"
+msgstr "Ruota la pagina a sinistra (senso antiorario)"
 
-#~ msgid "Window width in pixels"
-#~ msgstr "Larghezza della finestra in pixel"
+#: src/help-overlay.ui:72
+#| msgid "Rotate the page to the right (clockwise)"
+msgctxt "shortcut window"
+msgid "Rotate page to the right (clockwise)"
+msgstr "Ruota la pagina a destra (senso orario)"
 
-#~ msgid "Height of scanned image in pixels"
-#~ msgstr "Altezza dell'immagine acquisita in pixel"
+#: src/help-overlay.ui:79
+#| msgid "Crop the selected page"
+msgctxt "shortcut window"
+msgid "Delete page"
+msgstr "Elimina la pagina"
+
+#: src/help-overlay.ui:87
+#| msgid "Document Scanner"
+msgctxt "shortcut window"
+msgid "Document Management"
+msgstr "Gestione del documento"
+
+#: src/help-overlay.ui:92
+#| msgid "Start a new document"
+msgctxt "shortcut window"
+msgid "Start new document"
+msgstr "Avvia un nuovo documento"
+
+#: src/help-overlay.ui:99
+#| msgid "Scanned Document"
+msgctxt "shortcut window"
+msgid "Save scanned document"
+msgstr "Salva il documento acquisito"
+
+#: src/help-overlay.ui:106
+#| msgid "Scanned Document"
+msgctxt "shortcut window"
+msgid "Email scanned document"
+msgstr "Invia per email il documento acquisito"
+
+#: src/help-overlay.ui:113
+#| msgid "Scanned Document"
+msgctxt "shortcut window"
+msgid "Print scanned document"
+msgstr "Stampa il documento acquisito"
+
+#: src/help-overlay.ui:120
+msgctxt "shortcut window"
+msgid "Copy current page to clipboard"
+msgstr "Copia l'attuale pagina negli appunti"
 
-#~ msgid "Direction of scan"
-#~ msgstr "Direzione dell'acquisizione"
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:113
+#| msgid "Change _Scanner"
+msgid "_Scanner"
+msgstr "_Scanner"
 
-#~ msgid "Resolution of last scanned image"
-#~ msgstr "Risoluzione dell'ultima immagine acquisita"
+#. Label beside scan side combo box
+#: src/preferences-dialog.ui:143
+#| msgid "Scan Side:"
+msgid "Scan Sides"
+msgstr "Lati acquisizione"
 
-#~ msgid "Width of scanned image in pixels"
-#~ msgstr "Larghezza dell'immagine acquisita in pixel"
+#. Label beside page size combo box
+#: src/preferences-dialog.ui:160
+#| msgid "Page Size:"
+msgid "Page Size"
+msgstr "Dimensione pagina"
 
-#~ msgid "Select File _Type"
-#~ msgstr "Seziona il _tipo di file"
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:191
+msgid "Front"
+msgstr "Fronte"
 
-#~ msgid "Resolution for text scans"
-#~ msgstr "Risoluzione per acquisizione testo"
+#. Preferences Dialog: Toggle button to select scanning on the back side of a page
+#: src/preferences-dialog.ui:206
+msgid "Back"
+msgstr "Retro"
 
-#~ msgid "Resolution for photo scans"
-#~ msgstr "Risoluzione per acquisizione foto"
+#. Preferences Dialog: Toggle button to select scanning on both sides of a page
+#: src/preferences-dialog.ui:221
+msgid "Both"
+msgstr "Entrambi"
+
+#. Label beside page delay scale
+#: src/preferences-dialog.ui:260
+msgid "Delay"
+msgstr "Ritardo"
+
+#. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
+#: src/preferences-dialog.ui:276
+msgid "Multiple pages from flatbed"
+msgstr "Pagine multiple dallo scanner"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:295
+msgid "3"
+msgstr "3"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:310
+msgid "5"
+msgstr "5"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:326
+msgid "7"
+msgstr "7"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:342
+msgid "10"
+msgstr "10"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:358
+msgid "15"
+msgstr "15"
+
+#. Label after page delay radio buttons
+#: src/preferences-dialog.ui:385
+msgid "Seconds"
+msgstr "Secondi"
+
+#. Preferences Dialog: Tab label for scanning settings
+#: src/preferences-dialog.ui:413
+#| msgid "Scan"
+msgid "Scanning"
+msgstr "Acquisizione"
 
-#~ msgid "Type of document being scanned"
-#~ msgstr "Tipo del documento da acquisire"
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:436
+#| msgid "_Text Resolution:"
+msgid "_Text Resolution"
+msgstr "Risoluzione _testo"
 
-#~ msgid ""
-#~ "The width of scanned image in pixels. This value is updated to what the last "
-#~ "scanned page was."
-#~ msgstr ""
-#~ "Larghezza dell'immagine acquisita in pixel. Questo valore è aggiornato "
-#~ "all'ultima acquisizione."
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:452
+#| msgid "_Photo Resolution:"
+msgid "_Photo Resolution"
+msgstr "Risoluzione _foto"
 
-#~ msgid ""
-#~ "The height of scanned image in pixels. This value is updated to what the "
-#~ "last scanned page was."
-#~ msgstr ""
-#~ "Altezza dell'immagine acquisita in pixel. Questo valore è aggiornato "
-#~ "all'ultima acquisizione."
+#. Label beside brightness scale
+#: src/preferences-dialog.ui:505
+#| msgid "Brightness:"
+msgid "Brightness"
+msgstr "Luminosità"
 
-#~ msgid "The resolution in dots-per-inch of the previously scanned image."
-#~ msgstr ""
-#~ "La risoluzione in punti per pollice del documento precedentemente acquisito."
+#. Label beside contrast scale
+#: src/preferences-dialog.ui:521
+#| msgid "Contrast:"
+msgid "Contrast"
+msgstr "Contrasto"
 
-#~ msgid "The resolution in dots-per-inch to use when scanning text."
-#~ msgstr ""
-#~ "La risoluzione in punti per pollice da usare per l'acquisizione di testi."
+#. Preferences Dialog: Tab for quality settings
+#: src/preferences-dialog.ui:576
+#| msgid "Quality:"
+msgid "Quality"
+msgstr "Qualità"
 
-#~ msgid "Scanned Document"
-#~ msgstr "Documento acquisito"
+#. Combo box value for automatic paper size
+#: src/preferences-dialog.vala:77
+msgid "Automatic"
+msgstr "Automatico"
 
-#~ msgid "Directory to save files to"
-#~ msgstr "Directory dove salvare i file"
+#: src/preferences-dialog.vala:116
+msgid "Darker"
+msgstr "Più scura"
 
-#~ msgid "Device to scan from"
-#~ msgstr "Dispositivo di acquisizione"
+#: src/preferences-dialog.vala:118
+msgid "Lighter"
+msgstr "Più chiara"
 
-#~ msgid "SANE device to acquire images from."
-#~ msgstr "Dispositivo SANE da cui acquisire le immagini."
+#: src/preferences-dialog.vala:126
+msgid "Less"
+msgstr "Minore"
 
-#~ msgid "TRUE if the application window is maximized"
-#~ msgstr "VERO se la finestra dell'applicazione è massimizzata"
+#: src/preferences-dialog.vala:128
+msgid "More"
+msgstr "Maggiore"
 
-#~ msgid ""
-#~ "The direction of the scanner across the scanned page. It can be one of the "
-#~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
-#~ msgstr ""
-#~ "La direzione di acquisizione. Può essere uno dei seguenti valori: \"top-to-"
-#~ "bottom\" (dall'alto in basso), \"bottom-to-top\" (dal basso in alto), \"left-"
-#~ "to-right\" (da sinistra a destra), \"right-to-left\" (da destra a sinistra)"
+#. Preferences dialog: Label for default resolution in resolution list
+#: src/preferences-dialog.vala:440
+#, c-format
+msgid "%d dpi (default)"
+msgstr "%d dpi (predefinita)"
 
-#~ msgid "The resolution in dots-per-inch to use when scanning photos."
-#~ msgstr ""
-#~ "La risoluzione in punti per pollice da usare per l'acquisizione di foto."
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: src/preferences-dialog.vala:443
+#, c-format
+msgid "%d dpi (draft)"
+msgstr "%d dpi (bozza)"
 
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: src/preferences-dialog.vala:446
 #, c-format
-#~ msgid ""
-#~ "Usage:\n"
-#~ "  %s [DEVICE...] - Scanning utility"
-#~ msgstr ""
-#~ "Uso:\n"
-#~ "  %s [DISPOSITIVO...] - Strumento di acquisizione"
+msgid "%d dpi (high resolution)"
+msgstr "%d dpi (alta risoluzione)"
 
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: src/preferences-dialog.vala:449
 #, c-format
-#~ msgid ""
-#~ "Help Options:\n"
-#~ "  -d, --debug                     Print debugging messages\n"
-#~ "  -v, --version                   Show release version\n"
-#~ "  -h, --help                      Show help options\n"
-#~ "  --help-all                      Show all help options\n"
-#~ "  --help-gtk                      Show GTK+ options"
-#~ msgstr ""
-#~ "Opzioni d'aiuto:\n"
-#~ "  -d, --debug Visualizza i messaggi di debug\n"
-#~ "  -v, --version Mostra la versione in uso\n"
-#~ "  -h, --help Mostra il menù di aiuto\n"
-#~ "  --help-all Mostra il menù di aiuto completo\n"
-#~ "  --help-gtk Mostra le opzioni di GTK+"
+msgid "%d dpi"
+msgstr "%d dpi"
 
+#. Error displayed when no scanners to scan with
+#: src/scanner.vala:844
+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:874
+msgid "Unable to connect to scanner"
+msgstr "Impossibile connettersi allo scanner"
+
+#. Error display when unable to start scan
+#: src/scanner.vala:1227
+msgid "Unable to start scan"
+msgstr "Impossibile avviare l'acquisizione"
+
+#. Error displayed when communication with scanner broken
+#: src/scanner.vala:1240 src/scanner.vala:1340
+msgid "Error communicating with scanner"
+msgstr "Errore di comunicazione con lo scanner"
+
+#. Help string for command line --version flag
+#: 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
+msgid "Print debugging messages"
+msgstr "Stampa i messaggi di debug"
+
+#: 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 dell'applicazione"
+
+#. Title of error dialog when scan failed
+#: src/simple-scan.vala:392
+msgid "Failed to scan"
+msgstr "Acquisizione non riuscita"
+
+#. Attempt to inhibit the screensaver when scanning
+#: src/simple-scan.vala:407
+msgid "Scan in progress"
+msgstr "Acquisizione in corso"
+
+#. Arguments and description for --help text
+#: src/simple-scan.vala:584
+#| msgid "[DEVICE...] - Scanning utility"
+msgid "[DEVICE…] — Scanning utility"
+msgstr "[DISPOSITIVO…] - Strumento per l'acquisizione"
+
+#. Text printed out when an unknown command-line argument provided
+#: src/simple-scan.vala:595
 #, c-format
-#~ msgid ""
-#~ "GTK+ Options:\n"
-#~ "  --class=CLASS                   Program class as used by the window "
-#~ "manager\n"
-#~ "  --name=NAME                     Program name as used by the window "
-#~ "manager\n"
-#~ "  --screen=SCREEN                 X screen to use\n"
-#~ "  --sync                          Make X calls synchronous\n"
-#~ "  --gtk-module=MODULES            Load additional GTK+ modules\n"
-#~ "  --g-fatal-warnings              Make all warnings fatal"
-#~ msgstr ""
-#~ "Opzioni GTK+:\n"
-#~ "  --class=CLASS                   Classe del programma utilizzata dal "
-#~ "gestore di finestre\n"
-#~ "  --name=NAME                     Nome del programma utilizzato dal gestore "
-#~ "di finestre\n"
-#~ "  --screen=SCREEN                 Screen X da utilizzare\n"
-#~ "  --sync                          Rende le chiamate a X sincrone\n"
-#~ "  --gtk-module=MODULES            Carica moduli GTK+ aggiuntivi\n"
-#~ "  --g-fatal-warnings              Rende fatali tutti gli avvertimenti"
-
-#~ msgid "Please check your installation"
-#~ msgstr "Verificare l'installazione"
-
-#~ msgid ""
-#~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
-#~ msgstr ""
-#~ "I lati della pagina da acquisire. Può essere uno dei seguenti: \"entrambi\" "
-#~ "\"fronte\" \"retro\""
-
-#~ msgid "Page side to scan"
-#~ msgstr "Lato della pagina da acquisire"
-
-#~ msgid "Height of paper in tenths of a mm"
-#~ msgstr "Altezza del foglio in decimi di mm"
-
-#~ msgid "Width of paper in tenths of a mm"
-#~ msgstr "Larghezza del foglio in decimi di mm"
-
-#~ msgid ""
-#~ "Type of document being scanned. 'text' for text documents, 'photo' for "
-#~ "photos. This setting decides on the scan resolution, colors and post-"
-#~ "processing."
-#~ msgstr ""
-#~ "Tipo di documento da acquisire. \"text\" per documenti di testo, \"photo\" "
-#~ "per fotografie. Questa impostazione influenza la risoluzione "
-#~ "dell'acquisizione, le impostazioni di colore e la post-produzione."
-
-#~ msgid "The page side to scan."
-#~ msgstr "Lato della pagina da acquisire."
-
-#~ msgid "The direction of the scanner across the scanned page."
-#~ msgstr "La direzione dell'acquisizione lungo la pagina."
-
-#~ msgid ""
-#~ "Type of document being scanned. This setting decides on the scan resolution, "
-#~ "colors and post-processing."
-#~ msgstr ""
-#~ "Tipo del documento da acquisire. Questa impostazione influenza la "
-#~ "risoluzione, il numero dei colori e l'elaborazione successiva "
-#~ "all'acquisizione."
-
-#~ msgid ""
-#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
-#~ msgstr ""
-#~ "L'altezza del foglio in decimi di mm  (0 per il rilevamento automatico)."
-
-#~ msgid ""
-#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
-#~ msgstr ""
-#~ "Altezza del foglio in decimi di mm (0 per il rilevamento automatico)."
-
-#~ msgid ""
-#~ "The directory to save files to. Defaults to the documents directory if unset."
-#~ msgstr ""
-#~ "La directory dove salvare i file. Il valore predefinito è la directory dei "
-#~ "documenti."
-
-#~ msgid "Contrast of scan"
-#~ msgstr "Contrasto dell'acquisizione"
-
-#~ msgid "Brightness of scan"
-#~ msgstr "Luminosità dell'acquisizione"
-
-#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
-#~ msgstr "La regolazione del contrasto da -100 a 100 (0 per alcun contrasto)."
-
-#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
-#~ msgstr ""
-#~ "La regolazione della luminosità da -100 a 100 (0 per alcuna luminosità)."
-
-#~ msgid "Quality value to use for JPEG compression."
-#~ msgstr "Indica il valore della qualità per la compressione JPEG"
-
-#~ msgid "Quality value to use for JPEG compression"
-#~ msgstr "Indica il valore della qualità per la compressione JPEG"
+#| msgid ""
+#| "Run '%s --help' to see a full list of available command line options."
+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."
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..42f9777 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,296 +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"
+"POT-Creation-Date: 2017-04-16 08:54-0400\n"
 "PO-Revision-Date: 2014-11-20 05:14+0000\n"
 "Last-Translator: Kentaro Kazuhama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
+"Language: ja\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-25 06:10+0000\n"
+"X-Generator: Launchpad (build 18361)\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: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 "ドキュメント(_D)"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/simple-scan.ui:266
 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:279 src/simple-scan.ui:1343 src/simple-scan.ui:1402
 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:289 src/simple-scan.ui:1352 src/simple-scan.ui:1411
 msgid "All Pages From _Feeder"
 msgstr "フィーダより全てのページ(_F)"
 
+#. 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 "スキャン停止(_S)"
 
-#: 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
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: 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 "電子メール(_E)"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:436
 msgid "_Page"
 msgstr "ページ(_P)"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:446
 msgid "Rotate _Left"
 msgstr "左へ回転(_L)"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:456
 msgid "Rotate _Right"
 msgstr "右へ回転(_R)"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:466
 msgid "_Crop"
 msgstr "切り抜き(_C)"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:476
 msgid "_None"
 msgstr "なし(_N)"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:487
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:498
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:509
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:520
 msgid "_Letter"
 msgstr "US レター(_L)"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:531
 msgid "Le_gal"
 msgstr "US リーガル(_G)"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:542
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:553
 msgid "_Custom"
 msgstr "カスタム(_C)"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:571
 msgid "_Rotate Crop"
 msgstr "切り抜きを回転(_R)"
 
 #. 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 "ヘルプ(_H)"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:638
 msgid "_Contents"
 msgstr "コンテンツ(_C)"
 
 #. 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 "ドキュメントをファイルに保存"
 
-#: ../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 "切り抜き"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: 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 "スキャンする対象(_O):"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1085
 msgid "_Text Resolution:"
 msgstr "テキストの画素数(_T):"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1101
 msgid "_Photo Resolution:"
 msgstr "写真の画素数(_P):"
 
 #. 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 "ドキュメントをスキャンします"
 
@@ -308,7 +322,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 +332,207 @@ 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:844
 msgid "No scanners available.  Please connect a scanner."
 msgstr "利用可能なスキャナがありません。スキャナを接続してください。"
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:874
 msgid "Unable to connect to scanner"
 msgstr "スキャナに接続できません"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1227
 msgid "Unable to start scan"
 msgstr "スキャンを開始できません"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: 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
+#: 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:332 src/ui.vala:1655 src/ui.vala:1935
 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:341
 #, 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:389
 msgid "No scanners detected"
 msgstr "スキャナが検出されていません"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:391
 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:396
 msgid "Additional software needed"
 msgstr "追加ソフトウェアが必要です"
 
 #. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:398
 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: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 "キャンセル(_C)"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:514 src/ui.vala:724
 msgid "_Save"
 msgstr "保存(_S)"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:522
 msgid "Scanned Document.pdf"
 msgstr "スキャンされたドキュメント.pdf"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:528
 msgid "Image Files"
 msgstr "画像ファイル"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:534
 msgid "All Files"
 msgstr "すべてのファイル"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:543
 msgid "PDF (multi-page document)"
 msgstr "PDF (複数ページ)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:549
 msgid "JPEG (compressed)"
 msgstr "JPEG (圧縮済み)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:555
 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: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:650
+#: src/ui.vala:698
 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:721
 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:763
 msgid "Save current document?"
 msgstr "現在のドキュメントを保存しますか?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:765
 msgid "Discard Changes"
 msgstr "変更を破棄"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:1056
 msgid "Unable to save image for preview"
 msgstr "プレビュー用の画像を保存できません"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1068
 msgid "Unable to open image preview application"
 msgstr "画像プレビューアプリケーションを開けませんでした"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1270
 msgid "Combine sides"
 msgstr "面を結合"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1280
 msgid "Combine sides (reverse)"
 msgstr "面を結合(逆順)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1290
 msgid "Reverse"
 msgstr "逆順"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1300
 msgid "Keep unchanged"
 msgstr "無変更を維持"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1504
 msgid "Unable to open help file"
 msgstr "ヘルプファイルを開くことができません"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: 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"
@@ -536,20 +561,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:1528
 msgid "About Simple Scan"
 msgstr "Simple Scan について"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1531
 msgid "Simple document scanning tool"
 msgstr "ドキュメントのスキャンを行うシンプルなツールです"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1540
 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 +587,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:1562
 msgid "Save document before quitting?"
 msgstr "終了する前にドキュメントを保存しますか?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1564
 msgid "Quit without Saving"
 msgstr "保存せずに終了"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1632
 msgid "You appear to have a Brother scanner."
 msgstr "ブラザー製スキャナーを見つけました。"
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1634
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
@@ -586,12 +611,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:1638
 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:1640
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
@@ -600,17 +625,17 @@ msgstr ""
 "から入手できます。"
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1644
 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:1649
 msgid "You appear to have an Epson scanner."
 msgstr "エプソン製スキャナーを見つけました。"
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1651
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
@@ -618,138 +643,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:1655
 msgid "Install drivers"
 msgstr "ドライバーのインストール手順"
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1686
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "ドライバーのインストール後、シンプル スキャンを再起動する必要があります。"
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1698
 msgid "Installing drivers..."
 msgstr "ドライバーをインストールしています..."
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1706
 msgid "Drivers installed successfully!"
 msgstr "ドライバーのインストールに成功しました!"
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1716
 #, 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:1722
 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:1729
 #, 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:1833
 #, 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:1836
 #, 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:1839
 #, 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:1842
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../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 "終了"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1937
 msgid "Change _Scanner"
 msgstr "スキャナを変更(_S)"
 
 #. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1939
 msgid "_Install Drivers"
 msgstr "ドライバーをインストール (_I)"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: 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 "%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..7f2eba0 100644
--- a/po/kk.po
+++ b/po/kk.po
@@ -6,506 +6,507 @@
 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"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
+"product=simple-scan&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-06-25 08:37+0000\n"
+"PO-Revision-Date: 2017-06-25 19:23+0500\n"
+"Last-Translator: Baurzhan Muftakhidinov <baurthefirst@gmail.com>\n"
 "Language-Team: Kazakh <kk@li.org>\n"
+"Language: kk\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-25 06:10+0000\n"
+"X-Generator: Poedit 1.8.12\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#. Button to submit authorization dialog
-#: data/simple-scan.ui:24
-msgid "_Authorize"
+#: data/org.gnome.SimpleScan.gschema.xml:11
+msgid "Device to scan from"
 msgstr ""
 
-#. Label beside username entry
-#: data/simple-scan.ui:102
-msgid "_Username for resource:"
+#: data/org.gnome.SimpleScan.gschema.xml:12
+msgid "SANE device to acquire images from."
 msgstr ""
 
-#. Label beside password entry
-#: data/simple-scan.ui:117
-msgid "_Password:"
-msgstr "_Құпия сөз:"
+#: data/org.gnome.SimpleScan.gschema.xml:20
+msgid "Type of document being scanned"
+msgstr ""
 
-#. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
-msgid "Front and Back"
+#: data/org.gnome.SimpleScan.gschema.xml:21
+msgid ""
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
 msgstr ""
 
-#. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
-msgid "Front"
-msgstr "Бет жағы"
+#: data/org.gnome.SimpleScan.gschema.xml:25
+msgid "Width of paper in tenths of a mm"
+msgstr ""
 
-#. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
-msgid "Back"
-msgstr "Сырты"
+#: data/org.gnome.SimpleScan.gschema.xml:26
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+
+#: data/org.gnome.SimpleScan.gschema.xml:30
+msgid "Height of paper in tenths of a mm"
+msgstr ""
+
+#: data/org.gnome.SimpleScan.gschema.xml:31
+msgid ""
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+
+#: data/org.gnome.SimpleScan.gschema.xml:35
+msgid "Brightness of scan"
+msgstr ""
+
+#: data/org.gnome.SimpleScan.gschema.xml:36
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr ""
+
+#: data/org.gnome.SimpleScan.gschema.xml:40
+msgid "Contrast of scan"
+msgstr ""
+
+#: data/org.gnome.SimpleScan.gschema.xml:41
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr ""
+
+#: data/org.gnome.SimpleScan.gschema.xml:45
+msgid "Resolution for text scans"
+msgstr ""
+
+#: data/org.gnome.SimpleScan.gschema.xml:46
+msgid "The resolution in dots-per-inch to use when scanning text."
+msgstr ""
+
+#: data/org.gnome.SimpleScan.gschema.xml:50
+msgid "Resolution for photo scans"
+msgstr ""
+
+#: data/org.gnome.SimpleScan.gschema.xml:51
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr ""
+
+#: data/org.gnome.SimpleScan.gschema.xml:55
+msgid "Page side to scan"
+msgstr ""
+
+#: data/org.gnome.SimpleScan.gschema.xml:56
+msgid "The page side to scan."
+msgstr ""
+
+#: data/org.gnome.SimpleScan.gschema.xml:60
+msgid "Directory to save files to"
+msgstr ""
+
+#: data/org.gnome.SimpleScan.gschema.xml:61
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+
+#: data/org.gnome.SimpleScan.gschema.xml:66
+msgid "Quality value to use for JPEG compression"
+msgstr "JPEG сығуы үшін үнсіз келісім бойынша мәні"
+
+#: data/org.gnome.SimpleScan.gschema.xml:67
+msgid "Quality value to use for JPEG compression."
+msgstr "JPEG сығуы үшін үнсіз келісім бойынша мәні."
+
+#: data/org.gnome.SimpleScan.gschema.xml:72
+msgid "Delay in millisecond between pages"
+msgstr "Беттер арасындағы кідіріс уақыты, миллисекунд"
+
+#: data/org.gnome.SimpleScan.gschema.xml:73
+msgid "Delay in millisecond between pages."
+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
+#. Set HeaderBar title here because Glade doesn't keep it translated
+#. https://bugzilla.gnome.org/show_bug.cgi?id=782753
+#. Title of scan window
+#: data/simple-scan.appdata.xml.in:6 data/simple-scan.desktop.in:3
+#: src/app-window.ui:76 src/app-window.vala:1560
 msgid "Simple Scan"
 msgstr ""
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
-msgid "_Document"
+#: data/simple-scan.appdata.xml.in:7 data/simple-scan.desktop.in:5
+msgid "Scan Documents"
 msgstr ""
 
-#. Scan menu item
-#: data/simple-scan.ui:260
-msgid "Sc_an"
+#: 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 "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: data/simple-scan.appdata.xml.in:14
+msgid "Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
+#: data/simple-scan.desktop.in:4
+msgid "Document Scanner"
+msgstr ""
+
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: data/simple-scan.desktop.in:7
+msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: data/simple-scan.desktop.in:10
+msgid "scanner"
+msgstr ""
+
+#. Toolbar scan menu item to scan a single page from the scanner
 #. 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/app-window.ui:22 src/app-window.ui:123 src/app-window.ui:820
 msgid "Single _Page"
 msgstr ""
 
+#. Toolbar scan menu item to scan all pages from a document feeder
 #. 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/app-window.ui:31 src/app-window.ui:133 src/app-window.ui:829
 msgid "All Pages From _Feeder"
 msgstr ""
 
-#. Menu entry to stop current scan
-#: data/simple-scan.ui:294
-msgid "_Stop Scan"
+#. Toolbar scan menu item to scan continuously from the flatbed
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/app-window.ui:40 src/app-window.ui:143 src/app-window.ui:838
+msgid "_Multiple Pages From Flatbed"
 msgstr ""
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:853
 msgid "Text"
 msgstr "Мәтін"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:863
 msgid "Photo"
 msgstr "Фото"
 
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: src/app-window.ui:91
+msgid "_Document"
+msgstr "Құ_жат"
+
+#. Scan menu item
+#: src/app-window.ui:110
+msgid "Sc_an"
+msgstr "Ск_анерлеу"
+
+#. Menu entry to stop current scan
+#: src/app-window.ui:154
+msgid "_Stop Scan"
+msgstr "Сканерлеуді _тоқтату"
+
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/app-window.ui:196 src/app-window.vala:967 src/app-window.vala:1590
 msgid "Reorder Pages"
 msgstr ""
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/app-window.ui:215
 msgid "_Email"
 msgstr ""
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/app-window.ui:280
 msgid "_Page"
 msgstr ""
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/app-window.ui:290
 msgid "Rotate _Left"
 msgstr "_Солға бұру"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/app-window.ui:300
 msgid "Rotate _Right"
 msgstr "_Оңға бұру"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/app-window.ui:310
 msgid "_Crop"
 msgstr "Қ_иып жіберу"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/app-window.ui:320
 msgid "_None"
 msgstr "_Ешнәрсе"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/app-window.ui:331
 msgid "A_4"
-msgstr ""
+msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/app-window.ui:342
 msgid "A_5"
-msgstr ""
+msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/app-window.ui:353
 msgid "A_6"
-msgstr ""
+msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/app-window.ui:364
 msgid "_Letter"
-msgstr ""
+msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/app-window.ui:375
 msgid "Le_gal"
-msgstr ""
+msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/app-window.ui:386
 msgid "4×6"
-msgstr ""
+msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/app-window.ui:397
 msgid "_Custom"
-msgstr ""
+msgstr "Таң_дауыңызша"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/app-window.ui:415
 msgid "_Rotate Crop"
 msgstr ""
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/app-window.ui:428
 msgid "Move Left"
-msgstr ""
+msgstr "Солға жылжыту"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/app-window.ui:437
 msgid "Move Right"
-msgstr ""
+msgstr "Оңға жылжыту"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/app-window.ui:474
 msgid "_Help"
 msgstr "_Көмек"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/app-window.ui:482
 msgid "_Contents"
 msgstr "Құра_масы"
 
-#. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
-msgid "Start a new document"
-msgstr ""
-
-#: data/simple-scan.ui:675
-msgid "New"
-msgstr "Жаңа"
-
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/app-window.ui:520 src/app-window.ui:720
 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/app-window.ui:522 src/app-window.ui:716
 msgid "Scan"
 msgstr "Іздеу"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/app-window.ui:538 src/app-window.ui:787
 msgid "Save document to a file"
-msgstr ""
+msgstr "Құжатты файлға сақтау"
 
-#: ../src/ui.vala:1842
+#: src/app-window.ui:540
 msgid "Save"
 msgstr "Сақтау"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/app-window.ui:555 src/app-window.ui:700
 msgid "Stop the current scan"
 msgstr ""
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/app-window.ui:556 src/app-window.ui:697
 msgid "Stop"
 msgstr "Тоқтау"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr ""
-
-#. Label on rotate page left (anti-clockwise) item
-#: data/simple-scan.ui:750
-msgid "Rotate Left"
-msgstr "Солға бұру"
-
-#. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
-msgid "Rotate the page to the right (clockwise)"
-msgstr ""
-
-#. Label on rotate page right (clockwise) item
-#: data/simple-scan.ui:765
-msgid "Rotate Right"
-msgstr "Оңға бұру"
-
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
-msgid "Crop the selected page"
-msgstr ""
-
-#: data/simple-scan.ui:781
-msgid "Crop"
-msgstr "Қиып жіберу"
-
-#: ../src/ui.vala:1849
-msgid "Preferences"
-msgstr "Баптаулары"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1048
-msgid "Scan S_ource:"
-msgstr ""
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1079
-msgid "_Text Resolution:"
-msgstr ""
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1095
-msgid "_Photo Resolution:"
-msgstr ""
-
-#. Label beside scan side combo box
-#: data/simple-scan.ui:1139
-msgid "Scan Side:"
-msgstr ""
-
-#. Label beside page size combo box
-#: data/simple-scan.ui:1169
-msgid "Page Size:"
-msgstr ""
-
-#. Label beside brightness scale
-#: data/simple-scan.ui:1199
-msgid "Brightness:"
-msgstr ""
-
-#. Label beside contrast scale
-#: data/simple-scan.ui:1229
-msgid "Contrast:"
-msgstr ""
-
-#. Label beside quality scale
-#: data/simple-scan.ui:1260
-msgid "Quality:"
-msgstr ""
-
-#: data/simple-scan.desktop.in:4
-msgid "Document Scanner"
+#. Label shown when searching for scanners
+#: src/app-window.ui:611
+msgid "Searching for Scanners…"
 msgstr ""
 
-#: data/simple-scan.desktop.in:5
-msgid "Scan Documents"
-msgstr ""
+#: src/app-window.vala:237 src/app-window.vala:1380
+msgid "_Close"
+msgstr "_Жабу"
 
-#: data/simple-scan.desktop.in:6
-msgid "scan;scanner;flatbed;adf;"
+#. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
+#: src/app-window.vala:246
+#, c-format
+msgid "Username and password required to access “%s”"
 msgstr ""
 
-#: data/simple-scan.desktop.in:8
-msgid "scanner"
+#. Label shown when detected a scanner
+#: src/app-window.vala:266 src/app-window.vala:584
+msgid "Ready to Scan"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:8
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: src/app-window.vala:273
+msgid "Additional software needed"
 msgstr ""
 
-#: data/simple-scan.appdata.xml.in:13
+#. Instructions to install driver software
+#: src/app-window.vala:275
 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
-msgid "No scanners available.  Please connect a scanner."
-msgstr ""
-
-#. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
-msgid "Unable to connect to scanner"
-msgstr ""
-
-#. Error display when unable to start scan
-#: ../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
-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 ""
-
-#: ../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
-msgid "Failed to scan"
-msgstr ""
-
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
-msgid "[DEVICE...] - Scanning utility"
-msgstr ""
-
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
-#, c-format
-msgid "Run '%s --help' to see a full list of available command line options."
-msgstr ""
-
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
-msgid "_Close"
-msgstr ""
-
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
-#, c-format
-msgid "Username and password required to access '%s'"
+"You need to <a href=\"install-firmware\">install driver software</a> for "
+"your scanner."
 msgstr ""
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/app-window.vala:281
 msgid "No scanners detected"
-msgstr ""
+msgstr "Сканерлер табылмады"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/app-window.vala:283
 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
-msgid "Additional software needed"
-msgstr ""
-
-#. Instructions to install driver software
-#: ../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
-msgid "Save As..."
-msgstr "Қалайша сақтау..."
+#: src/app-window.vala:298
+msgid "Save As…"
+msgstr "Қалайша сақтау…"
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/app-window.vala:301 src/app-window.vala:471 src/app-window.vala:552
 msgid "_Cancel"
-msgstr ""
+msgstr "_Бас тарту"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/app-window.vala:302 src/app-window.vala:553
 msgid "_Save"
-msgstr ""
+msgstr "_Сақтау"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/app-window.vala:310
 msgid "Scanned Document.pdf"
-msgstr ""
+msgstr "Сканерленген құжат.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#. Save dialog: Filter name to show only supported image files
+#: src/app-window.vala:316
 msgid "Image Files"
-msgstr ""
+msgstr "Сурет файлдары"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/app-window.vala:326
 msgid "All Files"
 msgstr "Бүкіл файлдар"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/app-window.vala:335
 msgid "PDF (multi-page document)"
-msgstr ""
+msgstr "PDF (көпбетті құжат)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/app-window.vala:341
 msgid "JPEG (compressed)"
-msgstr ""
+msgstr "JPEG (сығылған)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/app-window.vala:347
 msgid "PNG (lossless)"
-msgstr ""
+msgstr "PNG (жоғалтусыз)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#. Save dialog: Label for sabing in WEBP format
+#: src/app-window.vala:354
+msgid "WebP (compressed)"
+msgstr "WebP (сығылған)"
+
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
+#: src/app-window.vala:364
 msgid "File format:"
-msgstr ""
+msgstr "Файл пішімі:"
+
+#. Label in save dialog beside compression slider
+#: src/app-window.vala:376
+msgid "Compression:"
+msgstr "Сығу:"
+
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/app-window.vala:470
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr "\"%s\" деп аталатын файл бар болып тұр. Оны алмастыруды қалайсыз ба?"
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/app-window.vala:473
+msgid "_Replace"
+msgstr "А_лмастыру"
+
+#: src/app-window.vala:512
+msgid "Saving"
+msgstr "Сақталуда"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/app-window.vala:527
 msgid "Failed to save file"
-msgstr ""
+msgstr "Файлды сақтау сәтсіз аяқталды"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
-msgid "If you don't save, changes will be permanently lost."
+#: src/app-window.vala:550
+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/app-window.vala:591
 msgid "Save current document?"
-msgstr ""
+msgstr "Ағымдағы құжатты сақтау керек пе?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/app-window.vala:593
 msgid "Discard Changes"
 msgstr "Өзгерістерді ысырып тастау"
 
+#. Label shown when scan started
+#: src/app-window.vala:692
+msgid "Contacting scanner…"
+msgstr ""
+
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/app-window.vala:800
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/app-window.vala:812
 msgid "Unable to open image preview application"
 msgstr ""
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/app-window.vala:990
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/app-window.vala:1000
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/app-window.vala:1010
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/app-window.vala:1020
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/app-window.vala:1250
 msgid "Unable to open help file"
 msgstr "Көмек ақпараты файлын ашу мүмкін емес"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/app-window.vala:1271
 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,206 +523,484 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/app-window.vala:1274
 msgid "About Simple Scan"
 msgstr ""
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/app-window.vala:1277
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.vala:1487
+#: src/app-window.vala:1286
 msgid "translator-credits"
 msgstr ""
+"Baurzhan Muftakhidinov <baurthefirst@gmail.com>\n"
 "Launchpad Contributions:\n"
 "  arruah https://launchpad.net/~arruah\n"
 "  jmb_kz https://launchpad.net/~jmb-kz"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/app-window.vala:1308
 msgid "Save document before quitting?"
 msgstr ""
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:1310
 msgid "Quit without Saving"
-msgstr ""
+msgstr "Сақтамай-ақ шығу"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/app-window.vala:1357
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/app-window.vala:1359
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.brother.com\">Brother website</a>."
+"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/app-window.vala:1363
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/app-window.vala:1365
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://samsung.com/support\">Samsung website</a>."
+"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/app-window.vala:1369
 msgid "You appear to have an HP scanner."
 msgstr ""
 
 #. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/app-window.vala:1374
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/app-window.vala:1376
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.epson.com\">Epson website</a>."
+"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/app-window.vala:1380
 msgid "Install drivers"
-msgstr ""
+msgstr "Драйверлерді орнату"
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/app-window.vala:1411
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
-msgid "Installing drivers..."
-msgstr ""
+#: src/app-window.vala:1423
+msgid "Installing drivers…"
+msgstr "Драйверлерді орнату…"
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/app-window.vala:1431
 msgid "Drivers installed successfully!"
-msgstr ""
+msgstr "Драйверлер сәтті орнатылды!"
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/app-window.vala:1441
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/app-window.vala:1447
 msgid "Failed to install drivers."
 msgstr ""
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/app-window.vala:1454
 #, c-format
-msgid "You need to install the %s package(s)."
+msgid "You need to install the %s package."
+msgid_plural "You need to install the %s packages."
+msgstr[0] ""
+
+#. Title of preferences dialog
+#: src/app-window.vala:1568 src/app-window.vala:1591
+#: src/preferences-dialog.ui:53
+msgid "Preferences"
+msgstr "Баптаулары"
+
+#: src/app-window.vala:1572
+msgid "Keyboard Shortcuts"
 msgstr ""
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
-#, c-format
-msgid "%d dpi (default)"
+#: src/app-window.vala:1573
+msgid "Help"
+msgstr "Көмек"
+
+#: src/app-window.vala:1574
+msgid "About"
+msgstr "Осы туралы"
+
+#: src/app-window.vala:1575
+msgid "Quit"
+msgstr "Шығу"
+
+#: src/app-window.vala:1589
+msgid "Email"
+msgstr "Эл. пошта"
+
+#. Populate ActionBar (not supported in Glade)
+#. https://bugzilla.gnome.org/show_bug.cgi?id=769966
+#. Label on new document button
+#: src/app-window.vala:1599
+msgid "Start Again…"
+msgstr "Қайтадан бастау…"
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: src/app-window.vala:1616
+msgid "Rotate the page to the left (counter-clockwise)"
 msgstr ""
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
-#, c-format
-msgid "%d dpi (draft)"
+#. Tooltip for rotate right (clockwise) button
+#: src/app-window.vala:1623
+msgid "Rotate the page to the right (clockwise)"
 msgstr ""
 
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
-#, c-format
-msgid "%d dpi (high resolution)"
+#. Tooltip for crop button
+#: src/app-window.vala:1633
+msgid "Crop the selected page"
 msgstr ""
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#. Tooltip for delete button
+#: src/app-window.vala:1649
+msgid "Delete the selected page"
+msgstr ""
+
+#. Text of button for cancelling save
+#: src/app-window.vala:1814
+msgid "Cancel"
+msgstr "Бас тарту"
+
+#. Button to submit authorization dialog
+#: src/authorize-dialog.ui:25
+msgid "_Authorize"
+msgstr ""
+
+#. Label beside username entry
+#: src/authorize-dialog.ui:99
+msgid "_Username for resource:"
+msgstr ""
+
+#. Label beside password entry
+#: src/authorize-dialog.ui:112
+msgid "_Password:"
+msgstr "_Құпия сөз:"
+
+#: src/book.vala:331 src/book.vala:337
 #, c-format
-msgid "%d dpi"
+msgid "Unable to encode page %i"
 msgstr ""
 
-#: ../src/ui.vala:1835
-msgid "New Document"
+#: src/help-overlay.ui:12
+msgctxt "shortcut window"
+msgid "Scanning"
+msgstr "Сканерлеу"
+
+#: src/help-overlay.ui:17
+msgctxt "shortcut window"
+msgid "Scan a single page"
 msgstr ""
 
-#: ../src/ui.vala:1840
-msgid "Document"
+#: src/help-overlay.ui:24
+msgctxt "shortcut window"
+msgid "Scan all pages from document feeder"
 msgstr ""
 
-#: ../src/ui.vala:1844
-msgid "Email..."
+#: src/help-overlay.ui:31
+msgctxt "shortcut window"
+msgid "Scan continuously from a flatbed scanner"
 msgstr ""
 
-#: ../src/ui.vala:1845
-msgid "Print..."
+#: src/help-overlay.ui:38
+msgctxt "shortcut window"
+msgid "Stop scan in progress"
 msgstr ""
 
-#: ../src/ui.vala:1853
-msgid "Help"
+#: src/help-overlay.ui:46
+msgctxt "shortcut window"
+msgid "Document Modification"
 msgstr ""
 
-#: ../src/ui.vala:1854
-msgid "About"
+#: src/help-overlay.ui:51
+msgctxt "shortcut window"
+msgid "Move page left"
+msgstr "Парақты солға жылжыту"
+
+#: src/help-overlay.ui:58
+msgctxt "shortcut window"
+msgid "Move page right"
+msgstr "Парақты оңға жылжыту"
+
+#: src/help-overlay.ui:65
+msgctxt "shortcut window"
+msgid "Rotate page to the left (anti-clockwise)"
 msgstr ""
 
-#: ../src/ui.vala:1855
-msgid "Quit"
+#: src/help-overlay.ui:72
+msgctxt "shortcut window"
+msgid "Rotate page to the right (clockwise)"
 msgstr ""
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
-msgid "Change _Scanner"
+#: src/help-overlay.ui:79
+msgctxt "shortcut window"
+msgid "Delete page"
 msgstr ""
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
-msgid "_Install Drivers"
+#: src/help-overlay.ui:87
+msgctxt "shortcut window"
+msgid "Document Management"
 msgstr ""
 
+#: src/help-overlay.ui:92
+msgctxt "shortcut window"
+msgid "Start new document"
+msgstr "Жаңа құжатты бастау"
+
+#: src/help-overlay.ui:99
+msgctxt "shortcut window"
+msgid "Save scanned document"
+msgstr "Сканерленген құжатты сақтау"
+
+#: src/help-overlay.ui:106
+msgctxt "shortcut window"
+msgid "Email scanned document"
+msgstr "Сканерленген құжатты эл. поштамен жіберу"
+
+#: src/help-overlay.ui:113
+msgctxt "shortcut window"
+msgid "Print scanned document"
+msgstr "Сканерленген құжатты баспаға шығару"
+
+#: src/help-overlay.ui:120
+msgctxt "shortcut window"
+msgid "Copy current page to clipboard"
+msgstr ""
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:113
+msgid "_Scanner"
+msgstr "_Сканер"
+
+#. Label beside scan side combo box
+#: src/preferences-dialog.ui:143
+msgid "Scan Sides"
+msgstr ""
+
+#. Label beside page size combo box
+#: src/preferences-dialog.ui:160
+msgid "Page Size"
+msgstr "Бет өлшемі"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:191
+msgid "Front"
+msgstr "Бет жағы"
+
+#. Preferences Dialog: Toggle button to select scanning on the back side of a page
+#: src/preferences-dialog.ui:206
+msgid "Back"
+msgstr "Сырты"
+
+#. Preferences Dialog: Toggle button to select scanning on both sides of a page
+#: src/preferences-dialog.ui:221
+msgid "Both"
+msgstr "Екеуі де"
+
+#. Label beside page delay scale
+#: src/preferences-dialog.ui:260
+msgid "Delay"
+msgstr "Кідіріс"
+
+#. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
+#: src/preferences-dialog.ui:276
+msgid "Multiple page from flatbed"
+msgstr ""
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:295
+msgid "3"
+msgstr "3"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:310
+msgid "5"
+msgstr "5"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:326
+msgid "7"
+msgstr "7"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:342
+msgid "10"
+msgstr "10"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:358
+msgid "15"
+msgstr "15"
+
+#. Label after page delay radio buttons
+#: src/preferences-dialog.ui:385
+msgid "Seconds"
+msgstr "Секунд"
+
+#. Preferences Dialog: Tab label for scanning settings
+#: src/preferences-dialog.ui:413
+msgid "Scanning"
+msgstr "Сканерлеу"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:436
+msgid "_Text Resolution"
+msgstr ""
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:452
+msgid "_Photo Resolution"
+msgstr ""
+
+#. Label beside brightness scale
+#: src/preferences-dialog.ui:505
+msgid "Brightness"
+msgstr "Жарықтылығы"
+
+#. Label beside contrast scale
+#: src/preferences-dialog.ui:521
+msgid "Contrast"
+msgstr "Контраст"
+
+#. Preferences Dialog: Tab for quality settings
+#: src/preferences-dialog.ui:576
+msgid "Quality"
+msgstr "Сапасы"
+
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/preferences-dialog.vala:77
 msgid "Automatic"
 msgstr "Авто"
 
-#: ../src/ui.vala:1947
+#: src/preferences-dialog.vala:116
 msgid "Darker"
-msgstr ""
+msgstr "Қүңгірттеу"
 
-#: ../src/ui.vala:1949
+#: src/preferences-dialog.vala:118
 msgid "Lighter"
-msgstr ""
+msgstr "Ашықтау"
 
-#: ../src/ui.vala:1957
+#: src/preferences-dialog.vala:126
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1959
+#: src/preferences-dialog.vala:128
 msgid "More"
+msgstr "Көбірек"
+
+#. Preferences dialog: Label for default resolution in resolution list
+#: src/preferences-dialog.vala:440
+#, c-format
+msgid "%d dpi (default)"
 msgstr ""
 
-#: ../src/ui.vala:1967
-msgid "Minimum"
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: src/preferences-dialog.vala:443
+#, c-format
+msgid "%d dpi (draft)"
+msgstr ""
+
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: src/preferences-dialog.vala:446
+#, c-format
+msgid "%d dpi (high resolution)"
+msgstr ""
+
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: src/preferences-dialog.vala:449
+#, c-format
+msgid "%d dpi"
+msgstr ""
+
+#. Error displayed when no scanners to scan with
+#: src/scanner.vala:844
+msgid "No scanners available.  Please connect a scanner."
+msgstr ""
+
+#. Error displayed when cannot connect to scanner
+#: src/scanner.vala:874
+msgid "Unable to connect to scanner"
+msgstr ""
+
+#. Error display when unable to start scan
+#: src/scanner.vala:1227
+msgid "Unable to start scan"
 msgstr ""
 
-#: ../src/ui.vala:1969
-msgid "Maximum"
+#. 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 ""
 
-#: ../src/ui.vala:2008
-msgid "Saving document..."
+#: src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr ""
 
-#: ../src/ui.vala:2173
+#. Title of error dialog when scan failed
+#: src/simple-scan.vala:392
+msgid "Failed to scan"
+msgstr ""
+
+#. Attempt to inhibit the screensaver when scanning
+#: src/simple-scan.vala:407
+msgid "Scan in progress"
+msgstr ""
+
+#. Arguments and description for --help text
+#: src/simple-scan.vala:584
+msgid "[DEVICE…] — Scanning utility"
+msgstr "[ҚҰРЫЛҒЫ…] — Сканерлеу утилитасы"
+
+#. Text printed out when an unknown command-line argument provided
+#: src/simple-scan.vala:595
 #, c-format
-msgid "Saving page %d out of %d"
+msgid "Run “%s --help” to see a full list of available command line options."
 msgstr ""
+"Командалық жолдың барлық опцияларын қарау үшін \"%s --help\" енгізіңіз."
+
+#~ msgid "New"
+#~ msgstr "Жаңа"
+
+#~ msgid "Rotate Left"
+#~ msgstr "Солға бұру"
+
+#~ msgid "Rotate Right"
+#~ msgstr "Оңға бұру"
+
+#~ msgid "Crop"
+#~ 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..74f34a2 100644
--- a/po/km.po
+++ b/po/km.po
@@ -7,296 +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"
+"POT-Creation-Date: 2017-04-16 08:54-0400\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"
+"Language: km\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-25 06:10+0000\n"
+"X-Generator: Launchpad (build 18361)\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
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: 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 "A4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:498
 msgid "A_5"
 msgstr "A5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:509
 msgid "A_6"
 msgstr "A6"
 
 #. 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 "4×6"
 
 #. 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 "រក្សាទុក​ឯកសារ​ទៅ​ឯកសារ"
 
-#: ../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 "ច្រឹប"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: 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 "ស្កេន​ឯកសារ"
 
@@ -308,7 +322,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 +330,213 @@ 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:844
 msgid "No scanners available.  Please connect a scanner."
 msgstr "ពុំ​មាន​ម៉ាស៊ីន​ស្កេន​ទេ សូម​តភ្ជាប់​ម៉ាស៊ីន​ស្កេន ។"
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:874
 msgid "Unable to connect to scanner"
 msgstr "មិន​អាច​តភ្ជាប់​ម៉ាស៊ីន​ស្កេន​បាន​ទេ"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1227
 msgid "Unable to start scan"
 msgstr "មិន​អាច​ចាប់ផ្ដើម​ស្កេន​បាន​ទេ"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: 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
+#: 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:332 src/ui.vala:1655 src/ui.vala:1935
 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:341
 #, 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:389
 msgid "No scanners detected"
 msgstr "រក​មិន​ឃើញ​ម៉ាស៊ីន​ស្កេន"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:391
 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:396
 msgid "Additional software needed"
 msgstr ""
 
 #. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:398
 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: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 "រក្សាទុក"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:522
 msgid "Scanned Document.pdf"
 msgstr "Document.pdf ដែល​បាន​ស្កេន"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:528
 msgid "Image Files"
 msgstr "ឯកសារ​រូបភាព"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:534
 msgid "All Files"
 msgstr "ឯកសារ​ទាំងអស់"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:543
 msgid "PDF (multi-page document)"
 msgstr "PDF (ឯកសារ​ច្រើន​ទំព័រ)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:549
 msgid "JPEG (compressed)"
 msgstr "JPEG (បាន​បង្ហាប់)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:555
 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: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:650
+#: src/ui.vala:698
 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:721
 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:763
 msgid "Save current document?"
 msgstr "រក្សាទុក​ឯកសារ​បច្ចុប្បន្ន ?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:765
 msgid "Discard Changes"
 msgstr "បោះបង់​ការ​ផ្លាស់ប្ដូរ"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:1056
 msgid "Unable to save image for preview"
 msgstr "មិន​អាច​រក្សាទុក​រូបភាព​សម្រាប់​ការ​មើល​ជាមុន​បាន​ទេ"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1068
 msgid "Unable to open image preview application"
 msgstr "មិន​អាច​បើក​កម្មវិធី​មើល​រូបភាព​ជាមុន​បាន​ទេ"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1270
 msgid "Combine sides"
 msgstr "ផ្សំភាគី"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1280
 msgid "Combine sides (reverse)"
 msgstr "ផ្សំភាគី (បញ្ច្រាស)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1290
 msgid "Reverse"
 msgstr "បញ្ច្រាស"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1300
 msgid "Keep unchanged"
 msgstr "រក្សា​ឱ្យមិនមានការ​ផ្លាស់​ប្តូ​រ"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1504
 msgid "Unable to open help file"
 msgstr "មិន​អាច​បើក​ឯកសារ​ជំនួយ​បាន​ទេ"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: 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"
@@ -541,16 +566,16 @@ msgstr ""
 "សូម​មើល<http://www.gnu.org/licenses/> ។"
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1528
 msgid "About Simple Scan"
 msgstr "អំពី​ការ​ស្កេន​ធម្មតា"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1531
 msgid "Simple document scanning tool"
 msgstr "ឧបករណ៍​ស្កេន​ធម្មតា"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1540
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -560,189 +585,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:1562
 msgid "Save document before quitting?"
 msgstr "រក្សាទុក​ឯកសារ​មុន​ពេល​បិទ​ឬ ?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1564
 msgid "Quit without Saving"
 msgstr "បិទ​ដោយ​មិន​រក្សាទុក"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1632
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1634
 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:1638
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1640
 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:1644
 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:1649
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1651
 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:1655
 msgid "Install drivers"
 msgstr ""
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1686
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1698
 msgid "Installing drivers..."
 msgstr ""
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1706
 msgid "Drivers installed successfully!"
 msgstr ""
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1716
 #, 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:1722
 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:1729
 #, 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:1833
 #, 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:1836
 #, 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:1839
 #, 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:1842
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../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 "ចេញ"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1937
 msgid "Change _Scanner"
 msgstr "ប្ដូរ​ម៉ាស៊ីន​ស្កេន"
 
 #. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1939
 msgid "_Install Drivers"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: 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 "រក្សាទុក​ទំព័រ %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..ea6b9ed 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -7,296 +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"
+"POT-Creation-Date: 2017-04-16 08:54-0400\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"
+"Language: ko\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-25 06:10+0000\n"
+"X-Generator: Launchpad (build 18361)\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: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 "문서(_D)"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/simple-scan.ui:266
 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:279 src/simple-scan.ui:1343 src/simple-scan.ui:1402
 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:289 src/simple-scan.ui:1352 src/simple-scan.ui:1411
 msgid "All Pages From _Feeder"
 msgstr "스케너의 모든 페이지(_F)"
 
+#. 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 "스캔 중지(_S)"
 
-#: 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
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: 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 "이메일(_E)"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:436
 msgid "_Page"
 msgstr "페이지(_P)"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:446
 msgid "Rotate _Left"
 msgstr "왼쪽으로 돌리기(_L)"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:456
 msgid "Rotate _Right"
 msgstr "오른쪽으로 돌리기(_R)"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:466
 msgid "_Crop"
 msgstr "잘라내기(_C)"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:476
 msgid "_None"
 msgstr "없음(_N)"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:487
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:498
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:509
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:520
 msgid "_Letter"
 msgstr "편지(_L)"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:531
 msgid "Le_gal"
 msgstr "미국  법정 규격(_G)"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:542
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:553
 msgid "_Custom"
 msgstr "사용자 설정(_C)"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:571
 msgid "_Rotate Crop"
 msgstr "잘라낸 영역 회전(_R)"
 
 #. 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 "도움말(_H)"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:638
 msgid "_Contents"
 msgstr "내용(_C)"
 
 #. 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 "파일로 문서 저장하기"
 
-#: ../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 "잘라내기"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: 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 "스캔 원본(_O)"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1085
 msgid "_Text Resolution:"
 msgstr "텍스트 해상도(_T)"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1101
 msgid "_Photo Resolution:"
 msgstr "사진 해상도(_P)"
 
 #. 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 "스캔 문서"
 
@@ -308,7 +322,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 +332,207 @@ 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:844
 msgid "No scanners available.  Please connect a scanner."
 msgstr "사용할 수 있는 스캐너가 없습니다. 스캐너를 연결하세요."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:874
 msgid "Unable to connect to scanner"
 msgstr "스캐너에 연결할 수 없음"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1227
 msgid "Unable to start scan"
 msgstr "스캔을 시작할 수 없음"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: 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
+#: 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:332 src/ui.vala:1655 src/ui.vala:1935
 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:341
 #, 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:389
 msgid "No scanners detected"
 msgstr "감지된 스캐너 없음"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:391
 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:396
 msgid "Additional software needed"
 msgstr "추가 소프트웨어 필요"
 
 #. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:398
 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: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 "취소(_C)"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:514 src/ui.vala:724
 msgid "_Save"
 msgstr "저장(_S)"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:522
 msgid "Scanned Document.pdf"
 msgstr "스캔한 문서.pdf"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:528
 msgid "Image Files"
 msgstr "그림 파일"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:534
 msgid "All Files"
 msgstr "모든 파일"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:543
 msgid "PDF (multi-page document)"
 msgstr "PDF (복수 페이지 문서)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:549
 msgid "JPEG (compressed)"
 msgstr "JPEG (압축된)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:555
 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: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:650
+#: src/ui.vala:698
 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:721
 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:763
 msgid "Save current document?"
 msgstr "현재 문서를 저장하시겠습니까?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:765
 msgid "Discard Changes"
 msgstr "바뀐 내용 버리기"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:1056
 msgid "Unable to save image for preview"
 msgstr "미리 보기 그림을 저장할 수 없습니다."
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1068
 msgid "Unable to open image preview application"
 msgstr "그림 미리보기 프로그램을 열 수 없습니다"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1270
 msgid "Combine sides"
 msgstr "측면 결합"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1280
 msgid "Combine sides (reverse)"
 msgstr "측면 결합(역순)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1290
 msgid "Reverse"
 msgstr "역순"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1300
 msgid "Keep unchanged"
 msgstr "바꾸지 않은 상태 유지"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1504
 msgid "Unable to open help file"
 msgstr "도움말 파일을 열 수 없습니다"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: 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"
@@ -536,16 +561,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:1528
 msgid "About Simple Scan"
 msgstr "심플 스캔 소개"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1531
 msgid "Simple document scanning tool"
 msgstr "간단한 문서 스캐닝 도구"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1540
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -555,28 +580,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:1562
 msgid "Save document before quitting?"
 msgstr "종료하기 전에 문서를 저장하시겠습니까?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1564
 msgid "Quit without Saving"
 msgstr "저장하지 않고 종료"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1632
 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:1634
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
@@ -584,12 +609,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:1638
 msgid "You appear to have a Samsung scanner."
 msgstr "삼성 스캐너를 가지고 계신 것 같습니다."
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1640
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
@@ -597,17 +622,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:1644
 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:1649
 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:1651
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
@@ -615,138 +640,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:1655
 msgid "Install drivers"
 msgstr "드라이버 설치"
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1686
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "드라이버 설치 후엔 심플 스캔을  다시 시작해야 합니다."
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1698
 msgid "Installing drivers..."
 msgstr "드라이버를 설치하고 있습니다..."
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1706
 msgid "Drivers installed successfully!"
 msgstr "드라이버를 설치했습니다!"
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1716
 #, 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:1722
 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:1729
 #, 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:1833
 #, 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:1836
 #, 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:1839
 #, 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:1842
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../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 "끝내기"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1937
 msgid "Change _Scanner"
 msgstr "스캐너 변경(_S)"
 
 #. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1939
 msgid "_Install Drivers"
 msgstr "드라이버 설치(_I)"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: 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 "%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..06970a2 100644
--- a/po/ku.po
+++ b/po/ku.po
@@ -7,296 +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"
+"POT-Creation-Date: 2017-04-16 08:54-0400\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"
+"Language: ku\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-25 06:10+0000\n"
+"X-Generator: Launchpad (build 18361)\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: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 "Nivîs"
 
-#: 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 "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: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 "Bizivirîne _Çepê"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:456
 msgid "Rotate _Right"
 msgstr "Bizivirîne _Rastê"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:466
 msgid "_Crop"
 msgstr "_Jê Bike"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:476
 msgid "_None"
 msgstr "_Tune"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:487
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:498
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:509
 msgid "A_6"
 msgstr "A_6"
 
 #. 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 "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:553
 msgid "_Custom"
 msgstr "_Taybet"
 
 #. 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 "_Alîkarî"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:638
 msgid "_Contents"
 msgstr "_Naverok"
 
 #. 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 "Nû"
 
 #. 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 "Venihêre"
 
 #. 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 ""
 
-#: ../src/ui.vala:1842
+#: src/simple-scan.ui:715 src/ui.vala:1892
 msgid "Save"
 msgstr "Tomar Bike"
 
 #. 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 "Sekinandin"
 
 #. 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 "Bizivirîne Çepê"
 
 #. 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 "Bizivirîne Rastê"
 
-#: 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 "Bibire"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:1003 src/ui.vala:1898
 msgid "Preferences"
 msgstr "Vebijêrk"
 
 #. 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 "Biriqandin:"
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1235
 msgid "Contrast:"
 msgstr "Kontrast:"
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1266
 msgid "Quality:"
 msgstr "çawanî:"
 
+#. 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 ""
 
@@ -306,9 +320,9 @@ msgstr ""
 
 #: data/simple-scan.desktop.in:8
 msgid "scanner"
-msgstr "Skener"
+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 "
@@ -316,196 +330,207 @@ 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:844
 msgid "No scanners available.  Please connect a scanner."
 msgstr ""
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:874
 msgid "Unable to connect to scanner"
 msgstr ""
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1227
 msgid "Unable to start scan"
 msgstr ""
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: 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
+#: 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:332 src/ui.vala:1655 src/ui.vala:1935
 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:341
 #, 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:389
 msgid "No scanners detected"
 msgstr ""
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:391
 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:396
 msgid "Additional software needed"
 msgstr ""
 
 #. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:398
 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:510
 msgid "Save As..."
 msgstr "Cuda Tomar Bike..."
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:513 src/ui.vala:648 src/ui.vala:723
 msgid "_Cancel"
 msgstr "_Betal"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:514 src/ui.vala:724
 msgid "_Save"
 msgstr "_Tomar bike"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:522
 msgid "Scanned Document.pdf"
 msgstr ""
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:528
 msgid "Image Files"
 msgstr "Pelên Wêne"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:534
 msgid "All Files"
 msgstr "Hemû Pel"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:543
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:549
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:555
 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:564
 msgid "File format:"
 msgstr "Formata pelan:"
 
+#. 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:650
+#: src/ui.vala:698
 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:721
 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:763
 msgid "Save current document?"
 msgstr ""
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:765
 msgid "Discard Changes"
 msgstr "Guhertinan Jê Bibe"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:1056
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1068
 msgid "Unable to open image preview application"
 msgstr ""
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1270
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1280
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1290
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1300
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1504
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: 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"
@@ -522,16 +547,16 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1528
 msgid "About Simple Scan"
 msgstr ""
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1531
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1540
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -539,189 +564,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:1562
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1564
 msgid "Quit without Saving"
 msgstr ""
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1632
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1634
 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:1638
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1640
 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:1644
 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:1649
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1651
 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:1655
 msgid "Install drivers"
 msgstr ""
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1686
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1698
 msgid "Installing drivers..."
 msgstr ""
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1706
 msgid "Drivers installed successfully!"
 msgstr ""
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1716
 #, 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:1722
 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:1729
 #, 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:1833
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1836
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1839
 #, 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:1842
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1885
 msgid "New Document"
 msgstr "Pelgeya nû"
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1890
 msgid "Document"
 msgstr "Belge"
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1893
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1894
 msgid "Print..."
 msgstr "Çapkirin..."
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1902
 msgid "Help"
 msgstr "Alîkarî"
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1903
 msgid "About"
 msgstr "Der barê"
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1904
 msgid "Quit"
 msgstr "Derkeve"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1937
 msgid "Change _Scanner"
 msgstr ""
 
 #. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1939
 msgid "_Install Drivers"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1945
 msgid "Automatic"
 msgstr "Bixwe"
 
-#: ../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 "Kêmtir"
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:2007
 msgid "More"
 msgstr "Bêhtir"
 
-#: ../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:2182
+#: src/ui.vala:2242
 #, 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..36ef370 100644
--- a/po/ky.po
+++ b/po/ky.po
@@ -7,296 +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-04-17 06:12+0000\n"
-"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
+"POT-Creation-Date: 2017-04-16 08:54-0400\n"
+"PO-Revision-Date: 2017-03-29 06:36+0000\n"
+"Last-Translator: Saltanat Osmonova <Unknown>\n"
 "Language-Team: Kirghiz <ky@li.org>\n"
+"Language: ky\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-25 06:10+0000\n"
+"X-Generator: Launchpad (build 18361)\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: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 ""
+msgstr "Фото"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: 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 ""
+msgstr "_Солго тегеретүү"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:456
 msgid "Rotate _Right"
-msgstr ""
+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 ""
+msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:498
 msgid "A_5"
-msgstr ""
+msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:509
 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: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 ""
+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 ""
+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 ""
+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 ""
+msgstr "Документти файлга сактоо"
 
-#: ../src/ui.vala:1842
+#: src/simple-scan.ui:715 src/ui.vala:1892
 msgid "Save"
-msgstr ""
+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 ""
+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 ""
+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 ""
+msgstr "Тандалган баракты кесүү"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:787
 msgid "Crop"
-msgstr ""
+msgstr "Кесүү"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: 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 ""
+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 ""
 
@@ -308,7 +322,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 +330,207 @@ 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:844
 msgid "No scanners available.  Please connect a scanner."
 msgstr ""
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:874
 msgid "Unable to connect to scanner"
 msgstr ""
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1227
 msgid "Unable to start scan"
 msgstr ""
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: 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
+#: 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:332 src/ui.vala:1655 src/ui.vala:1935
 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:341
 #, 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:389
 msgid "No scanners detected"
 msgstr ""
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:391
 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:396
 msgid "Additional software needed"
 msgstr ""
 
 #. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:398
 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: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 ""
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:522
 msgid "Scanned Document.pdf"
 msgstr ""
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:528
 msgid "Image Files"
 msgstr ""
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:534
 msgid "All Files"
 msgstr ""
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:543
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:549
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:555
 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: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:650
+#: src/ui.vala:698
 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:721
 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:763
 msgid "Save current document?"
 msgstr ""
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:765
 msgid "Discard Changes"
 msgstr ""
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:1056
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1068
 msgid "Unable to open image preview application"
 msgstr ""
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1270
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1280
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1290
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1300
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1504
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: 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"
@@ -522,205 +547,205 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1528
 msgid "About Simple Scan"
 msgstr ""
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1531
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1540
 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:1562
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1564
 msgid "Quit without Saving"
 msgstr ""
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1632
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1634
 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:1638
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1640
 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:1644
 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:1649
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1651
 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:1655
 msgid "Install drivers"
 msgstr ""
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1686
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1698
 msgid "Installing drivers..."
 msgstr ""
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1706
 msgid "Drivers installed successfully!"
 msgstr ""
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1716
 #, 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:1722
 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:1729
 #, 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:1833
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1836
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1839
 #, 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: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 ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1937
 msgid "Change _Scanner"
 msgstr ""
 
 #. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1939
 msgid "_Install Drivers"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: 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/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..0f0ed99 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -2,518 +2,528 @@
 # Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
 # This file is distributed under the same license as the simple-scan package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
+# Aurimas Černius <aurisc4@gmail.com>, 2017.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-07-29 12:47+1200\n"
-"PO-Revision-Date: 2016-11-05 18:11+0000\n"
-"Last-Translator: Moo <hazap@hotmail.com>\n"
-"Language-Team: Lithuanian <lt@li.org>\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
+"product=simple-scan&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-08-13 21:51+0000\n"
+"PO-Revision-Date: 2017-08-22 23:00+0300\n"
+"Last-Translator: Aurimas Černius <aurisc4@gmail.com>\n"
+"Language-Team: Lietuvių <gnome-lt@lists.akl.lt>\n"
+"Language: lt\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-25 06:10+0000\n"
+"X-Generator: Gtranslator 2.91.7\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n"
+"%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#. Button to submit authorization dialog
-#: data/simple-scan.ui:24
-msgid "_Authorize"
-msgstr "Į_galioti"
+#: data/org.gnome.SimpleScan.gschema.xml:11
+msgid "Device to scan from"
+msgstr "Skenavimo įrenginys"
 
-#. Label beside username entry
-#: data/simple-scan.ui:102
-msgid "_Username for resource:"
-msgstr "Ištekliaus na_udotojo vardas:"
+#: data/org.gnome.SimpleScan.gschema.xml:12
+msgid "SANE device to acquire images from."
+msgstr "SANE įrenginys, iš kurio gauti paveikslus."
 
-#. Label beside password entry
-#: data/simple-scan.ui:117
-msgid "_Password:"
-msgstr "Sla_ptažodis:"
+#: data/org.gnome.SimpleScan.gschema.xml:20
+msgid "Type of document being scanned"
+msgstr "Skenuojamo dokumento tipas"
+
+#: data/org.gnome.SimpleScan.gschema.xml:21
+msgid ""
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+msgstr ""
+"Skenuojamo dokumento tipas. Šis nustatymas apsprendžia skaitymo raišką, "
+"spalvas ir baigiamąjį apdorojimą."
 
-#. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
-msgid "Front and Back"
-msgstr "Abi pusės"
+#: data/org.gnome.SimpleScan.gschema.xml:25
+msgid "Width of paper in tenths of a mm"
+msgstr "Popieriaus plotis dešimtosiomis milimetro dalimis"
 
-#. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
-msgid "Front"
-msgstr "Priekinė pusė"
+#: data/org.gnome.SimpleScan.gschema.xml:26
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"Popieriaus plotis dešimtosiomis milimetro dalimis (arba 0 automatiniam "
+"popieriaus aptikimui)."
 
-#. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
-msgid "Back"
-msgstr "Galinė pusė"
+#: data/org.gnome.SimpleScan.gschema.xml:30
+msgid "Height of paper in tenths of a mm"
+msgstr "Popieriaus aukštis dešimtosiomis milimetro dalimis"
+
+#: data/org.gnome.SimpleScan.gschema.xml:31
+msgid ""
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"Popieriaus aukštis dešimtosiomis milimetro dalimis (arba 0 automatiniam "
+"popieriaus aptikimui)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:35
+msgid "Brightness of scan"
+msgstr "Nuskenuoto dokumento skaistis"
 
+#: data/org.gnome.SimpleScan.gschema.xml:36
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr "Skaisčio derinimas nuo -100 iki 100 (0 nėra)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:40
+msgid "Contrast of scan"
+msgstr "Nuskenuoto dokumento kontrastas"
+
+#: data/org.gnome.SimpleScan.gschema.xml:41
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr "Kontrasto reguliavimas nuo -100 iki 100 (0 nėra)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:45
+msgid "Resolution for text scans"
+msgstr "Teksto skenavimo raiška"
+
+#: data/org.gnome.SimpleScan.gschema.xml:46
+msgid "The resolution in dots-per-inch to use when scanning text."
+msgstr "Raiška taškais colyje skenuojant tekstą."
+
+#: data/org.gnome.SimpleScan.gschema.xml:50
+msgid "Resolution for photo scans"
+msgstr "Nuotraukų skenavimo raiška"
+
+#: data/org.gnome.SimpleScan.gschema.xml:51
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr "Raiška taškais colyje skenuojant nuotraukas."
+
+#: data/org.gnome.SimpleScan.gschema.xml:55
+msgid "Page side to scan"
+msgstr "Skenuojama puslapio pusė"
+
+#: data/org.gnome.SimpleScan.gschema.xml:56
+msgid "The page side to scan."
+msgstr "Puslapio pusė, kurią skenuoti."
+
+#: data/org.gnome.SimpleScan.gschema.xml:60
+msgid "Directory to save files to"
+msgstr "Katalogas, į kurį įrašyti failus"
+
+#: data/org.gnome.SimpleScan.gschema.xml:61
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+"Katalogas failams įrašyti. Jei nenustatyta, numatytoji reikšmė yra dokumentų "
+"katalogas."
+
+#: data/org.gnome.SimpleScan.gschema.xml:66
+msgid "Quality value to use for JPEG compression"
+msgstr "Kokybės reikšmė JPEG glaudinimui"
+
+#: data/org.gnome.SimpleScan.gschema.xml:67
+msgid "Quality value to use for JPEG compression."
+msgstr "Kokybės reikšmė, naudojama JPEG glaudinimui."
+
+#: data/org.gnome.SimpleScan.gschema.xml:72
+msgid "Delay in millisecond between pages"
+msgstr "Delsa tarp puslapių milisekundėmis"
+
+#: data/org.gnome.SimpleScan.gschema.xml:73
+msgid "Delay in millisecond between pages."
+msgstr "Delsa tarp puslapių milisekundėmis."
+
+#. Title of scan window
+#. Set HeaderBar title here because Glade doesn't keep it translated
+#. https://bugzilla.gnome.org/show_bug.cgi?id=782753
 #. 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
+#: data/simple-scan.appdata.xml.in:6 data/simple-scan.desktop.in:3
+#: src/app-window.ui:76 src/app-window.vala:1560
 msgid "Simple Scan"
 msgstr "Paprastas skenavimas"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
-msgid "_Document"
-msgstr "_Dokumentas"
+#: data/simple-scan.appdata.xml.in:7 data/simple-scan.desktop.in:5
+msgid "Scan Documents"
+msgstr "Skenuoti dokumentus"
 
-#. Scan menu item
-#: data/simple-scan.ui:260
-msgid "Sc_an"
-msgstr "S_kenuoti"
+#: 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 "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+"Tikrai labai lengvas būdas skenuoti ir dokumentus, ir nuotraukas. Galite "
+"iškirpti blogas nuotraukos puses ir ją pasukti, jei ji neteisingai "
+"atvaizduojama. Galite spausdinti savo skenavimus, eksportuoti juos į pdf, ar "
+"įrašyti juos daugeliu paveikslų formatų."
 
+#: data/simple-scan.appdata.xml.in:14
+msgid "Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+"Paprastas skenavimas naudoja SANE karkasą, kad palaikytų daugelį esamų "
+"skenerių."
+
+#: data/simple-scan.desktop.in:4
+msgid "Document Scanner"
+msgstr "Dokumentų skeneris"
+
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: data/simple-scan.desktop.in:7
+msgid "scan;scanner;flatbed;adf;"
+msgstr "skenuoti;nuskaityti;adf;skaitytuvas;skeneris;plokštuminis;"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: data/simple-scan.desktop.in:10
+msgid "scanner"
+msgstr "scanner"
+
+#. Toolbar scan menu item to scan a single page from the scanner
 #. 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/app-window.ui:22 src/app-window.ui:123 src/app-window.ui:820
 msgid "Single _Page"
 msgstr "Vieną  _puslapį"
 
+#. Toolbar scan menu item to scan all pages from a document feeder
 #. 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/app-window.ui:31 src/app-window.ui:133 src/app-window.ui:829
 msgid "All Pages From _Feeder"
 msgstr "Visus puslapius iš _padaviklio"
 
-#. Menu entry to stop current scan
-#: data/simple-scan.ui:294
-msgid "_Stop Scan"
-msgstr "_Stabdyti skenavimą"
+#. Toolbar scan menu item to scan continuously from the flatbed
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/app-window.ui:40 src/app-window.ui:143 src/app-window.ui:838
+msgid "_Multiple Pages From Flatbed"
+msgstr "_Daug puslapių nuo skenavimo plokštumos"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:853
 msgid "Text"
 msgstr "Tekstas"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:863
 msgid "Photo"
 msgstr "Nuotrauka"
 
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: src/app-window.ui:91
+msgid "_Document"
+msgstr "_Dokumentas"
+
+#. Scan menu item
+#: src/app-window.ui:110
+msgid "Sc_an"
+msgstr "S_kenuoti"
+
+#. Menu entry to stop current scan
+#: src/app-window.ui:154
+msgid "_Stop Scan"
+msgstr "_Stabdyti skenavimą"
+
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/app-window.ui:196 src/app-window.vala:967 src/app-window.vala:1590
 msgid "Reorder Pages"
 msgstr "Pakeisti puslapių tvarką"
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/app-window.ui:215
 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/app-window.ui:280
 msgid "_Page"
 msgstr "_Puslapis"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/app-window.ui:290
 msgid "Rotate _Left"
 msgstr "Pasukti _kairėn"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/app-window.ui:300
 msgid "Rotate _Right"
 msgstr "Pasukti _dešinėn"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/app-window.ui:310
 msgid "_Crop"
 msgstr "_Apkirpti"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/app-window.ui:320
 msgid "_None"
 msgstr "_Nėra"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/app-window.ui:331
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/app-window.ui:342
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/app-window.ui:353
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/app-window.ui:364
 msgid "_Letter"
 msgstr "_Laiškas"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/app-window.ui:375
 msgid "Le_gal"
 msgstr "Tei_sinis"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/app-window.ui:386
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/app-window.ui:397
 msgid "_Custom"
 msgstr "_Pasirinktinis"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/app-window.ui:415
 msgid "_Rotate Crop"
 msgstr "_Pasukti apkirpimą"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/app-window.ui:428
 msgid "Move Left"
 msgstr "Perkelti kairėn"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/app-window.ui:437
 msgid "Move Right"
 msgstr "Perkelti dešinėn"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/app-window.ui:474
 msgid "_Help"
 msgstr "_Žinynas"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/app-window.ui:482
 msgid "_Contents"
 msgstr "_Turinys"
 
-#. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
-msgid "Start a new document"
-msgstr "Pradėti naują dokumentą"
-
-#: data/simple-scan.ui:675
-msgid "New"
-msgstr "Naujas"
-
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/app-window.ui:520 src/app-window.ui:720
 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/app-window.ui:522 src/app-window.ui:716
 msgid "Scan"
 msgstr "Skenuoti"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/app-window.ui:538 src/app-window.ui:787
 msgid "Save document to a file"
 msgstr "Įrašyti dokumentą į failą"
 
-#: ../src/ui.vala:1842
+#: src/app-window.ui:540
 msgid "Save"
 msgstr "Įrašyti"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/app-window.ui:555 src/app-window.ui:700
 msgid "Stop the current scan"
 msgstr "Stabdyti esamą skenavimą"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/app-window.ui:556 src/app-window.ui:697
 msgid "Stop"
 msgstr "Stabdyti"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "Pasukti puslapį kairėn (prieš laikrodžio rodyklę)"
-
-#. Label on rotate page left (anti-clockwise) item
-#: data/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
-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
-msgid "Rotate Right"
-msgstr "Pasukti dešinėn"
-
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
-msgid "Crop the selected page"
-msgstr "Apkirpti pažymėtą puslapį"
+#. Label shown when searching for scanners
+#: src/app-window.ui:611
+msgid "Searching for Scanners…"
+msgstr "Ieškoma skenerių"
 
-#: data/simple-scan.ui:781
-msgid "Crop"
-msgstr "Apkirpti"
-
-#: ../src/ui.vala:1849
-msgid "Preferences"
-msgstr "Nuostatos"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1048
-msgid "Scan S_ource:"
-msgstr "Skenavimo š_altinis:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1079
-msgid "_Text Resolution:"
-msgstr "_Teksto raiška:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1095
-msgid "_Photo Resolution:"
-msgstr "_Nuotraukos raiška:"
-
-#. Label beside scan side combo box
-#: data/simple-scan.ui:1139
-msgid "Scan Side:"
-msgstr "Skenuojama pusė:"
-
-#. Label beside page size combo box
-#: data/simple-scan.ui:1169
-msgid "Page Size:"
-msgstr "Puslapio dydis:"
-
-#. Label beside brightness scale
-#: data/simple-scan.ui:1199
-msgid "Brightness:"
-msgstr "Skaistis:"
-
-#. Label beside contrast scale
-#: data/simple-scan.ui:1229
-msgid "Contrast:"
-msgstr "Kontrastas:"
-
-#. Label beside quality scale
-#: data/simple-scan.ui:1260
-msgid "Quality:"
-msgstr "Kokybė:"
-
-#: data/simple-scan.desktop.in:4
-msgid "Document Scanner"
-msgstr "Dokumentų skeneris"
-
-#: data/simple-scan.desktop.in:5
-msgid "Scan Documents"
-msgstr "Skenuoti dokumentus"
+#: src/app-window.vala:237 src/app-window.vala:1380
+msgid "_Close"
+msgstr "_Užverti"
 
-#: data/simple-scan.desktop.in:6
-msgid "scan;scanner;flatbed;adf;"
-msgstr "skenuoti;nuskaityti;adf;skaitytuvas;skeneris;plokštuminis;"
+#. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
+#: src/app-window.vala:246
+#, c-format
+msgid "Username and password required to access “%s”"
+msgstr "Naudotojo vardas ir slaptažodis, reikalingas prieigai prie „%s“"
 
-#: data/simple-scan.desktop.in:8
-msgid "scanner"
-msgstr "skeneris"
+#. Label shown when detected a scanner
+#: src/app-window.vala:266 src/app-window.vala:584
+msgid "Ready to Scan"
+msgstr "Pasiruošta skenavimui"
 
-#: data/simple-scan.appdata.xml.in:8
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-"Tikrai labai lengvas būdas skenuoti ir dokumentus, ir nuotraukas. Galite "
-"iškirpti blogas nuotraukos puses ir ją pasukti, jei ji neteisingai "
-"atvaizduojama. Galite spausdinti savo skenavimus, eksportuoti juos į pdf, ar "
-"įrašyti juos daugeliu paveikslų formatų."
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: src/app-window.vala:273
+msgid "Additional software needed"
+msgstr "Reikalinga papildoma programinė įranga"
 
-#: data/simple-scan.appdata.xml.in:13
+#. Instructions to install driver software
+#: src/app-window.vala:275
 msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
+"You need to <a href=\"install-firmware\">install driver software</a> for "
+"your scanner."
 msgstr ""
-"Paprastas skenavimas naudoja SANE karkasą, kad palaikytų daugelį esamų "
-"skenerių."
-
-#. Error displayed when no scanners to scan with
-#: ../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
-msgid "Unable to connect to scanner"
-msgstr "Nepavyko prisijungti prie skenerio"
-
-#. Error display when unable to start scan
-#: ../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
-msgid "Error communicating with scanner"
-msgstr "Klaida susisiekiant su skeneriu"
-
-#. Help string for command line --version flag
-#: ../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
-msgid "Print debugging messages"
-msgstr "Išvesti derinimo pranešimus"
-
-#: ../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
-msgid "Failed to scan"
-msgstr "Skenavimas nepavyko"
-
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
-msgid "[DEVICE...] - Scanning utility"
-msgstr "[ĮRENGINYS...] - Skenavimo paslaugų programa"
-
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
-#, c-format
-msgid "Run '%s --help' to see a full list of available command line options."
-msgstr ""
-"Norėdami pamatyti komandų eilutės parametrų sąrašą, paleiskite „%s --help“."
-
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
-msgid "_Close"
-msgstr "_Užverti"
-
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
-#, c-format
-msgid "Username and password required to access '%s'"
-msgstr "Naudotojo vardas ir slaptažodis, reikalingas prieigai prie „%s“"
+"Jūs turite savo skeneriui <a href=\"install-firmware\">įdiegti tvarkyklę</a>."
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/app-window.vala:281
 msgid "No scanners detected"
 msgstr "Skenerių neaptikta"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/app-window.vala:283
 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
-msgid "Additional software needed"
-msgstr "Reikalinga papildoma programinė įranga"
-
-#. Instructions to install driver software
-#: ../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
-msgid "Save As..."
-msgstr "Įrašyti kaip..."
+#: src/app-window.vala:298
+msgid "Save As…"
+msgstr "Įrašyti taip…"
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/app-window.vala:301 src/app-window.vala:471 src/app-window.vala:552
 msgid "_Cancel"
 msgstr "_Atsisakyti"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/app-window.vala:302 src/app-window.vala:553
 msgid "_Save"
 msgstr "Į_rašyti"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/app-window.vala:310
 msgid "Scanned Document.pdf"
 msgstr "Nuskenuotas dokumentas.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#. Save dialog: Filter name to show only supported image files
+#: src/app-window.vala:316
 msgid "Image Files"
 msgstr "Paveikslų failai"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/app-window.vala:326
 msgid "All Files"
 msgstr "Visi failai"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/app-window.vala:335
 msgid "PDF (multi-page document)"
 msgstr "PDF (kelių puslapių dokumentas)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/app-window.vala:341
 msgid "JPEG (compressed)"
 msgstr "JPEG (suglaudintas)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/app-window.vala:347
 msgid "PNG (lossless)"
 msgstr "PNG (nenuostolingasis)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#. Save dialog: Label for sabing in WEBP format
+#: src/app-window.vala:354
+msgid "WebP (compressed)"
+msgstr "WebP (suglaudintas)"
+
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
+#: src/app-window.vala:364
 msgid "File format:"
 msgstr "Failo formatas:"
 
+#. Label in save dialog beside compression slider
+#: src/app-window.vala:376
+msgid "Compression:"
+msgstr "Suspaudimas:"
+
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/app-window.vala:470
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr "Failas pavadinimu „%s“ jau yra.  Ar norite jį perrašyti?"
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/app-window.vala:473
+msgid "_Replace"
+msgstr "Per_rašyti"
+
+#: src/app-window.vala:512
+msgid "Saving"
+msgstr "Įrašoma"
+
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/app-window.vala:527
 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
-msgid "If you don't save, changes will be permanently lost."
+#: src/app-window.vala:550
+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/app-window.vala:591
 msgid "Save current document?"
 msgstr "Įrašyti šį dokumentą?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/app-window.vala:593
 msgid "Discard Changes"
 msgstr "Atmesti pakeitimus"
 
+#. Label shown when scan started
+#: src/app-window.vala:692
+msgid "Contacting scanner…"
+msgstr "Jungiamasi prie _skenerio…"
+
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/app-window.vala:800
 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/app-window.vala:812
 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/app-window.vala:990
 msgid "Combine sides"
 msgstr "Suskirstyti puses"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/app-window.vala:1000
 msgid "Combine sides (reverse)"
 msgstr "Suskirstyti puses (atvirkščiai)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/app-window.vala:1010
 msgid "Reverse"
 msgstr "Atvirkščiai"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/app-window.vala:1020
 msgid "Keep unchanged"
 msgstr "Palikti nepakeistus"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/app-window.vala:1250
 msgid "Unable to open help file"
 msgstr "Nepavyko atverti žinyno failo"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/app-window.vala:1271
 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 +553,16 @@ msgstr ""
 "šia programa; jei negavote, žiūrėkite <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/app-window.vala:1274
 msgid "About Simple Scan"
 msgstr "Apie Paprastą skenavimą"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/app-window.vala:1277
 msgid "Simple document scanning tool"
 msgstr "Paprastas dokumentų skenavimo įrankis"
 
-#: ../src/ui.vala:1487
+#: src/app-window.vala:1286
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -561,284 +571,517 @@ 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/app-window.vala:1308
 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
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:1310
 msgid "Quit without Saving"
 msgstr "Baigti neįrašant"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/app-window.vala:1357
 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/app-window.vala:1359
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.brother.com\">Brother website</a>."
+"Drivers for this are available on the <a href=\"http://support.brother.com"
+"\">Brother website</a>."
 msgstr ""
-"Tvarkyklės šiam įrenginiui yra prieinamos <a "
-"href=\"http://support.brother.com\">Brother svetainėje</a>."
+"Tvarkyklės šiam įrenginiui yra prieinamos <a href=\"http://support.brother."
+"com\">Brother svetainėje</a>."
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/app-window.vala:1363
 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/app-window.vala:1365
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://samsung.com/support\">Samsung website</a>."
+"Drivers for this are available on the <a href=\"http://samsung.com/support"
+"\">Samsung website</a>."
 msgstr ""
-"Tvarkyklės šiam įrenginiui yra prieinamos <a "
-"href=\"http://samsung.com/support\">Samsung svetainėje</a>."
+"Tvarkyklės šiam įrenginiui yra prieinamos <a href=\"http://samsung.com/"
+"support\">Samsung svetainėje</a>."
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/app-window.vala:1369
 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/app-window.vala:1374
 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/app-window.vala:1376
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.epson.com\">Epson website</a>."
+"Drivers for this are available on the <a href=\"http://support.epson.com"
+"\">Epson website</a>."
 msgstr ""
-"Tvarkyklės šiam įrenginiui yra prieinamos <a "
-"href=\"http://support.epson.com\">Epson svetainėje</a>."
+"Tvarkyklės šiam įrenginiui yra prieinamos <a href=\"http://support.epson.com"
+"\">Epson svetainėje</a>."
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/app-window.vala:1380
 msgid "Install drivers"
 msgstr "Įdiegti tvarkykles"
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/app-window.vala:1411
 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
-msgid "Installing drivers..."
-msgstr "Įdiegiamos tvarkyklės..."
+#: src/app-window.vala:1423
+msgid "Installing drivers…"
+msgstr "Įdiegiamos tvarkyklės…"
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/app-window.vala:1431
 msgid "Drivers installed successfully!"
 msgstr "Tvarkyklės sėkmingai įdiegtos!"
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/app-window.vala:1441
 #, 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/app-window.vala:1447
 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/app-window.vala:1454
 #, c-format
-msgid "You need to install the %s package(s)."
-msgstr "Jums reikia įdiegti %s paketą(-us)."
+msgid "You need to install the %s package."
+msgid_plural "You need to install the %s packages."
+msgstr[0] "Jums reikia įdiegti %s paketą."
+msgstr[1] "Jums reikia įdiegti %s paketus."
+msgstr[2] "Jums reikia įdiegti %s paketus."
+
+#. Title of preferences dialog
+#: src/app-window.vala:1568 src/app-window.vala:1591
+#: src/preferences-dialog.ui:53
+msgid "Preferences"
+msgstr "Nuostatos"
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
-#, c-format
-msgid "%d dpi (default)"
-msgstr "%d tašk./col. (numatytoji)"
+#: src/app-window.vala:1572
+msgid "Keyboard Shortcuts"
+msgstr "Klaviatūros trumpiniai"
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
-#, c-format
-msgid "%d dpi (draft)"
-msgstr "%d tašk./col. (juodraštis)"
+#: src/app-window.vala:1573
+msgid "Help"
+msgstr "Žinynas"
 
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
-#, c-format
-msgid "%d dpi (high resolution)"
-msgstr "%d tašk./col. (didelė raiška)"
+#: src/app-window.vala:1574
+msgid "About"
+msgstr "Apie"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/app-window.vala:1575
+msgid "Quit"
+msgstr "Baigti"
+
+#: src/app-window.vala:1589
+msgid "Email"
+msgstr "El. paštu"
+
+#. Populate ActionBar (not supported in Glade)
+#. https://bugzilla.gnome.org/show_bug.cgi?id=769966
+#. Label on new document button
+#: src/app-window.vala:1599
+msgid "Start Again…"
+msgstr "Pradėti iš naujo…"
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: src/app-window.vala:1616
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Pasukti puslapį kairėn (prieš laikrodžio rodyklę)"
+
+#. Tooltip for rotate right (clockwise) button
+#: src/app-window.vala:1623
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Pasukti puslapį dešinėn (pagal laikrodžio rodyklę)"
+
+#. Tooltip for crop button
+#: src/app-window.vala:1633
+msgid "Crop the selected page"
+msgstr "Apkirpti pažymėtą puslapį"
+
+#. Tooltip for delete button
+#: src/app-window.vala:1649
+msgid "Delete the selected page"
+msgstr "Ištrinti pasirinktą puslapį"
+
+#. Text of button for cancelling save
+#: src/app-window.vala:1814
+msgid "Cancel"
+msgstr "Atsisakyti"
+
+#. Button to submit authorization dialog
+#: src/authorize-dialog.ui:25
+msgid "_Authorize"
+msgstr "Į_galioti"
+
+#. Label beside username entry
+#: src/authorize-dialog.ui:99
+msgid "_Username for resource:"
+msgstr "Ištekliaus na_udotojo vardas:"
+
+#. Label beside password entry
+#: src/authorize-dialog.ui:112
+msgid "_Password:"
+msgstr "Sla_ptažodis:"
+
+#: src/book.vala:331 src/book.vala:337
 #, c-format
-msgid "%d dpi"
-msgstr "%d tašk./col."
+msgid "Unable to encode page %i"
+msgstr "Nepavyko užkoduoti puslapio %i"
+
+#: src/help-overlay.ui:12
+msgctxt "shortcut window"
+msgid "Scanning"
+msgstr "Skenuojama"
+
+#: src/help-overlay.ui:17
+msgctxt "shortcut window"
+msgid "Scan a single page"
+msgstr "Skenuoti vieną puslapį"
+
+#: src/help-overlay.ui:24
+msgctxt "shortcut window"
+msgid "Scan all pages from document feeder"
+msgstr "Skenuoti visus puslapius iš dokumento dėklo"
+
+#: src/help-overlay.ui:31
+msgctxt "shortcut window"
+msgid "Scan continuously from a flatbed scanner"
+msgstr "Skenuoti nenutrūkstamai nuo skenavimo plokštumos"
+
+#: src/help-overlay.ui:38
+msgctxt "shortcut window"
+msgid "Stop scan in progress"
+msgstr "Stabdyti skenavimą"
+
+#: src/help-overlay.ui:46
+msgctxt "shortcut window"
+msgid "Document Modification"
+msgstr "Dokumentų pakeitimas"
+
+#: src/help-overlay.ui:51
+msgctxt "shortcut window"
+msgid "Move page left"
+msgstr "Perkelti puslapį kairėn"
+
+#: src/help-overlay.ui:58
+msgctxt "shortcut window"
+msgid "Move page right"
+msgstr "Perkelti puslapį dešinėn"
+
+#: src/help-overlay.ui:65
+msgctxt "shortcut window"
+msgid "Rotate page to the left (anti-clockwise)"
+msgstr "Pasukti puslapį kairėn (prieš laikrodžio rodyklę)"
 
-#: ../src/ui.vala:1835
-msgid "New Document"
-msgstr "Naujas dokumentas"
+#: src/help-overlay.ui:72
+msgctxt "shortcut window"
+msgid "Rotate page to the right (clockwise)"
+msgstr "Pasukti puslapį dešinėn (pagal laikrodžio rodyklę)"
 
-#: ../src/ui.vala:1840
-msgid "Document"
-msgstr "Dokumentas"
+#: src/help-overlay.ui:79
+msgctxt "shortcut window"
+msgid "Delete page"
+msgstr "Ištrinti puslapį"
 
-#: ../src/ui.vala:1844
-msgid "Email..."
-msgstr "El. paštas..."
+#: src/help-overlay.ui:87
+msgctxt "shortcut window"
+msgid "Document Management"
+msgstr "Dokumento valdymas"
 
-#: ../src/ui.vala:1845
-msgid "Print..."
-msgstr "Spausdinti..."
+#: src/help-overlay.ui:92
+msgctxt "shortcut window"
+msgid "Start new document"
+msgstr "Pradėti naują dokumentą"
 
-#: ../src/ui.vala:1853
-msgid "Help"
-msgstr "Žinynas"
+#: src/help-overlay.ui:99
+msgctxt "shortcut window"
+msgid "Save scanned document"
+msgstr "Įrašyti nuskenuotą dokumentą"
 
-#: ../src/ui.vala:1854
-msgid "About"
-msgstr "Apie"
+#: src/help-overlay.ui:106
+msgctxt "shortcut window"
+msgid "Email scanned document"
+msgstr "Siųsti nuskenuotą dokumentą el. paštu"
 
-#: ../src/ui.vala:1855
-msgid "Quit"
-msgstr "Baigti"
+#: src/help-overlay.ui:113
+msgctxt "shortcut window"
+msgid "Print scanned document"
+msgstr "Spausdinti nuskenuotą dokumentą"
+
+#: src/help-overlay.ui:120
+msgctxt "shortcut window"
+msgid "Copy current page to clipboard"
+msgstr "Kopijuoti nuskenuotą dokumentą į iškarpinę"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:113
+msgid "_Scanner"
+msgstr "_Skeneris"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
-msgid "Change _Scanner"
-msgstr "Keisti _skenerį"
+#. Label beside scan side combo box
+#: src/preferences-dialog.ui:143
+msgid "Scan Sides"
+msgstr "Skenuoti puses"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
-msgid "_Install Drivers"
-msgstr "Į_diegti tvarkykles"
+#. Label beside page size combo box
+#: src/preferences-dialog.ui:160
+msgid "Page Size"
+msgstr "Puslapio dydis"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:191
+msgid "Front"
+msgstr "Priekinė pusė"
+
+#. Preferences Dialog: Toggle button to select scanning on the back side of a page
+#: src/preferences-dialog.ui:206
+msgid "Back"
+msgstr "Galinė pusė"
+
+#. Preferences Dialog: Toggle button to select scanning on both sides of a page
+#: src/preferences-dialog.ui:221
+msgid "Both"
+msgstr "Abi"
+
+#. Label beside page delay scale
+#: src/preferences-dialog.ui:260
+msgid "Delay"
+msgstr "Delsa"
+
+#. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
+#: src/preferences-dialog.ui:276
+#| msgid "Multiple page from flatbed"
+msgid "Multiple pages from flatbed"
+msgstr "Daug puslapių nuo plokštumos"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:295
+msgid "3"
+msgstr "3"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:310
+msgid "5"
+msgstr "5"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:326
+msgid "7"
+msgstr "7"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:342
+msgid "10"
+msgstr "10"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:358
+msgid "15"
+msgstr "15"
+
+#. Label after page delay radio buttons
+#: src/preferences-dialog.ui:385
+msgid "Seconds"
+msgstr "Sekundžių"
+
+#. Preferences Dialog: Tab label for scanning settings
+#: src/preferences-dialog.ui:413
+msgid "Scanning"
+msgstr "Skenuojama"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:436
+msgid "_Text Resolution"
+msgstr "_Teksto raiška"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:452
+msgid "_Photo Resolution"
+msgstr "_Nuotraukos raiška"
+
+#. Label beside brightness scale
+#: src/preferences-dialog.ui:505
+msgid "Brightness"
+msgstr "Šviesumas"
+
+#. Label beside contrast scale
+#: src/preferences-dialog.ui:521
+msgid "Contrast"
+msgstr "Kontrastas"
+
+#. Preferences Dialog: Tab for quality settings
+#: src/preferences-dialog.ui:576
+msgid "Quality"
+msgstr "Kokybė"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/preferences-dialog.vala:77
 msgid "Automatic"
 msgstr "Automatinis"
 
-#: ../src/ui.vala:1947
+#: src/preferences-dialog.vala:116
 msgid "Darker"
 msgstr "Tamsesnis"
 
-#: ../src/ui.vala:1949
+#: src/preferences-dialog.vala:118
 msgid "Lighter"
 msgstr "Šviesesnis"
 
-#: ../src/ui.vala:1957
+#: src/preferences-dialog.vala:126
 msgid "Less"
 msgstr "Mažiau"
 
-#: ../src/ui.vala:1959
+#: src/preferences-dialog.vala:128
 msgid "More"
 msgstr "Daugiau"
 
-#: ../src/ui.vala:1967
-msgid "Minimum"
-msgstr "Žemiausia"
+#. Preferences dialog: Label for default resolution in resolution list
+#: src/preferences-dialog.vala:440
+#, c-format
+msgid "%d dpi (default)"
+msgstr "%d tašk./col. (numatytoji)"
 
-#: ../src/ui.vala:1969
-msgid "Maximum"
-msgstr "Aukščiausia"
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: src/preferences-dialog.vala:443
+#, c-format
+msgid "%d dpi (draft)"
+msgstr "%d tašk./col. (juodraštis)"
 
-#: ../src/ui.vala:2008
-msgid "Saving document..."
-msgstr "Įrašomas dokumentas..."
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: src/preferences-dialog.vala:446
+#, c-format
+msgid "%d dpi (high resolution)"
+msgstr "%d tašk./col. (didelė raiška)"
 
-#: ../src/ui.vala:2173
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: src/preferences-dialog.vala:449
 #, c-format
-msgid "Saving page %d out of %d"
-msgstr "Įrašomas puslapis %d iš %d"
+msgid "%d dpi"
+msgstr "%d tašk./col."
 
-#~ msgid "The direction of the scanner across the scanned page."
-#~ msgstr "Skaitytuvo kryptis per skaitomą puslapį."
+#. Error displayed when no scanners to scan with
+#: src/scanner.vala:844
+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:874
+msgid "Unable to connect to scanner"
+msgstr "Nepavyko prisijungti prie skenerio"
+
+#. Error display when unable to start scan
+#: src/scanner.vala:1227
+msgid "Unable to start scan"
+msgstr "Nepavyko pradėti skenavimo"
+
+#. Error displayed when communication with scanner broken
+#: src/scanner.vala:1240 src/scanner.vala:1340
+msgid "Error communicating with scanner"
+msgstr "Klaida susisiekiant su skeneriu"
 
-#~ msgid "Contrast of scan"
-#~ msgstr "Nuskenuoto dokumento kontrastas"
+#. Help string for command line --version flag
+#: src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "Rodyti laidos versiją"
 
-#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
-#~ msgstr "Skaisčio derinimas nuo -100 iki 100 (0 nėra)."
+#. Help string for command line --debug flag
+#: src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Išvesti derinimo pranešimus"
 
-#~ msgid "Brightness of scan"
-#~ msgstr "Nuskenuoto dokumento skaistis"
+#: 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"
 
-#~ msgid "Quality value to use for JPEG compression"
-#~ msgstr "Kokybės reikšmė JPEG glaudinimui"
+#. Title of error dialog when scan failed
+#: src/simple-scan.vala:392
+msgid "Failed to scan"
+msgstr "Skenavimas nepavyko"
 
-#~ msgid ""
-#~ "Type of document being scanned. This setting decides on the scan resolution, "
-#~ "colors and post-processing."
-#~ msgstr ""
-#~ "Skenuojamo dokumento tipas. Šis nustatymas apsprendžia skaitymo raišką, "
-#~ "spalvas ir baigiamąjį apdorojimą."
+#. Attempt to inhibit the screensaver when scanning
+#: src/simple-scan.vala:407
+msgid "Scan in progress"
+msgstr "Vykdomas skenavimas"
 
-#~ msgid "Type of document being scanned"
-#~ msgstr "Skenuojamo dokumento tipas"
+#. Arguments and description for --help text
+#: src/simple-scan.vala:584
+msgid "[DEVICE…] — Scanning utility"
+msgstr "[ĮRENGINYS...] - Skenavimo įraknis"
+
+#. Text printed out when an unknown command-line argument provided
+#: src/simple-scan.vala:595
+#, 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“."
 
-#~ msgid "Device to scan from"
-#~ msgstr "Skenavimo įrenginys"
+#~ msgid "Front and Back"
+#~ msgstr "Abi pusės"
 
-#~ msgid "Resolution for text scans"
-#~ msgstr "Teksto skenavimo raiška"
+#~ msgid "New"
+#~ msgstr "Naujas"
 
-#~ msgid "Resolution for photo scans"
-#~ msgstr "Nuotraukų skenavimo raiška"
+#~ msgid "Rotate Left"
+#~ msgstr "Pasukti kairėn"
 
-#~ msgid "The resolution in dots-per-inch to use when scanning text."
-#~ msgstr "Raiška taškais colyje skenuojant tekstą."
+#~ msgid "Rotate Right"
+#~ msgstr "Pasukti dešinėn"
 
-#~ msgid "The resolution in dots-per-inch to use when scanning photos."
-#~ msgstr "Raiška taškais colyje skenuojant nuotraukas."
+#~ msgid "Crop"
+#~ msgstr "Apkirpti"
 
-#~ msgid "Page side to scan"
-#~ msgstr "Skenuojama puslapio pusė"
+#~ msgid "Scan S_ource:"
+#~ msgstr "Skenavimo š_altinis:"
 
-#~ msgid "The page side to scan."
-#~ msgstr "Puslapio pusė, kurią skenuoti."
+#~ msgid "New Document"
+#~ msgstr "Naujas dokumentas"
 
-#~ msgid ""
-#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
-#~ msgstr ""
-#~ "Popieriaus aukštis dešimtosiomis milimetro dalimis (arba 0 automatiniam "
-#~ "popieriaus aptikimui)."
+#~ msgid "Document"
+#~ msgstr "Dokumentas"
 
-#~ msgid "Height of paper in tenths of a mm"
-#~ msgstr "Popieriaus aukštis dešimtosiomis milimetro dalimis"
+#~ msgid "Email..."
+#~ msgstr "El. paštas..."
 
-#~ msgid ""
-#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
-#~ msgstr ""
-#~ "Popieriaus plotis dešimtosiomis milimetro dalimis (arba 0 automatiniam "
-#~ "popieriaus aptikimui)."
+#~ msgid "Print..."
+#~ msgstr "Spausdinti..."
 
-#~ msgid "SANE device to acquire images from."
-#~ msgstr "SANE įrenginys, iš kurio gauti paveikslus."
+#~ msgid "_Install Drivers"
+#~ msgstr "Į_diegti tvarkykles"
 
-#~ msgid "Width of paper in tenths of a mm"
-#~ msgstr "Popieriaus plotis dešimtosiomis milimetro dalimis"
+#~ msgid "Minimum"
+#~ msgstr "Žemiausia"
 
-#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
-#~ msgstr "Kontrasto reguliavimas nuo -100 iki 100 (0 nėra)."
+#~ msgid "Maximum"
+#~ msgstr "Aukščiausia"
 
-#~ msgid ""
-#~ "The directory to save files to. Defaults to the documents directory if unset."
-#~ msgstr ""
-#~ "Katalogas failams įrašyti. Jei nenustatyta, numatytoji reikšmė yra dokumentų "
-#~ "katalogas."
+#~ msgid "Saving document..."
+#~ msgstr "Įrašomas dokumentas..."
 
-#~ msgid "Directory to save files to"
-#~ msgstr "Katalogas, į kurį įrašyti failus"
+#~ msgid "Saving page %d out of %d"
+#~ msgstr "Įrašomas puslapis %d iš %d"
 
-#~ msgid "Quality value to use for JPEG compression."
-#~ msgstr "Kokybės reikšmė, naudojama JPEG glaudinimui."
+#~ msgid "The direction of the scanner across the scanned page."
+#~ msgstr "Skaitytuvo kryptis per skaitomą puslapį."
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..e5c4659 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -1,513 +1,533 @@
 # Latvian translation for simple-scan
 # Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
 # This file is distributed under the same license as the simple-scan package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
 #
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+# Rūdolfs Mazurs <rudolfs.mazurs@gmail.com>, 2017.
 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"
-"Language-Team: Latvian <lv@li.org>\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=simple-"
+"scan&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-08-13 21:51+0000\n"
+"PO-Revision-Date: 2017-08-28 16:43+0200\n"
+"Last-Translator: Rūdolfs Mazurs <rudolfs.mazurs@gmail.com>\n"
+"Language-Team: Latvian <lata-l10n@googlegroups.com>\n"
+"Language: lv\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-25 06:10+0000\n"
+"X-Generator: Lokalize 2.0\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 :"
+" 2);\n"
 
-#. Button to submit authorization dialog
-#: data/simple-scan.ui:24
-msgid "_Authorize"
-msgstr "_Autorizēties"
+#: data/org.gnome.SimpleScan.gschema.xml:11
+msgid "Device to scan from"
+msgstr "Ierīce, no kuras skenēt"
 
-#. Label beside username entry
-#: data/simple-scan.ui:102
-msgid "_Username for resource:"
-msgstr "Res_ursa lietotājvārds:"
+#: data/org.gnome.SimpleScan.gschema.xml:12
+msgid "SANE device to acquire images from."
+msgstr "SANE ierīce, no kuras iegūt attēlus."
 
-#. Label beside password entry
-#: data/simple-scan.ui:117
-msgid "_Password:"
-msgstr "_Parole:"
+#: data/org.gnome.SimpleScan.gschema.xml:20
+msgid "Type of document being scanned"
+msgstr "Skenējamā dokumenta veids"
+
+#: data/org.gnome.SimpleScan.gschema.xml:21
+msgid ""
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+msgstr ""
+"Skenējamā dokumenta veids. Šīs iestatījums nosaka skenēšanas izšķirtspēju, "
+"krāsas un pēcapstrādi."
 
-#. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
-msgid "Front and Back"
-msgstr "Priekšpuse un aizmugure"
+#: data/org.gnome.SimpleScan.gschema.xml:25
+msgid "Width of paper in tenths of a mm"
+msgstr "Papīra platums mm desmitdaļās"
 
-#. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
-msgid "Front"
-msgstr "Priekšpuse"
+#: data/org.gnome.SimpleScan.gschema.xml:26
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"Papīra platums mm desmitdaļās (vai 0 automātiskai papīra biezuma "
+"noteikšanai)."
 
-#. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
-msgid "Back"
-msgstr "Aizmugure"
+#: data/org.gnome.SimpleScan.gschema.xml:30
+msgid "Height of paper in tenths of a mm"
+msgstr "Papīra garums mm desmitdaļās"
+
+#: data/org.gnome.SimpleScan.gschema.xml:31
+msgid ""
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"Papīra garums mm desmitdaļās (vai 0 automātiskai papīra biezuma noteikšanai)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:35
+msgid "Brightness of scan"
+msgstr "Skenējuma gaišums"
 
+#: data/org.gnome.SimpleScan.gschema.xml:36
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr "Gaišuma pielāgojums no -100 līdz 100 (0 nozīmē nekāds)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:40
+msgid "Contrast of scan"
+msgstr "Skenējuma kontrasts"
+
+#: data/org.gnome.SimpleScan.gschema.xml:41
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr "Kontrasta pielāgojums no -100 līdz 100 (0 nozīmē nekāds)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:45
+msgid "Resolution for text scans"
+msgstr "Teksta skenējumu izšķirtspēja"
+
+#: data/org.gnome.SimpleScan.gschema.xml:46
+msgid "The resolution in dots-per-inch to use when scanning text."
+msgstr "Izšķirtspēja punktos/collā, skenējot tekstu."
+
+#: data/org.gnome.SimpleScan.gschema.xml:50
+msgid "Resolution for photo scans"
+msgstr "Fotogrāfiju skenējumu izšķirtspēja"
+
+#: data/org.gnome.SimpleScan.gschema.xml:51
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr "Izšķirtspēja punktos/collā, skenējot fotogrāfijas."
+
+#: data/org.gnome.SimpleScan.gschema.xml:55
+msgid "Page side to scan"
+msgstr "Skenējamā lapas puse"
+
+#: data/org.gnome.SimpleScan.gschema.xml:56
+msgid "The page side to scan."
+msgstr "Skenējamās lapas puse."
+
+#: data/org.gnome.SimpleScan.gschema.xml:60
+msgid "Directory to save files to"
+msgstr "Direktorija, kurā saglabāt datnes"
+
+#: data/org.gnome.SimpleScan.gschema.xml:61
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+"Direktorija, kurā saglabāt datnes. Pēc noklusējuma datnes tiks glabātas "
+"dokumentu direktorijā."
+
+#: data/org.gnome.SimpleScan.gschema.xml:66
+msgid "Quality value to use for JPEG compression"
+msgstr "Kvalitātes vērtība, ko izmantot JPEG saspiešanai"
+
+#: data/org.gnome.SimpleScan.gschema.xml:67
+msgid "Quality value to use for JPEG compression."
+msgstr "Kvalitātes vērtība, ko izmantot JPEG saspiešanai."
+
+#: data/org.gnome.SimpleScan.gschema.xml:72
+msgid "Delay in millisecond between pages"
+msgstr "Aizture milisekundēs starp lappusēm"
+
+#: data/org.gnome.SimpleScan.gschema.xml:73
+msgid "Delay in millisecond between pages."
+msgstr "Aizture milisekundēs starp lappusēm."
+
+#. Title of scan window
+#. Set HeaderBar title here because Glade doesn't keep it translated
+#. https://bugzilla.gnome.org/show_bug.cgi?id=782753
 #. 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
+#: data/simple-scan.appdata.xml.in:6 data/simple-scan.desktop.in:3
+#: src/app-window.ui:76 src/app-window.vala:1560
 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
-msgid "_Document"
-msgstr "_Dokuments"
+#: data/simple-scan.appdata.xml.in:7 data/simple-scan.desktop.in:5
+msgid "Scan Documents"
+msgstr "Skenēt dokumentus"
 
-#. Scan menu item
-#: data/simple-scan.ui:260
-msgid "Sc_an"
-msgstr "Sk_enēt"
+#: 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 "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+"Ļoti vienkāršs veids, kā skenēt dokumentus un fotogrāfijas. Jūs varat"
+" izgriezt ārā sliktās fotogrāfijas daļas un tās pagriezt, ja tās ir nepareizā"
+" virzienā. Varat izdrukāt ieskanētos dokumentus, eksportēt tos pdf formātā"
+" vai saglabāt tos dažādos attēlu formātos."
+
+#: data/simple-scan.appdata.xml.in:14
+msgid "Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+"Vienkāršā skenēšana izmanto SANE ietvaru, kas atbalsta vairumu esošo skeneru."
+
+#: data/simple-scan.desktop.in:4
+msgid "Document Scanner"
+msgstr "Dokumentu skenētājs"
+
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: data/simple-scan.desktop.in:7
+msgid "scan;scanner;flatbed;adf;"
+msgstr "skenēt;skeneris;plakanvirsma;adf;"
 
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: data/simple-scan.desktop.in:10
+msgid "scanner"
+msgstr "scanner"
+
+#. Toolbar scan menu item to scan a single page from the scanner
 #. 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/app-window.ui:22 src/app-window.ui:123 src/app-window.ui:820
 msgid "Single _Page"
 msgstr "Viena la_pa"
 
+#. Toolbar scan menu item to scan all pages from a document feeder
 #. 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/app-window.ui:31 src/app-window.ui:133 src/app-window.ui:829
 msgid "All Pages From _Feeder"
 msgstr "Visas lapas no _padeves"
 
-#. Menu entry to stop current scan
-#: data/simple-scan.ui:294
-msgid "_Stop Scan"
-msgstr "Apturēt _skenēšanu"
+#. Toolbar scan menu item to scan continuously from the flatbed
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/app-window.ui:40 src/app-window.ui:143 src/app-window.ui:838
+msgid "_Multiple Pages From Flatbed"
+msgstr "_Vairākas lappuses no plakanvirsmas"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:853
 msgid "Text"
 msgstr "Teksts"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:863
 msgid "Photo"
 msgstr "Foto"
 
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: src/app-window.ui:91
+msgid "_Document"
+msgstr "_Dokuments"
+
+#. Scan menu item
+#: src/app-window.ui:110
+msgid "Sc_an"
+msgstr "Sk_enēt"
+
+#. Menu entry to stop current scan
+#: src/app-window.ui:154
+msgid "_Stop Scan"
+msgstr "Apturēt _skenēšanu"
+
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/app-window.ui:196 src/app-window.vala:967 src/app-window.vala:1590
 msgid "Reorder Pages"
-msgstr ""
+msgstr "Pārkārtot lapas"
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/app-window.ui:215
 msgid "_Email"
 msgstr "_E-pasts"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/app-window.ui:280
 msgid "_Page"
 msgstr "La_pa"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/app-window.ui:290
 msgid "Rotate _Left"
 msgstr "Pagriezt pa _kreisi"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/app-window.ui:300
 msgid "Rotate _Right"
 msgstr "Pag_riezt pa labi"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/app-window.ui:310
 msgid "_Crop"
-msgstr "Ap_cirst"
+msgstr "_Kadrēt"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/app-window.ui:320
 msgid "_None"
 msgstr "_Bez"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/app-window.ui:331
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/app-window.ui:342
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/app-window.ui:353
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/app-window.ui:364
 msgid "_Letter"
-msgstr "_Letter"
+msgstr "_Vēstules forma"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/app-window.ui:375
 msgid "Le_gal"
-msgstr "Le_gal"
+msgstr "Le_gāls"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/app-window.ui:386
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/app-window.ui:397
 msgid "_Custom"
 msgstr "_Pielāgots"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/app-window.ui:415
 msgid "_Rotate Crop"
-msgstr "Pag_riezt apciršanu"
+msgstr "Pag_riezt kadrējumu"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/app-window.ui:428
 msgid "Move Left"
 msgstr "Pārvietot pa kreisi"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/app-window.ui:437
 msgid "Move Right"
 msgstr "Pārvietot pa labi"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/app-window.ui:474
 msgid "_Help"
 msgstr "_Palīdzība"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/app-window.ui:482
 msgid "_Contents"
 msgstr "_Saturs"
 
-#. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
-msgid "Start a new document"
-msgstr "Sākt jaunu dokumentu"
-
-#: data/simple-scan.ui:675
-msgid "New"
-msgstr "Jauns"
-
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/app-window.ui:520 src/app-window.ui:720
 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/app-window.ui:522 src/app-window.ui:716
 msgid "Scan"
 msgstr "Skenēt"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/app-window.ui:538 src/app-window.ui:787
 msgid "Save document to a file"
 msgstr "Saglabāt dokumentu datnē"
 
-#: ../src/ui.vala:1842
+#: src/app-window.ui:540
 msgid "Save"
 msgstr "Saglabāt"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/app-window.ui:555 src/app-window.ui:700
 msgid "Stop the current scan"
 msgstr "Apturēt pašreizējo skenēšanu"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/app-window.ui:556 src/app-window.ui:697
 msgid "Stop"
 msgstr "Apturēt"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "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
-msgid "Rotate Left"
-msgstr "Pagriezt pa kreisi"
+#. Label shown when searching for scanners
+#: src/app-window.ui:611
+msgid "Searching for Scanners…"
+msgstr "Meklē skenerus…"
 
-#. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
-msgid "Rotate the page to the right (clockwise)"
-msgstr "Pagriezt lapu pa labi (pulksteņa rādītāja virzienā)"
-
-#. Label on rotate page right (clockwise) item
-#: data/simple-scan.ui:765
-msgid "Rotate Right"
-msgstr "Pagriezt pa labi"
-
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
-msgid "Crop the selected page"
-msgstr "Apcirst izvēlēto lapu"
-
-#: data/simple-scan.ui:781
-msgid "Crop"
-msgstr "Apcirst"
-
-#: ../src/ui.vala:1849
-msgid "Preferences"
-msgstr "Iestatījumi"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1048
-msgid "Scan S_ource:"
-msgstr "Skenēšanas av_ots:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1079
-msgid "_Text Resolution:"
-msgstr "_Teksta izšķirtspēja:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1095
-msgid "_Photo Resolution:"
-msgstr "Fotogrāfijas izšķirts_pēja:"
-
-#. Label beside scan side combo box
-#: data/simple-scan.ui:1139
-msgid "Scan Side:"
-msgstr "Skenējamā puse:"
-
-#. Label beside page size combo box
-#: data/simple-scan.ui:1169
-msgid "Page Size:"
-msgstr "Lapas izmērs:"
-
-#. Label beside brightness scale
-#: data/simple-scan.ui:1199
-msgid "Brightness:"
-msgstr "Gaišums:"
-
-#. Label beside contrast scale
-#: data/simple-scan.ui:1229
-msgid "Contrast:"
-msgstr "Kontrasts:"
-
-#. Label beside quality scale
-#: data/simple-scan.ui:1260
-msgid "Quality:"
-msgstr "Kvalitāte:"
-
-#: data/simple-scan.desktop.in:4
-msgid "Document Scanner"
-msgstr ""
-
-#: data/simple-scan.desktop.in:5
-msgid "Scan Documents"
-msgstr "Skenēt dokumentus"
+#: src/app-window.vala:237 src/app-window.vala:1380
+msgid "_Close"
+msgstr "_Aizvērt"
 
-#: data/simple-scan.desktop.in:6
-msgid "scan;scanner;flatbed;adf;"
-msgstr ""
+#. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
+#: src/app-window.vala:246
+#, c-format
+#| msgid "Username and password required to access '%s'"
+msgid "Username and password required to access “%s”"
+msgstr "Lai piekļūtu “%s”, ir vajadzīgs lietotājvārds un parole"
 
-#: data/simple-scan.desktop.in:8
-msgid "scanner"
-msgstr ""
+#. Label shown when detected a scanner
+#: src/app-window.vala:266 src/app-window.vala:584
+#| msgid "Failed to scan"
+msgid "Ready to Scan"
+msgstr "Gatavs skenēt"
 
-#: data/simple-scan.appdata.xml.in:8
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: src/app-window.vala:273
+msgid "Additional software needed"
+msgstr "Nepieciešama papildu programmatūra"
 
-#: data/simple-scan.appdata.xml.in:13
+#. Instructions to install driver software
+#: src/app-window.vala:275
 msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
+"You need to <a href=\"install-firmware\">install driver software</a> for "
+"your scanner."
 msgstr ""
-
-#. Error displayed when no scanners to scan with
-#: ../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
-msgid "Unable to connect to scanner"
-msgstr "Neizdevās savienoties ar skeneri"
-
-#. Error display when unable to start scan
-#: ../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
-msgid "Error communicating with scanner"
-msgstr "Kļūda, sazinoties ar skeneri"
-
-#. Help string for command line --version flag
-#: ../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
-msgid "Print debugging messages"
-msgstr "Drukāt atkļūdošanas ziņojumus"
-
-#: ../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
-msgid "Failed to scan"
-msgstr "Neizdevās skenēt"
-
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
-msgid "[DEVICE...] - Scanning utility"
-msgstr "[IERĪCE...] - skenēšanas utilītprogramma"
-
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
-#, 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
-msgid "_Close"
-msgstr "_Aizvērt"
-
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../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"
+"Vajadzēs <a href=\"install-firmware\">uzinstalēt draiveri</a> šim skenerim."
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/app-window.vala:281
 msgid "No scanners detected"
 msgstr "Nav atrasts neviens skeneris"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/app-window.vala:283
 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
-msgid "Additional software needed"
-msgstr ""
-
-#. Instructions to install driver software
-#: ../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
-msgid "Save As..."
-msgstr "Saglabāt kā..."
+#: src/app-window.vala:298
+#| msgid "Save As..."
+msgid "Save As…"
+msgstr "Saglabāt kā…"
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/app-window.vala:301 src/app-window.vala:471 src/app-window.vala:552
 msgid "_Cancel"
 msgstr "At_celt"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/app-window.vala:302 src/app-window.vala:553
 msgid "_Save"
 msgstr "_Saglabāt"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/app-window.vala:310
 msgid "Scanned Document.pdf"
 msgstr "Ieskenēts Dokuments.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#. Save dialog: Filter name to show only supported image files
+#: src/app-window.vala:316
 msgid "Image Files"
 msgstr "Attēlu datnes"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/app-window.vala:326
 msgid "All Files"
 msgstr "Visas datnes"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/app-window.vala:335
 msgid "PDF (multi-page document)"
 msgstr "PDF (vairāku lapu dokuments)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/app-window.vala:341
 msgid "JPEG (compressed)"
 msgstr "JPEG (saspiests)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/app-window.vala:347
 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
+#. Save dialog: Label for sabing in WEBP format
+#: src/app-window.vala:354
+#| msgid "JPEG (compressed)"
+msgid "WebP (compressed)"
+msgstr "WebP (saspiests)"
+
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
+#: src/app-window.vala:364
 msgid "File format:"
-msgstr ""
+msgstr "Datnes formāts:"
+
+#. Label in save dialog beside compression slider
+#: src/app-window.vala:376
+msgid "Compression:"
+msgstr "Saspiešana:"
+
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/app-window.vala:470
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr "Datne ar nosaukumu “%s” jau eksistē. Vai jūs vēlaties to aizstāt?"
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/app-window.vala:473
+msgid "_Replace"
+msgstr "_Aizstāt"
+
+#: src/app-window.vala:512
+msgid "Saving"
+msgstr "Saglabā"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/app-window.vala:527
 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
-msgid "If you don't save, changes will be permanently lost."
+#: src/app-window.vala:550
+#| msgid "If you don't save, changes will be permanently lost."
+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/app-window.vala:591
 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/app-window.vala:593
 msgid "Discard Changes"
 msgstr "Izmest izmaiņas"
 
+#. Label shown when scan started
+#: src/app-window.vala:692
+#| msgid "Change _Scanner"
+msgid "Contacting scanner…"
+msgstr "Sazinās ar skeneri…"
+
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/app-window.vala:800
 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/app-window.vala:812
 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/app-window.vala:990
 msgid "Combine sides"
-msgstr ""
+msgstr "Apvienot puses"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/app-window.vala:1000
 msgid "Combine sides (reverse)"
-msgstr ""
+msgstr "Apvienot puses (apgriezti)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/app-window.vala:1010
 msgid "Reverse"
 msgstr "Pagriezt"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/app-window.vala:1020
 msgid "Keep unchanged"
 msgstr "Paturēt nemainīti"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/app-window.vala:1250
 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/app-window.vala:1271
 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 +553,16 @@ msgstr ""
 "nesaņēmāt, skatiet <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/app-window.vala:1274
 msgid "About Simple Scan"
 msgstr "Par Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/app-window.vala:1277
 msgid "Simple document scanning tool"
 msgstr "Vienkāršs dokumentu skenēšanas rīks"
 
-#: ../src/ui.vala:1487
+#: src/app-window.vala:1286
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -552,199 +572,541 @@ 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/app-window.vala:1308
 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
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:1310
 msgid "Quit without Saving"
 msgstr "Iziet nesaglabājot"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/app-window.vala:1357
 msgid "You appear to have a Brother scanner."
-msgstr ""
+msgstr "Izskatās, ka jums ir Brother skeneris."
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/app-window.vala:1359
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.brother.com\">Brother website</a>."
+"Drivers for this are available on the <a href=\"http://support.brother.com"
+"\">Brother website</a>."
 msgstr ""
+"Tam draiveri ir pieejami <a href=\"http://support.brother.com\">Brother"
+" tīmekļa vietnē</a>."
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/app-window.vala:1363
 msgid "You appear to have a Samsung scanner."
-msgstr ""
+msgstr "Izskatās, ka jums ir Samsung skeneris."
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/app-window.vala:1365
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://samsung.com/support\">Samsung website</a>."
+"Drivers for this are available on the <a href=\"http://samsung.com/support"
+"\">Samsung website</a>."
 msgstr ""
+"Tam draiveri ir pieejami <a href=\"http://samsung.com/support\">Samsung"
+" tīmekļa vietnē</a>."
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/app-window.vala:1369
 msgid "You appear to have an HP scanner."
-msgstr ""
+msgstr "Izskatās, ka jums ir HP skeneris."
 
 #. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/app-window.vala:1374
 msgid "You appear to have an Epson scanner."
-msgstr ""
+msgstr "Izskatās, ka jums ir Epson skeneris."
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/app-window.vala:1376
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.epson.com\">Epson website</a>."
+"Drivers for this are available on the <a href=\"http://support.epson.com"
+"\">Epson website</a>."
 msgstr ""
+"Tam draiveri ir pieejami <a href=\"http://support.epson.com\">Epson tīmekļa"
+" vietnē</a>."
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/app-window.vala:1380
 msgid "Install drivers"
-msgstr ""
+msgstr "Instalēt draiverus"
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/app-window.vala:1411
 msgid "Once installed you will need to restart Simple Scan."
-msgstr ""
+msgstr "Kad tie ir instalēti, jums vajadzēs pārstartēt “Vienkāršo skenēšanu”."
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
-msgid "Installing drivers..."
-msgstr ""
+#: src/app-window.vala:1423
+msgid "Installing drivers…"
+msgstr "Instalē draiverus…"
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/app-window.vala:1431
 msgid "Drivers installed successfully!"
-msgstr ""
+msgstr "Draiveri ir veiksmīgi uzinstalēti!"
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/app-window.vala:1441
 #, c-format
 msgid "Failed to install drivers (error code %d)."
-msgstr ""
+msgstr "Neizdevās uzinstalēt draiverus (kļūdas kods %d)."
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/app-window.vala:1447
 msgid "Failed to install drivers."
-msgstr ""
+msgstr "Neizdevās uzinstalēt draiverus."
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/app-window.vala:1454
 #, c-format
-msgid "You need to install the %s package(s)."
-msgstr ""
+msgid "You need to install the %s package."
+msgid_plural "You need to install the %s packages."
+msgstr[0] "Jums jāuzinstalē %s pakotne."
+msgstr[1] "Jums jāuzinstalē %s pakotnes."
+msgstr[2] "Jums jāuzinstalē %s pakotņu."
+
+#. Title of preferences dialog
+#: src/app-window.vala:1568 src/app-window.vala:1591
+#: src/preferences-dialog.ui:53
+msgid "Preferences"
+msgstr "Iestatījumi"
+
+#: src/app-window.vala:1572
+msgid "Keyboard Shortcuts"
+msgstr "Tastatūras saīsnes"
+
+#: src/app-window.vala:1573
+msgid "Help"
+msgstr "Palīdzība"
+
+#: src/app-window.vala:1574
+msgid "About"
+msgstr "Par"
+
+#: src/app-window.vala:1575
+msgid "Quit"
+msgstr "Iziet"
+
+#: src/app-window.vala:1589
+#| msgid "_Email"
+msgid "Email"
+msgstr "E-pasts"
+
+#. Populate ActionBar (not supported in Glade)
+#. https://bugzilla.gnome.org/show_bug.cgi?id=769966
+#. Label on new document button
+#: src/app-window.vala:1599
+msgid "Start Again…"
+msgstr "Startēt atkal…"
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: src/app-window.vala:1616
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Pagriezt lapu pa kreisi (pretēji pulksteņa rādītāja virzienam)"
+
+#. Tooltip for rotate right (clockwise) button
+#: src/app-window.vala:1623
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Pagriezt lapu pa labi (pulksteņa rādītāja virzienā)"
+
+#. Tooltip for crop button
+#: src/app-window.vala:1633
+msgid "Crop the selected page"
+msgstr "Kadrēt izvēlēto lapu"
+
+#. Tooltip for delete button
+#: src/app-window.vala:1649
+#| msgid "Crop the selected page"
+msgid "Delete the selected page"
+msgstr "Dzēst izvēlēto lapu"
+
+#. Text of button for cancelling save
+#: src/app-window.vala:1814
+#| msgid "_Cancel"
+msgid "Cancel"
+msgstr "Atcelt"
+
+#. Button to submit authorization dialog
+#: src/authorize-dialog.ui:25
+msgid "_Authorize"
+msgstr "_Autorizēties"
+
+#. Label beside username entry
+#: src/authorize-dialog.ui:99
+msgid "_Username for resource:"
+msgstr "Res_ursa lietotājvārds:"
+
+#. Label beside password entry
+#: src/authorize-dialog.ui:112
+msgid "_Password:"
+msgstr "_Parole:"
+
+#: src/book.vala:331 src/book.vala:337
+#, c-format
+#| msgid "Unable to open help file"
+msgid "Unable to encode page %i"
+msgstr "Nevar iekodēt lapu %i"
+
+#: src/help-overlay.ui:12
+#| msgid "Scan"
+msgctxt "shortcut window"
+msgid "Scanning"
+msgstr "Skenēšana"
+
+#: src/help-overlay.ui:17
+#| msgid "Scan a single page from the scanner"
+msgctxt "shortcut window"
+msgid "Scan a single page"
+msgstr "Ieskenēt vienu lapu"
+
+#: src/help-overlay.ui:24
+#| msgid "Scan a single page from the scanner"
+msgctxt "shortcut window"
+msgid "Scan all pages from document feeder"
+msgstr "Ieskenēt visas lapas no dokumentu padevēja"
+
+#: src/help-overlay.ui:31
+#| msgid "Scan a single page from the scanner"
+msgctxt "shortcut window"
+msgid "Scan continuously from a flatbed scanner"
+msgstr "Ieskenēt nepārtraukti no plakanvirsmas skenera"
+
+#: src/help-overlay.ui:38
+msgctxt "shortcut window"
+msgid "Stop scan in progress"
+msgstr "Apturēt skenēšanu"
+
+#: src/help-overlay.ui:46
+msgctxt "shortcut window"
+msgid "Document Modification"
+msgstr "Dokumenta modifikācijas"
+
+#: src/help-overlay.ui:51
+#| msgid "Move Left"
+msgctxt "shortcut window"
+msgid "Move page left"
+msgstr "Pārvietot lapu pa kreisi"
+
+#: src/help-overlay.ui:58
+#| msgid "Move Right"
+msgctxt "shortcut window"
+msgid "Move page right"
+msgstr "Pārvietot lapu pa labi"
+
+#: src/help-overlay.ui:65
+#| msgid "Rotate the page to the left (counter-clockwise)"
+msgctxt "shortcut window"
+msgid "Rotate page to the left (anti-clockwise)"
+msgstr "Pagriezt lapu pa kreisi (pretēji pulksteņa rādītāja virzienam)"
+
+#: src/help-overlay.ui:72
+#| msgid "Rotate the page to the right (clockwise)"
+msgctxt "shortcut window"
+msgid "Rotate page to the right (clockwise)"
+msgstr "Pagriezt lapu pa labi (pulksteņa rādītāja virzienā)"
+
+#: src/help-overlay.ui:79
+#| msgid "Crop the selected page"
+msgctxt "shortcut window"
+msgid "Delete page"
+msgstr "Dzēst lapu"
+
+#: src/help-overlay.ui:87
+msgctxt "shortcut window"
+msgid "Document Management"
+msgstr "Dokumentu pārvaldība"
+
+#: src/help-overlay.ui:92
+#| msgid "Start a new document"
+msgctxt "shortcut window"
+msgid "Start new document"
+msgstr "Sākt jaunu dokumentu"
+
+#: src/help-overlay.ui:99
+#| msgid "Scanned Document"
+msgctxt "shortcut window"
+msgid "Save scanned document"
+msgstr "Saglabāt skenēto dokumentu"
+
+#: src/help-overlay.ui:106
+#| msgid "Scanned Document"
+msgctxt "shortcut window"
+msgid "Email scanned document"
+msgstr "Sūtīt skenēto dokumentu pa e-pastu"
+
+#: src/help-overlay.ui:113
+#| msgid "Scanned Document"
+msgctxt "shortcut window"
+msgid "Print scanned document"
+msgstr "Drukāt skenēto dokumentu"
+
+#: src/help-overlay.ui:120
+msgctxt "shortcut window"
+msgid "Copy current page to clipboard"
+msgstr "Kopēt šo lapu uz starpliktuvi"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:113
+#| msgid "Change _Scanner"
+msgid "_Scanner"
+msgstr "_Skeneris"
+
+#. Label beside scan side combo box
+#: src/preferences-dialog.ui:143
+#| msgid "Scan Side:"
+msgid "Scan Sides"
+msgstr "Skenēt puses"
+
+#. Label beside page size combo box
+#: src/preferences-dialog.ui:160
+#| msgid "Page Size:"
+msgid "Page Size"
+msgstr "Lapas izmērs"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:191
+msgid "Front"
+msgstr "Priekšpuse"
+
+#. Preferences Dialog: Toggle button to select scanning on the back side of a page
+#: src/preferences-dialog.ui:206
+msgid "Back"
+msgstr "Aizmugure"
+
+#. Preferences Dialog: Toggle button to select scanning on both sides of a page
+#: src/preferences-dialog.ui:221
+msgid "Both"
+msgstr "Abas"
+
+#. Label beside page delay scale
+#: src/preferences-dialog.ui:260
+msgid "Delay"
+msgstr "Aizture"
+
+#. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
+#: src/preferences-dialog.ui:276
+msgid "Multiple pages from flatbed"
+msgstr "Vairākas lappuses no plakanvirsmas"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:295
+msgid "3"
+msgstr "3"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:310
+msgid "5"
+msgstr "5"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:326
+msgid "7"
+msgstr "7"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:342
+msgid "10"
+msgstr "10"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:358
+msgid "15"
+msgstr "15"
+
+#. Label after page delay radio buttons
+#: src/preferences-dialog.ui:385
+msgid "Seconds"
+msgstr "Sekundes"
+
+#. Preferences Dialog: Tab label for scanning settings
+#: src/preferences-dialog.ui:413
+#| msgid "Scan"
+msgid "Scanning"
+msgstr "Skenēšana"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:436
+#| msgid "_Text Resolution:"
+msgid "_Text Resolution"
+msgstr "_Teksta izšķirtspēja"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:452
+#| msgid "_Photo Resolution:"
+msgid "_Photo Resolution"
+msgstr "Fotogrāfijas izšķirts_pēja"
+
+#. Label beside brightness scale
+#: src/preferences-dialog.ui:505
+#| msgid "Brightness:"
+msgid "Brightness"
+msgstr "Gaišums"
+
+#. Label beside contrast scale
+#: src/preferences-dialog.ui:521
+#| msgid "Contrast:"
+msgid "Contrast"
+msgstr "Kontrasts"
+
+#. Preferences Dialog: Tab for quality settings
+#: src/preferences-dialog.ui:576
+#| msgid "Quality:"
+msgid "Quality"
+msgstr "Kvalitāte"
+
+#. Combo box value for automatic paper size
+#: src/preferences-dialog.vala:77
+msgid "Automatic"
+msgstr "Automātiski"
+
+#: src/preferences-dialog.vala:116
+msgid "Darker"
+msgstr "Tumšāks"
+
+#: src/preferences-dialog.vala:118
+msgid "Lighter"
+msgstr "Gaišāks"
+
+#: src/preferences-dialog.vala:126
+msgid "Less"
+msgstr "Mazāk"
+
+#: src/preferences-dialog.vala:128
+msgid "More"
+msgstr "Vairāk"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/preferences-dialog.vala:440
 #, 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/preferences-dialog.vala:443
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (melraksts)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/preferences-dialog.vala:446
 #, 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/preferences-dialog.vala:449
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1835
-msgid "New Document"
-msgstr "Jauns dokuments"
+#. Error displayed when no scanners to scan with
+#: src/scanner.vala:844
+msgid "No scanners available.  Please connect a scanner."
+msgstr "Skeneris nav atrasts. Lūdzu, pievienojiet skeneri."
 
-#: ../src/ui.vala:1840
-msgid "Document"
-msgstr "Dokuments"
+#. Error displayed when cannot connect to scanner
+#: src/scanner.vala:874
+msgid "Unable to connect to scanner"
+msgstr "Neizdevās savienoties ar skeneri"
 
-#: ../src/ui.vala:1844
-msgid "Email..."
-msgstr "Epasts..."
+#. Error display when unable to start scan
+#: src/scanner.vala:1227
+msgid "Unable to start scan"
+msgstr "Neizdevās sākt skenēšanu"
 
-#: ../src/ui.vala:1845
-msgid "Print..."
-msgstr "Drukāt..."
+#. Error displayed when communication with scanner broken
+#: src/scanner.vala:1240 src/scanner.vala:1340
+msgid "Error communicating with scanner"
+msgstr "Kļūda, sazinoties ar skeneri"
 
-#: ../src/ui.vala:1853
-msgid "Help"
-msgstr "Palīdzība"
+#. Help string for command line --version flag
+#: src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "Rādīt laidiena versiju"
 
-#: ../src/ui.vala:1854
-msgid "About"
-msgstr "Par"
+#. Help string for command line --debug flag
+#: src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Drukāt atkļūdošanas ziņojumus"
 
-#: ../src/ui.vala:1855
-msgid "Quit"
-msgstr "Iziet"
+#: 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"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
-msgid "Change _Scanner"
-msgstr "Mainīt _skeneri"
+#. Title of error dialog when scan failed
+#: src/simple-scan.vala:392
+msgid "Failed to scan"
+msgstr "Neizdevās skenēt"
+
+#. Attempt to inhibit the screensaver when scanning
+#: src/simple-scan.vala:407
+msgid "Scan in progress"
+msgstr "Notiek skenēšana"
+
+#. Arguments and description for --help text
+#: src/simple-scan.vala:584
+#| msgid "[DEVICE...] - Scanning utility"
+msgid "[DEVICE…] — Scanning utility"
+msgstr "[IERĪCE…] — skenēšanas utilītprogramma"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
-msgid "_Install Drivers"
+#. Text printed out when an unknown command-line argument provided
+#: src/simple-scan.vala:595
+#, c-format
+#| msgid ""
+#| "Run '%s --help' to see a full list of available command line options."
+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."
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
-msgid "Automatic"
-msgstr "Automātiski"
+#~ msgid "Front and Back"
+#~ msgstr "Priekšpuse un aizmugure"
 
-#: ../src/ui.vala:1947
-msgid "Darker"
-msgstr "Tumšāks"
+#~ msgid "New"
+#~ msgstr "Jauns"
 
-#: ../src/ui.vala:1949
-msgid "Lighter"
-msgstr "Gaišāks"
+#~ msgid "Rotate Left"
+#~ msgstr "Pagriezt pa kreisi"
 
-#: ../src/ui.vala:1957
-msgid "Less"
-msgstr "Mazāk"
+#~ msgid "Rotate Right"
+#~ msgstr "Pagriezt pa labi"
 
-#: ../src/ui.vala:1959
-msgid "More"
-msgstr "Vairāk"
+#~ msgid "Crop"
+#~ msgstr "Apcirst"
 
-#: ../src/ui.vala:1967
-msgid "Minimum"
-msgstr "Minimums"
+#~ msgid "Scan S_ource:"
+#~ msgstr "Skenēšanas av_ots:"
 
-#: ../src/ui.vala:1969
-msgid "Maximum"
-msgstr "Maksimums"
+#~ msgid "New Document"
+#~ msgstr "Jauns dokuments"
 
-#: ../src/ui.vala:2008
-msgid "Saving document..."
-msgstr "Saglabā dokumentu..."
+#~ msgid "Document"
+#~ msgstr "Dokuments"
 
-#: ../src/ui.vala:2173
-#, c-format
-msgid "Saving page %d out of %d"
-msgstr "Saglabā lapu %d no %d"
+#~ msgid "Email..."
+#~ msgstr "Epasts..."
+
+#~ msgid "Print..."
+#~ msgstr "Drukāt..."
+
+#~ msgid "Minimum"
+#~ msgstr "Minimums"
+
+#~ msgid "Maximum"
+#~ msgstr "Maksimums"
+
+#~ msgid "Saving document..."
+#~ msgstr "Saglabā dokumentu..."
+
+#~ msgid "Saving page %d out of %d"
+#~ msgstr "Saglabā lapu %d no %d"
 
 #~ msgid "4&#xD7;6"
 #~ msgstr "4&#xD7;6"
 
-#~ msgid "Device to scan from"
-#~ msgstr "Ierīce, no kuras skenēt"
-
 #~ msgid "Direction of scan"
 #~ msgstr "Skenēšanas virziens"
 
@@ -752,8 +1114,8 @@ msgstr "Saglabā lapu %d no %d"
 #~ msgstr "Skenētā attēla augstums pikseļos"
 
 #~ msgid ""
-#~ "The width of scanned image in pixels. This value is updated to what the last "
-#~ "scanned page was."
+#~ "The width of scanned image in pixels. This value is updated to what the "
+#~ "last scanned page was."
 #~ msgstr ""
 #~ "Skenētā attēla platums pikseļos. Šī vērtība tiek atjaunināta uz pēdējās "
 #~ "skenētās lapas."
@@ -770,15 +1132,6 @@ msgstr "Saglabā lapu %d no %d"
 #~ msgid "Please check your installation"
 #~ msgstr "Lūdzu, pārbaudiet instalāciju"
 
-#~ msgid "SANE device to acquire images from."
-#~ msgstr "SANE ierīce, no kuras iegūt attēlus."
-
-#~ msgid "Resolution for photo scans"
-#~ msgstr "Fotogrāfiju skenējumu izšķirtspēja"
-
-#~ msgid "Resolution for text scans"
-#~ msgstr "Teksta skenējumu izšķirtspēja"
-
 #~ msgid "Resolution of last scanned image"
 #~ msgstr "Pēdējā skenētā attēla izšķirtspēja"
 
@@ -789,88 +1142,17 @@ msgstr "Saglabā lapu %d no %d"
 #~ "Skenētā attēla augstums pikseļos. Šī vērtība tiek atjaunināta, ņemot vērā "
 #~ "pēdējo skenēto lapu."
 
-#~ msgid "The resolution in dots-per-inch to use when scanning photos."
-#~ msgstr "Izšķirtspēja punktos/collā, skenējot fotogrāfijas."
-
-#~ msgid "The resolution in dots-per-inch to use when scanning text."
-#~ msgstr "Izšķirtspēja punktos/collā, skenējot tekstu."
-
 #~ msgid "The resolution in dots-per-inch of the previously scanned image."
 #~ msgstr "Iepriekšēji skenētā attēla izšķirtspēja punktos/collā."
 
-#~ msgid "Scanned Document"
-#~ msgstr "Skenēts dokuments"
-
-#~ msgid ""
-#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
-#~ msgstr ""
-#~ "Papīra garums mm desmitdaļās (vai 0 automātiskai papīra biezuma noteikšanai)."
-
-#~ msgid "Page side to scan"
-#~ msgstr "Skenējamā lapas puse"
-
-#~ msgid "Height of paper in tenths of a mm"
-#~ msgstr "Papīra garums mm desmitdaļās"
-
-#~ msgid ""
-#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
-#~ msgstr ""
-#~ "Papīra platums mm desmitdaļās (vai 0 automātiskai papīra biezuma "
-#~ "noteikšanai)."
-
-#~ msgid "Width of paper in tenths of a mm"
-#~ msgstr "Papīra platums mm desmitdaļās"
-
-#~ msgid "The page side to scan."
-#~ msgstr "Skenējamās lapas puse."
-
-#~ msgid ""
-#~ "Type of document being scanned. This setting decides on the scan resolution, "
-#~ "colors and post-processing."
-#~ msgstr ""
-#~ "Skenējamā dokumenta veids. Šīs iestatījums nosaka skenēšanas izšķirtspēju, "
-#~ "krāsas un pēcapstrādi."
-
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "Skenera virziens pāri skenējamai lapai."
 
 #~ msgid "TRUE if the application window is maximized"
 #~ msgstr "PATIESS, ja lietotnes logs ir maksimizēts"
 
-#~ msgid "Type of document being scanned"
-#~ msgstr "Skenējamā dokumenta veids"
-
-#~ msgid "Directory to save files to"
-#~ msgstr "Direktorija, kurā saglabāt datnes"
-
-#~ msgid ""
-#~ "The directory to save files to. Defaults to the documents directory if unset."
-#~ msgstr ""
-#~ "Direktorija, kurā saglabāt datnes. Pēc noklusējuma datnes tiks glabātas "
-#~ "dokumentu direktorijā."
-
 #~ msgid "Select File _Type"
 #~ msgstr "Norādīt datnes _tipu"
 
 #~ msgid "Files missing"
 #~ msgstr "Pietrūkst datņu"
-
-#~ msgid "Quality value to use for JPEG compression."
-#~ msgstr "Kvalitātes vērtība, ko izmantot JPEG saspiešanai."
-
-#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
-#~ msgstr "Kontrasta pielāgojums no -100 līdz 100 (0 nozīmē nekāds)."
-
-#~ msgid "Contrast of scan"
-#~ msgstr "Skenējuma kontrasts"
-
-#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
-#~ msgstr "Gaišuma pielāgojums no -100 līdz 100 (0 nozīmē nekāds)."
-
-#~ msgid "Brightness of scan"
-#~ msgstr "Skenējuma gaišums"
-
-#~ msgid "Quality value to use for JPEG compression"
-#~ msgstr "Kvalitātes vērtība, ko izmantot JPEG saspiešanai"
diff --git a/po/meson.build b/po/meson.build
new file mode 100644
index 0000000..6a0dcc9
--- /dev/null
+++ b/po/meson.build
@@ -0,0 +1,3 @@
+i18n.gettext ('simple-scan', preset: 'glib')
+
+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..3e2df46 100644
--- a/po/mhr.po
+++ b/po/mhr.po
@@ -7,296 +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"
+"POT-Creation-Date: 2017-04-16 08:54-0400\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"
+"Language: mhr\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-25 06:10+0000\n"
+"X-Generator: Launchpad (build 18361)\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 "Simple Scan"
 
 #. 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
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: 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 "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:498
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:509
 msgid "A_6"
 msgstr "A_6"
 
 #. 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 "US Le_gal"
 
 #. 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 ""
 
-#: ../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 "Лектыш"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: 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 ""
 
@@ -308,7 +322,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 +330,207 @@ 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:844
 msgid "No scanners available.  Please connect a scanner."
 msgstr ""
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:874
 msgid "Unable to connect to scanner"
 msgstr ""
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1227
 msgid "Unable to start scan"
 msgstr ""
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: 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
+#: 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:332 src/ui.vala:1655 src/ui.vala:1935
 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:341
 #, 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:389
 msgid "No scanners detected"
 msgstr ""
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:391
 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:396
 msgid "Additional software needed"
 msgstr ""
 
 #. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:398
 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: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 ""
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:522
 msgid "Scanned Document.pdf"
 msgstr ""
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:528
 msgid "Image Files"
 msgstr ""
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:534
 msgid "All Files"
 msgstr ""
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:543
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:549
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:555
 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: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:650
+#: src/ui.vala:698
 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:721
 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:763
 msgid "Save current document?"
 msgstr ""
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:765
 msgid "Discard Changes"
 msgstr ""
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:1056
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1068
 msgid "Unable to open image preview application"
 msgstr ""
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1270
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1280
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1290
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1300
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1504
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: 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"
@@ -522,16 +547,16 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1528
 msgid "About Simple Scan"
 msgstr ""
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1531
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1540
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -539,189 +564,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:1562
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1564
 msgid "Quit without Saving"
 msgstr ""
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1632
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1634
 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:1638
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1640
 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:1644
 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:1649
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1651
 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:1655
 msgid "Install drivers"
 msgstr ""
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1686
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1698
 msgid "Installing drivers..."
 msgstr ""
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1706
 msgid "Drivers installed successfully!"
 msgstr ""
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1716
 #, 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:1722
 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:1729
 #, 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:1833
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1836
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1839
 #, 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: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 ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1937
 msgid "Change _Scanner"
 msgstr ""
 
 #. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1939
 msgid "_Install Drivers"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: 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/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..231a6c5 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -7,296 +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"
+"POT-Creation-Date: 2017-04-16 08:54-0400\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"
+"Language: ms\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-25 06:10+0000\n"
+"X-Generator: Launchpad (build 18361)\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:231 src/simple-scan.ui:815 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:247
 msgid "_Document"
 msgstr "_Dokumen"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/simple-scan.ui:266
 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:279 src/simple-scan.ui:1343 src/simple-scan.ui:1402
 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:289 src/simple-scan.ui:1352 src/simple-scan.ui:1411
 msgid "All Pages From _Feeder"
 msgstr "Semua Halaman Dari _Suapan"
 
+#. 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 "_Henti Imbas"
 
-#: 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 "Teks"
 
-#: 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 "Foto"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/simple-scan.ui:352 src/ui.vala:1247 src/ui.vala:1891
 msgid "Reorder Pages"
 msgstr "Tertib Semula Halaman"
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/simple-scan.ui:371
 msgid "_Email"
 msgstr "_Emel"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:436
 msgid "_Page"
 msgstr "_Halaman"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:446
 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:456
 msgid "Rotate _Right"
 msgstr "Putar Ke Ka_nan"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:466
 msgid "_Crop"
 msgstr "_Crop"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:476
 msgid "_None"
 msgstr "_Tiada"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:487
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:498
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:509
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:520
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:531
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:542
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:553
 msgid "_Custom"
 msgstr "_Tersendiri"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:571
 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:584
 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:593
 msgid "Move Right"
 msgstr "ALih Ke Kanan"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:630
 msgid "_Help"
 msgstr "_Bantuan"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:638
 msgid "_Contents"
 msgstr "_Kandungan"
 
 #. 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 "Mulakan dokumen baru"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:681
 msgid "New"
 msgstr "Baru"
 
 #. 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 "Imbas halaman tunggal dari pengimbas"
 
 #. 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 "Imbas"
 
 #. 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 "Simpan dokumen ke fail"
 
-#: ../src/ui.vala:1842
+#: src/simple-scan.ui:715 src/ui.vala:1892
 msgid "Save"
 msgstr "Simpan"
 
 #. 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 "Hentikan Imbasan semasa"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:731 src/simple-scan.ui:831
 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:755 src/simple-scan.ui:942
 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:756
 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:770 src/simple-scan.ui:920
 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:771
 msgid "Rotate Right"
 msgstr "Putar Ke Kanan"
 
-#: 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 "Kerat halaman pilihan"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:787
 msgid "Crop"
 msgstr "Kerat"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:1003 src/ui.vala:1898
 msgid "Preferences"
 msgstr "Keutamaan"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1054
 msgid "Scan S_ource:"
 msgstr "Imbas Su_mber:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1085
 msgid "_Text Resolution:"
 msgstr "Resolusi _Teks:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1101
 msgid "_Photo Resolution:"
 msgstr "Resolusi _Foto:"
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1145
 msgid "Scan Side:"
 msgstr "Imbas Sisi:"
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1175
 msgid "Page Size:"
 msgstr "Saiz Halaman:"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1205
 msgid "Brightness:"
 msgstr "Kecerahan:"
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1235
 msgid "Contrast:"
 msgstr "Beza Jelas:"
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1266
 msgid "Quality:"
 msgstr "Kualiti:"
 
+#. 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 "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 +322,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 +334,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 +342,203 @@ msgstr ""
 "pengimbas sedia ada."
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:844
 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:874
 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:1227
 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:1240 src/scanner.vala:1340
 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:332 src/ui.vala:1655 src/ui.vala:1935
 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:341
 #, 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:389
 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:391
 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:396
 msgid "Additional software needed"
 msgstr "Perisian tambahan diperlukan"
 
 #. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:398
 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:510
 msgid "Save As..."
 msgstr "Simpan Sebagai..."
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:513 src/ui.vala:648 src/ui.vala:723
 msgid "_Cancel"
 msgstr "_Batal"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:514 src/ui.vala:724
 msgid "_Save"
 msgstr "_Simpan"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:522
 msgid "Scanned Document.pdf"
 msgstr "Dokumen Diimbas.pdf"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:528
 msgid "Image Files"
 msgstr "Fail Imej"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:534
 msgid "All Files"
 msgstr "Semua Fail"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:543
 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:549
 msgid "JPEG (compressed)"
 msgstr "JPEG (termampat)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:555
 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:564
 msgid "File format:"
 msgstr "Format fail:"
 
+#. 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:650
+#: src/ui.vala:698
 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:721
 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:763
 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:765
 msgid "Discard Changes"
 msgstr "Abai Perubahan"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:1056
 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:1068
 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:1270
 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:1280
 msgid "Combine sides (reverse)"
 msgstr "Gabung sisi (songsang)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1290
 msgid "Reverse"
 msgstr "Songsang"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1300
 msgid "Keep unchanged"
 msgstr "Kekal tidak berubah"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1504
 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: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"
@@ -542,16 +567,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:1528
 msgid "About Simple Scan"
 msgstr "Mengenai Pengimbas Ringkas"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1531
 msgid "Simple document scanning tool"
 msgstr "Alat mengimbas dokumen mudah"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1540
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -563,22 +588,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:1562
 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:1564
 msgid "Quit without Saving"
 msgstr "Keluar tanpa Menyimpan"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1632
 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:1634
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
@@ -587,12 +612,12 @@ msgstr ""
 "Brother</a>."
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1638
 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:1640
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
@@ -601,17 +626,17 @@ msgstr ""
 "Samsung</a>."
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1644
 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:1649
 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:1651
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
@@ -620,138 +645,138 @@ msgstr ""
 "sesawang Epson</a>."
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1655
 msgid "Install drivers"
 msgstr "Pasang pemacu"
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1686
 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:1698
 msgid "Installing drivers..."
 msgstr "Memasng pemacu..."
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1706
 msgid "Drivers installed successfully!"
 msgstr "Pemacu berjaya dipasangkan!"
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1716
 #, 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:1722
 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:1729
 #, 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:1833
 #, 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:1836
 #, 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:1839
 #, 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:1842
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1885
 msgid "New Document"
 msgstr "Dokumen Baharu"
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1890
 msgid "Document"
 msgstr "Dokumen"
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1893
 msgid "Email..."
 msgstr "Emel..."
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1894
 msgid "Print..."
 msgstr "Cetak..."
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1902
 msgid "Help"
 msgstr "Bantuan"
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1903
 msgid "About"
 msgstr "Perihal"
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1904
 msgid "Quit"
 msgstr "Keluar"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1937
 msgid "Change _Scanner"
 msgstr "Ubah _Pengimbas"
 
 #. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1939
 msgid "_Install Drivers"
 msgstr "_Pasang Pemacu"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1945
 msgid "Automatic"
 msgstr "Automatik"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1995
 msgid "Darker"
 msgstr "Lebih Gelap"
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1997
 msgid "Lighter"
 msgstr "Lebih Cerah"
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:2005
 msgid "Less"
 msgstr "Kurang"
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:2007
 msgid "More"
 msgstr "Lagi"
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:2015
 msgid "Minimum"
 msgstr "Minimum"
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:2017
 msgid "Maximum"
 msgstr "Maksimum"
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2068
 msgid "Saving document..."
 msgstr "Menyimpan dokumen..."
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2242
 #, 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..f59d888 100644
--- a/po/my.po
+++ b/po/my.po
@@ -7,296 +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"
+"POT-Creation-Date: 2017-04-16 08:54-0400\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"
+"Language: my\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-25 06:10+0000\n"
+"X-Generator: Launchpad (build 18361)\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:231 src/simple-scan.ui:815 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:247
 msgid "_Document"
 msgstr "_Dစာရွက်စာတမ်း"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/simple-scan.ui:266
 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:279 src/simple-scan.ui:1343 src/simple-scan.ui:1402
 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:289 src/simple-scan.ui:1352 src/simple-scan.ui:1411
 msgid "All Pages From _Feeder"
 msgstr "_F Feeder မှ စာမျက်နှာအားလုံး"
 
+#. 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 "_S Scan ရပ်မည်။"
 
-#: 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
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: 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 "_Eအီးမေး"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:436
 msgid "_Page"
 msgstr "_Pစာမျက်နှာ"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:446
 msgid "Rotate _Left"
 msgstr "_L ဘယ်ဖက်လှည့်ပါ။"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:456
 msgid "Rotate _Right"
 msgstr "_R ညာဖက်သို့လှည့်မည်။"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:466
 msgid "_Crop"
 msgstr "_C ဖြတ်ပါ။"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:476
 msgid "_None"
 msgstr "_Nဘာမှမဟုတ်"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:487
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:498
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:509
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:520
 msgid "_Letter"
 msgstr "_L စာ"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:531
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. 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 "_Custom"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:571
 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: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 "_H အကူအညီ"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:638
 msgid "_Contents"
 msgstr "_  C ခေါင်းစဉ်"
 
 #. 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 "Scanner ထဲမှ စာမျက်နှာ တစ်ရွက်တည်းကို Scan ဖတ်မည်။"
 
 #. 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 "Scan"
 
 #. 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 "ဖိုင် တစ်ခုထဲသို့ စာရွက်စာတမ်း ကိုသိမ်းပါ။"
 
-#: ../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 "ယခု Scan ဖတ်နေခြင်းကိုရပ်မည်။"
 
-#: 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 "ဖြတ်ပါ။"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:1003 src/ui.vala:1898
 msgid "Preferences"
 msgstr "Preferences"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1054
 msgid "Scan S_ource:"
 msgstr "Scan S_ource:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1085
 msgid "_Text Resolution:"
 msgstr "_Text Resolution:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1101
 msgid "_Photo Resolution:"
 msgstr "_Pဓာတ်ပုံ resolution-"
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1145
 msgid "Scan Side:"
 msgstr "Scan Side:"
 
 #. 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 "Scan Documents"
 
@@ -308,7 +322,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 +330,209 @@ 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:844
 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:874
 msgid "Unable to connect to scanner"
 msgstr "Scanner နှင့်မချိတ်ဆက်နိုင်ပါ။"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1227
 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:1240 src/scanner.vala:1340
 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:332 src/ui.vala:1655 src/ui.vala:1935
 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:341
 #, 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:389
 msgid "No scanners detected"
 msgstr "Scanner ရှာမတွေ့ပါ။"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:391
 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:396
 msgid "Additional software needed"
 msgstr ""
 
 #. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:398
 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:510
 msgid "Save As..."
 msgstr "Save As..."
 
-#: ../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 ""
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:522
 msgid "Scanned Document.pdf"
 msgstr "Scanned Document.pdf"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:528
 msgid "Image Files"
 msgstr "Image Files"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:534
 msgid "All Files"
 msgstr "ဖိုင်အလုံးစုံ"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:543
 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:549
 msgid "JPEG (compressed)"
 msgstr "JPEG (compressed)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:555
 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: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:650
+#: src/ui.vala:698
 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:721
 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:763
 msgid "Save current document?"
 msgstr "ယခုစာရွက်စာတမ်းကိုသိမ်းမလား။"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:765
 msgid "Discard Changes"
 msgstr "Discard Changes"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:1056
 msgid "Unable to save image for preview"
 msgstr "ကြည့်ရူရန်အတွက် ပုံများကိုမသိမ်းနိုင်ပါ။"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1068
 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:1270
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1280
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1290
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1300
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1504
 msgid "Unable to open help file"
 msgstr "အကူအညီဖိုင်ကို မဖွင့်နိုင်ပါ။"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: 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"
@@ -536,16 +561,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:1528
 msgid "About Simple Scan"
 msgstr "ရိုးရှင်းစွာ Scan ဖတ်ခြင်းအကြောင်း"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1531
 msgid "Simple document scanning tool"
 msgstr "Simple document scanning tool"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1540
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -553,189 +578,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:1562
 msgid "Save document before quitting?"
 msgstr "မပိတ်ခင် စာရွက်စာတမ်းများကိုသိမ်းမလား။"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1564
 msgid "Quit without Saving"
 msgstr "မသိမ်းပဲနှင့်ထွက်မည်။"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1632
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1634
 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:1638
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1640
 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:1644
 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:1649
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1651
 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:1655
 msgid "Install drivers"
 msgstr ""
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1686
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1698
 msgid "Installing drivers..."
 msgstr ""
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1706
 msgid "Drivers installed successfully!"
 msgstr ""
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1716
 #, 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:1722
 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:1729
 #, 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:1833
 #, 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:1836
 #, 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:1839
 #, 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:1842
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../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 ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1937
 msgid "Change _Scanner"
 msgstr "Change _Scanner"
 
 #. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1939
 msgid "_Install Drivers"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: 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/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..ca9419f 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -1,517 +1,522 @@
 # Norwegian Bokmal translation for simple-scan
 # Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
 # This file is distributed under the same license as the simple-scan package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
+# Kjetil Birkeland Moe <kjetil@skifremme.no>, 2009.
+# Kjartan Maraas <kmaraas@gnome.org>, 2017.
 #
 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-09-02 16:41+0000\n"
-"Last-Translator: Kjetil Birkeland Moe <kjetil@skifremme.no>\n"
-"Language-Team: Norwegian Bokmal <nb@li.org>\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=simple-scan&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-07-29 16:18+0000\n"
+"PO-Revision-Date: 2017-08-02 09:54+0200\n"
+"Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
+"Language-Team: Norwegian Bokmal <i18n-nb@lister.ping.uio.no>\n"
+"Language: nb\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-25 06:10+0000\n"
+"X-Generator: Launchpad (build 18361)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);"
 
-#. Button to submit authorization dialog
-#: data/simple-scan.ui:24
-msgid "_Authorize"
-msgstr "_Autoriser"
+#: data/org.gnome.SimpleScan.gschema.xml:11
+msgid "Device to scan from"
+msgstr "Enhet det skal skannes fra"
 
-#. Label beside username entry
-#: data/simple-scan.ui:102
-msgid "_Username for resource:"
-msgstr "_Brukernavn for ressurs:"
+#: data/org.gnome.SimpleScan.gschema.xml:12
+msgid "SANE device to acquire images from."
+msgstr "SANE-enhet som bilder skal hentes fra."
 
-#. Label beside password entry
-#: data/simple-scan.ui:117
-msgid "_Password:"
-msgstr "_Passord:"
+#: data/org.gnome.SimpleScan.gschema.xml:20
+msgid "Type of document being scanned"
+msgstr "Dokumenttype som skannes"
+
+#: data/org.gnome.SimpleScan.gschema.xml:21
+msgid ""
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+msgstr ""
+"Dokumenttype som skal scannes. Denne innstillingen endrer oppløsning, farger "
+"og etterbehandling."
 
-#. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
-msgid "Front and Back"
-msgstr "For- og bakside"
+#: data/org.gnome.SimpleScan.gschema.xml:25
+msgid "Width of paper in tenths of a mm"
+msgstr "Papirbredde i tiendels millimeter"
 
-#. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
-msgid "Front"
-msgstr "Forside"
+#: data/org.gnome.SimpleScan.gschema.xml:26
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"Papirbredden i tiendels millimeter (eller 0 for automatisk gjenkjenning)."
 
-#. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
-msgid "Back"
-msgstr "Bakside"
+#: data/org.gnome.SimpleScan.gschema.xml:30
+msgid "Height of paper in tenths of a mm"
+msgstr "Papirhøyde i tiendels millimeter"
+
+#: data/org.gnome.SimpleScan.gschema.xml:31
+msgid ""
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"Papirhøyde i tiendels millimeter (eller 0 for automatisk gjenkjenning)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:35
+msgid "Brightness of scan"
+msgstr "Skanningens ysstyrke"
+
+#: data/org.gnome.SimpleScan.gschema.xml:36
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr "Justering av lysstyrke fra -100 til 100 (0 betyr ingen lys)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:40
+msgid "Contrast of scan"
+msgstr "Skanningens kontrastforsterkning"
+
+#: data/org.gnome.SimpleScan.gschema.xml:41
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr ""
+"Justering av kontrast fra -100 til 100 (en verdi på 0 gir ingen "
+"forsterkning)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:45
+msgid "Resolution for text scans"
+msgstr "Oppløsning for tekstskanning"
+
+#: data/org.gnome.SimpleScan.gschema.xml:46
+msgid "The resolution in dots-per-inch to use when scanning text."
+msgstr "Oppløsningen i punkter-per-tomme for skanning av tekst."
+
+#: data/org.gnome.SimpleScan.gschema.xml:50
+msgid "Resolution for photo scans"
+msgstr "Oppløsning for bildeskanning"
+
+#: data/org.gnome.SimpleScan.gschema.xml:51
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr "Oppløsning i punkter-per-tomme for skanning av bilder."
+
+#: data/org.gnome.SimpleScan.gschema.xml:55
+msgid "Page side to scan"
+msgstr "Side som skal skannes"
+
+#: data/org.gnome.SimpleScan.gschema.xml:56
+msgid "The page side to scan."
+msgstr "Siden som skal scannes."
+
+#: data/org.gnome.SimpleScan.gschema.xml:60
+msgid "Directory to save files to"
+msgstr "Lagre filer i mappe"
+
+#: data/org.gnome.SimpleScan.gschema.xml:61
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr "Mappen filer skal lagres til. Standard er dokumentmappen."
+
+#: data/org.gnome.SimpleScan.gschema.xml:66
+msgid "Quality value to use for JPEG compression"
+msgstr "Kvalitetsverdi som skal brukes til JPEG-komprimering"
+
+#: data/org.gnome.SimpleScan.gschema.xml:67
+msgid "Quality value to use for JPEG compression."
+msgstr "Kvalitetsverdi som skal brukes til JPEG-komprimering"
+
+#: data/org.gnome.SimpleScan.gschema.xml:72
+msgid "Delay in millisecond between pages"
+msgstr ""
+
+#: data/org.gnome.SimpleScan.gschema.xml:73
+msgid "Delay in millisecond between pages."
+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
+#. Set HeaderBar title here because Glade doesn't keep it translated
+#. https://bugzilla.gnome.org/show_bug.cgi?id=782753
+#. Title of scan window
+#: data/simple-scan.appdata.xml.in:6 data/simple-scan.desktop.in:3
+#: src/app-window.ui:76 src/app-window.vala:1560
 msgid "Simple Scan"
 msgstr "Simple Scan"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
-msgid "_Document"
-msgstr "_Dokument"
+#: data/simple-scan.appdata.xml.in:7 data/simple-scan.desktop.in:5
+msgid "Scan Documents"
+msgstr "Skann dokumenter"
 
-#. Scan menu item
-#: data/simple-scan.ui:260
-msgid "Sc_an"
-msgstr "Sk_ann"
+#: 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 "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+"En enkel måte å skanne dokumenter og bilder på. Du kan skjære bort uønskede "
+"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: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."
+
+#: data/simple-scan.desktop.in:4
+msgid "Document Scanner"
+msgstr "Dokumentskanner"
+
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: data/simple-scan.desktop.in:7
+msgid "scan;scanner;flatbed;adf;"
+msgstr "skan;skanner;plan;adf;"
 
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: data/simple-scan.desktop.in:10
+msgid "scanner"
+msgstr "scanner"
+
+#. Toolbar scan menu item to scan a single page from the scanner
 #. 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/app-window.ui:22 src/app-window.ui:123 src/app-window.ui:820
 msgid "Single _Page"
 msgstr "Enkel _side"
 
+#. Toolbar scan menu item to scan all pages from a document feeder
 #. 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/app-window.ui:31 src/app-window.ui:133 src/app-window.ui:829
 msgid "All Pages From _Feeder"
 msgstr "Alle sider fra papirmater"
 
-#. Menu entry to stop current scan
-#: data/simple-scan.ui:294
-msgid "_Stop Scan"
-msgstr "_Stopp skanning"
+#. Toolbar scan menu item to scan continuously from the flatbed
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/app-window.ui:40 src/app-window.ui:143 src/app-window.ui:838
+msgid "_Multiple Pages From Flatbed"
+msgstr ""
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:853
 msgid "Text"
 msgstr "Tekst"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:863
 msgid "Photo"
 msgstr "Bilde"
 
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: src/app-window.ui:91
+msgid "_Document"
+msgstr "_Dokument"
+
+#. Scan menu item
+#: src/app-window.ui:110
+msgid "Sc_an"
+msgstr "Sk_ann"
+
+#. Menu entry to stop current scan
+#: src/app-window.ui:154
+msgid "_Stop Scan"
+msgstr "_Stopp skanning"
+
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/app-window.ui:196 src/app-window.vala:967 src/app-window.vala:1590
 msgid "Reorder Pages"
 msgstr "Omplasser sider"
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/app-window.ui:215
 msgid "_Email"
 msgstr "_E-post"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/app-window.ui:280
 msgid "_Page"
 msgstr "_Side"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/app-window.ui:290
 msgid "Rotate _Left"
 msgstr "Roter mot _venstre"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/app-window.ui:300
 msgid "Rotate _Right"
 msgstr "Roter mot _høyre"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/app-window.ui:310
 msgid "_Crop"
 msgstr "_Beskjær"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/app-window.ui:320
 msgid "_None"
 msgstr "_Ingen"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/app-window.ui:331
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/app-window.ui:342
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/app-window.ui:353
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/app-window.ui:364
 msgid "_Letter"
 msgstr "US _Letter"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/app-window.ui:375
 msgid "Le_gal"
 msgstr "US Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/app-window.ui:386
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/app-window.ui:397
 msgid "_Custom"
 msgstr "E_gendefinert"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/app-window.ui:415
 msgid "_Rotate Crop"
 msgstr "_Roter beskjæringsområdet"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/app-window.ui:428
 msgid "Move Left"
 msgstr "Flytt til venstre"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/app-window.ui:437
 msgid "Move Right"
 msgstr "Flytt til høyre"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/app-window.ui:474
 msgid "_Help"
 msgstr "_Hjelp"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/app-window.ui:482
 msgid "_Contents"
 msgstr "_Innhold"
 
-#. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
-msgid "Start a new document"
-msgstr "Begynn et nytt dokument"
-
-#: data/simple-scan.ui:675
-msgid "New"
-msgstr "Ny"
-
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/app-window.ui:520 src/app-window.ui:720
 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/app-window.ui:522 src/app-window.ui:716
 msgid "Scan"
 msgstr "Skann"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/app-window.ui:538 src/app-window.ui:787
 msgid "Save document to a file"
 msgstr "Lagre dokument til fil"
 
-#: ../src/ui.vala:1842
+#: src/app-window.ui:540
 msgid "Save"
 msgstr "Lagre"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/app-window.ui:555 src/app-window.ui:700
 msgid "Stop the current scan"
 msgstr "Stopp skanning"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/app-window.ui:556 src/app-window.ui:697
 msgid "Stop"
 msgstr "Stopp"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "Roter siden til venstre (mot urviseren)"
-
-#. Label on rotate page left (anti-clockwise) item
-#: data/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
-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
-msgid "Rotate Right"
-msgstr "Roter mot høyre"
-
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
-msgid "Crop the selected page"
-msgstr "Beskjær valgt side"
-
-#: data/simple-scan.ui:781
-msgid "Crop"
-msgstr "Beskjær"
-
-#: ../src/ui.vala:1849
-msgid "Preferences"
-msgstr "Innstillinger"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1048
-msgid "Scan S_ource:"
-msgstr "Hent fra:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1079
-msgid "_Text Resolution:"
-msgstr "_Tekstoppløsning"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1095
-msgid "_Photo Resolution:"
-msgstr "_Bildeoppløsning:"
-
-#. Label beside scan side combo box
-#: data/simple-scan.ui:1139
-msgid "Scan Side:"
-msgstr "Skann side:"
-
-#. Label beside page size combo box
-#: data/simple-scan.ui:1169
-msgid "Page Size:"
-msgstr "Sidestørrelse:"
-
-#. Label beside brightness scale
-#: data/simple-scan.ui:1199
-msgid "Brightness:"
-msgstr "Lysstyrke:"
-
-#. Label beside contrast scale
-#: data/simple-scan.ui:1229
-msgid "Contrast:"
-msgstr "Kontrast:"
-
-#. Label beside quality scale
-#: data/simple-scan.ui:1260
-msgid "Quality:"
-msgstr "Kvalitet:"
-
-#: data/simple-scan.desktop.in:4
-msgid "Document Scanner"
-msgstr "Dokumentskanner"
+#. Label shown when searching for scanners
+#: src/app-window.ui:611
+msgid "Searching for Scanners…"
+msgstr "Søker etter skannere …"
 
-#: data/simple-scan.desktop.in:5
-msgid "Scan Documents"
-msgstr "Skann dokumenter"
+#: src/app-window.vala:237 src/app-window.vala:1380
+msgid "_Close"
+msgstr "_Lukk"
 
-#: data/simple-scan.desktop.in:6
-msgid "scan;scanner;flatbed;adf;"
-msgstr "skan;skanner;plan;adf;"
+#. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
+#: src/app-window.vala:246
+#, c-format
+msgid "Username and password required to access “%s”"
+msgstr "Behøver brukernavn og passord for å få tilgang til «%s»"
 
-#: data/simple-scan.desktop.in:8
-msgid "scanner"
-msgstr ""
+#. Label shown when detected a scanner
+#: src/app-window.vala:266 src/app-window.vala:584
+msgid "Ready to Scan"
+msgstr "Klar til å skanne"
 
-#: data/simple-scan.appdata.xml.in:8
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-"En enkel måte å skanne dokumenter og bilder på. Du kan skjære bort uønskede "
-"deler og rotere bilder hvis de skannes inn feil vei. Skannede elementer kan "
-"skrives ut, eksporteres i pdf-format og lagres i ulike bildeformater."
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: src/app-window.vala:273
+msgid "Additional software needed"
+msgstr "Tilleggsprogram må installeres"
 
-#: data/simple-scan.appdata.xml.in:13
+#. Instructions to install driver software
+#: src/app-window.vala:275
 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
-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
-msgid "Unable to connect to scanner"
-msgstr "Klarte ikke å koble til skanneren"
-
-#. Error display when unable to start scan
-#: ../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
-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
-msgid "Show release version"
-msgstr "Vis utgivelsesversjon"
-
-#. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
-msgid "Print debugging messages"
-msgstr "Vis feilsøkingsmeldinger"
-
-#: ../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
-msgid "Failed to scan"
-msgstr "Klarte ikke å utføre skanningen"
-
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
-msgid "[DEVICE...] - Scanning utility"
-msgstr "[ENHET...] - Scanneutstyr"
-
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
-#, 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
-msgid "_Close"
-msgstr "_Lukk"
-
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../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'"
+"You need to <a href=\"install-firmware\">install driver software</a> for "
+"your scanner."
+msgstr "Du må <a href=\"install-firmware\">installere driverprogramvare for din skanner."
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/app-window.vala:281
 msgid "No scanners detected"
 msgstr "Fant ingen skannere"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/app-window.vala:283
 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
-msgid "Additional software needed"
-msgstr "Tilleggsprogram må installeres"
-
-#. Instructions to install driver software
-#: ../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
-msgid "Save As..."
-msgstr "Lagre som..."
+#: src/app-window.vala:298
+msgid "Save As…"
+msgstr "Lagre som …"
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/app-window.vala:301 src/app-window.vala:471 src/app-window.vala:552
 msgid "_Cancel"
 msgstr "_Avbryt"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/app-window.vala:302 src/app-window.vala:553
 msgid "_Save"
 msgstr "_Lagre"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/app-window.vala:310
 msgid "Scanned Document.pdf"
 msgstr "Skannet_dokument.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#. Save dialog: Filter name to show only supported image files
+#: src/app-window.vala:316
 msgid "Image Files"
 msgstr "Bildefiler"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/app-window.vala:326
 msgid "All Files"
 msgstr "Alle Filer"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/app-window.vala:335
 msgid "PDF (multi-page document)"
 msgstr "PDF (flersidig dokument)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/app-window.vala:341
 msgid "JPEG (compressed)"
 msgstr "JPEG (komprimert)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/app-window.vala:347
 msgid "PNG (lossless)"
 msgstr "PNG (tapsfri)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#. Save dialog: Label for sabing in WEBP format
+#: src/app-window.vala:354
+msgid "WebP (compressed)"
+msgstr "WebP (komprimert)"
+
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
+#: src/app-window.vala:364
 msgid "File format:"
 msgstr "Filformat:"
 
+#. Label in save dialog beside compression slider
+#: src/app-window.vala:376
+msgid "Compression:"
+msgstr "Komprimering:"
+
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/app-window.vala:470
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr "En fil med navnet «%s» eksisterer allerede. Vil du erstatte den?"
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/app-window.vala:473
+msgid "_Replace"
+msgstr "E_rstatt"
+
+#: src/app-window.vala:512
+msgid "Saving"
+msgstr "Lagrer"
+
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/app-window.vala:527
 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
-msgid "If you don't save, changes will be permanently lost."
-msgstr "Hvis du ikke lagrer vil endringene gå tapt."
+#: src/app-window.vala:550
+msgid "If you don’t save, changes will be permanently lost."
+msgstr "Hvis du ikke lagrer vil endringene gå tapt for alltid."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:708
+#: src/app-window.vala:591
 msgid "Save current document?"
 msgstr "Lagre gjeldende dokument?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/app-window.vala:593
 msgid "Discard Changes"
 msgstr "Forkast endringer"
 
+#. Label shown when scan started
+#: src/app-window.vala:692
+msgid "Contacting scanner…"
+msgstr "Kontakter _skanner …"
+
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/app-window.vala:800
 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/app-window.vala:812
 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/app-window.vala:990
 msgid "Combine sides"
 msgstr "Kombiner sider"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/app-window.vala:1000
 msgid "Combine sides (reverse)"
 msgstr "Kombiner sider (omvendt)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/app-window.vala:1010
 msgid "Reverse"
 msgstr "Omvendt"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/app-window.vala:1020
 msgid "Keep unchanged"
 msgstr "Behold uendret"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/app-window.vala:1250
 msgid "Unable to open help file"
 msgstr "Klarte ikke å åpne hjelpefil"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/app-window.vala:1271
 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,419 +545,483 @@ msgstr ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/app-window.vala:1274
 msgid "About Simple Scan"
 msgstr "Om Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/app-window.vala:1277
 msgid "Simple document scanning tool"
 msgstr "Enkelt verktøy for å skanne dokumenter"
 
-#: ../src/ui.vala:1487
+#: src/app-window.vala:1286
 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/app-window.vala:1308
 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
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:1310
 msgid "Quit without Saving"
 msgstr "Avslutt uten å lagre"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/app-window.vala:1357
 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/app-window.vala:1359
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.brother.com\">Brother website</a>."
+"Drivers for this are available on the <a href=\"http://support.brother.com"
+"\">Brother website</a>."
 msgstr ""
-"Du skal kunne finne drivere på <a "
-"href=\"http://support.brother.com\">Brothers nettsider</a>."
+"Du skal kunne finne drivere på <a href=\"http://support.brother.com"
+"\">Brothers nettsider</a>."
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/app-window.vala:1363
 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/app-window.vala:1365
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://samsung.com/support\">Samsung website</a>."
+"Drivers for this are available on the <a href=\"http://samsung.com/support"
+"\">Samsung website</a>."
 msgstr ""
-"Du skal kunne finne drivere på <a "
-"href=\"http://samsung.com/support\">Samsungs nettsider</a>."
+"Du skal kunne finne drivere på <a href=\"http://samsung.com/support"
+"\">Samsungs nettsider</a>."
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/app-window.vala:1369
 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/app-window.vala:1374
 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/app-window.vala:1376
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.epson.com\">Epson website</a>."
+"Drivers for this are available on the <a href=\"http://support.epson.com"
+"\">Epson website</a>."
 msgstr ""
 "Drivere er tilgjengelig på <a href=\"http://support.epson.com\">Epson</a>s "
 "nettside."
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/app-window.vala:1380
 msgid "Install drivers"
 msgstr "Installer drivere"
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/app-window.vala:1411
 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
-msgid "Installing drivers..."
+#: src/app-window.vala:1423
+msgid "Installing drivers…"
 msgstr "Installerer drivere …"
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/app-window.vala:1431
 msgid "Drivers installed successfully!"
 msgstr "Driverne er nå installert."
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/app-window.vala:1441
 #, 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/app-window.vala:1447
 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/app-window.vala:1454
 #, 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
-#, c-format
-msgid "%d dpi (default)"
-msgstr "%d dpi (standard)"
-
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../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
-#, 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
-#, c-format
-msgid "%d dpi"
-msgstr "%d dpi"
-
-#: ../src/ui.vala:1835
-msgid "New Document"
-msgstr "Nytt dokument"
-
-#: ../src/ui.vala:1840
-msgid "Document"
-msgstr "Dokument"
-
-#: ../src/ui.vala:1844
-msgid "Email..."
-msgstr "E-post …"
+msgid "You need to install the %s package."
+msgid_plural "You need to install the %s packages."
+msgstr[0] "Du må installere %s-pakken."
+msgstr[1] "Du må installere %s-pakkene."
+
+#. Title of preferences dialog
+#: src/app-window.vala:1568 src/app-window.vala:1591
+#: src/preferences-dialog.ui:53
+msgid "Preferences"
+msgstr "Innstillinger"
 
-#: ../src/ui.vala:1845
-msgid "Print..."
-msgstr "Skriv ut …"
+#: src/app-window.vala:1572
+msgid "Keyboard Shortcuts"
+msgstr "Tastatursnarveier"
 
-#: ../src/ui.vala:1853
+#: src/app-window.vala:1573
 msgid "Help"
 msgstr "Hjelp"
 
-#: ../src/ui.vala:1854
+#: src/app-window.vala:1574
 msgid "About"
 msgstr "Om"
 
-#: ../src/ui.vala:1855
+#: src/app-window.vala:1575
 msgid "Quit"
 msgstr "Avslutt"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
-msgid "Change _Scanner"
-msgstr "Bytt _skanner"
+#: src/app-window.vala:1589
+msgid "Email"
+msgstr "E-post"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
-msgid "_Install Drivers"
-msgstr "_Installer drivere"
+#. Populate ActionBar (not supported in Glade)
+#. https://bugzilla.gnome.org/show_bug.cgi?id=769966
+#. Label on new document button
+#: src/app-window.vala:1599
+msgid "Start Again…"
+msgstr "Start igjen …"
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
-msgid "Automatic"
-msgstr "Automatisk"
+#. Tooltip for rotate left (counter-clockwise) button
+#: src/app-window.vala:1616
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Roter siden til venstre (mot urviseren)"
 
-#: ../src/ui.vala:1947
-msgid "Darker"
-msgstr "Mørkere"
+#. Tooltip for rotate right (clockwise) button
+#: src/app-window.vala:1623
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Roter siden til høyre (med urviseren)"
 
-#: ../src/ui.vala:1949
-msgid "Lighter"
-msgstr "Lysere"
+#. Tooltip for crop button
+#: src/app-window.vala:1633
+msgid "Crop the selected page"
+msgstr "Beskjær valgt side"
 
-#: ../src/ui.vala:1957
-msgid "Less"
-msgstr "Mindre"
+#. Tooltip for delete button
+#: src/app-window.vala:1649
+msgid "Delete the selected page"
+msgstr "Slett valgt side"
 
-#: ../src/ui.vala:1959
-msgid "More"
-msgstr "Mer"
+#. Text of button for cancelling save
+#: src/app-window.vala:1814
+msgid "Cancel"
+msgstr "A_vbryt"
 
-#: ../src/ui.vala:1967
-msgid "Minimum"
-msgstr "Minimum"
+#. Button to submit authorization dialog
+#: src/authorize-dialog.ui:25
+msgid "_Authorize"
+msgstr "_Autoriser"
 
-#: ../src/ui.vala:1969
-msgid "Maximum"
-msgstr "Maksimum"
+#. Label beside username entry
+#: src/authorize-dialog.ui:99
+msgid "_Username for resource:"
+msgstr "_Brukernavn for ressurs:"
 
-#: ../src/ui.vala:2008
-msgid "Saving document..."
-msgstr "Lagrer dokument …"
+#. Label beside password entry
+#: src/authorize-dialog.ui:112
+msgid "_Password:"
+msgstr "_Passord:"
 
-#: ../src/ui.vala:2173
+#: src/book.vala:331 src/book.vala:337
 #, c-format
-msgid "Saving page %d out of %d"
-msgstr "Lagrer side nr. %d av %d"
-
-#~ msgid "4&#xD7;6"
-#~ msgstr "4&#xD7;6"
-
-#~ msgid "Files missing"
-#~ msgstr "Manglende filer"
+msgid "Unable to encode page %i"
+msgstr "Klarte ikke å kode side %i"
+
+#: src/help-overlay.ui:12
+msgctxt "shortcut window"
+msgid "Scanning"
+msgstr "Skanner"
+
+#: src/help-overlay.ui:17
+msgctxt "shortcut window"
+msgid "Scan a single page"
+msgstr "Skann en enkelt side"
+
+#: src/help-overlay.ui:24
+msgctxt "shortcut window"
+msgid "Scan all pages from document feeder"
+msgstr "Skann alle sider fra dokumentmateren"
+
+#: src/help-overlay.ui:31
+msgctxt "shortcut window"
+msgid "Scan continuously from a flatbed scanner"
+msgstr ""
 
-#~ msgid "Height of scanned image in pixels"
-#~ msgstr "Høyde på skannede bilder, i pixler"
+#: src/help-overlay.ui:38
+msgctxt "shortcut window"
+msgid "Stop scan in progress"
+msgstr "Stopp pågående skanning"
+
+#: src/help-overlay.ui:46
+msgctxt "shortcut window"
+msgid "Document Modification"
+msgstr "Dokumentendring"
+
+#: src/help-overlay.ui:51
+msgctxt "shortcut window"
+msgid "Move page left"
+msgstr "Flytt side til venstre"
+
+#: src/help-overlay.ui:58
+msgctxt "shortcut window"
+msgid "Move page right"
+msgstr "Flytt side til høyre"
+
+#: src/help-overlay.ui:65
+msgctxt "shortcut window"
+msgid "Rotate page to the left (anti-clockwise)"
+msgstr "Roter side til venstre (mot urviseren)"
+
+#: src/help-overlay.ui:72
+msgctxt "shortcut window"
+msgid "Rotate page to the right (clockwise)"
+msgstr "Roter side til høyre (med urviseren)"
+
+#: src/help-overlay.ui:79
+msgctxt "shortcut window"
+msgid "Delete page"
+msgstr "Slett side"
+
+#: src/help-overlay.ui:87
+msgctxt "shortcut window"
+msgid "Document Management"
+msgstr "Dokumenthåndtering"
+
+#: src/help-overlay.ui:92
+msgctxt "shortcut window"
+msgid "Start new document"
+msgstr "Lag et nytt dokument"
+
+#: src/help-overlay.ui:99
+msgctxt "shortcut window"
+msgid "Save scanned document"
+msgstr "Lagre skannet dokument"
+
+#: src/help-overlay.ui:106
+msgctxt "shortcut window"
+msgid "Email scanned document"
+msgstr "Send skannet dokument med e-post"
+
+#: src/help-overlay.ui:113
+msgctxt "shortcut window"
+msgid "Print scanned document"
+msgstr "Skriv ut skannet dokument"
+
+#: src/help-overlay.ui:120
+msgctxt "shortcut window"
+msgid "Copy current page to clipboard"
+msgstr "Kopier denne siden til utklippstavlen"
 
-#~ msgid "Resolution for photo scans"
-#~ msgstr "Oppløsning for bildeskanning"
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:113
+msgid "_Scanner"
+msgstr "_Skanner"
 
-#~ msgid "Resolution for text scans"
-#~ msgstr "Oppløsning for tekstskanning"
+#. Label beside scan side combo box
+#: src/preferences-dialog.ui:143
+msgid "Scan Sides"
+msgstr "Skann sider"
 
-#~ msgid "Device to scan from"
-#~ msgstr "Enhet det skal skannes fra"
+#. Label beside page size combo box
+#: src/preferences-dialog.ui:160
+msgid "Page Size"
+msgstr "Sidestørrelse"
 
-#~ msgid "SANE device to acquire images from."
-#~ msgstr "SANE-enhet som bilder skal hentes fra."
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:191
+msgid "Front"
+msgstr "Forside"
 
-#~ msgid "Direction of scan"
-#~ msgstr "Skanneretning"
+#. Preferences Dialog: Toggle button to select scanning on the back side of a page
+#: src/preferences-dialog.ui:206
+msgid "Back"
+msgstr "Bakside"
 
-#~ msgid "Resolution of last scanned image"
-#~ msgstr "Oppløsning på sist skannede bilde"
+#. Preferences Dialog: Toggle button to select scanning on both sides of a page
+#: src/preferences-dialog.ui:221
+msgid "Both"
+msgstr "Begge"
 
-#~ msgid "Directory to save files to"
-#~ msgstr "Lagre filer i mappe"
+#. Label beside page delay scale
+#: src/preferences-dialog.ui:260
+msgid "Delay"
+msgstr "Pause"
 
-#~ msgid ""
-#~ "The direction of the scanner across the scanned page. It can be one of the "
-#~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
-#~ msgstr ""
-#~ "Retning skanneren skal gjøre over siden. Den kan være en av følgende: 'topp-"
-#~ "til-bunn' 'bunn-til-topp' 'venstre-til-høyre' 'høyre-til-venstre'"
+#. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
+#: src/preferences-dialog.ui:276
+msgid "Multiple page from flatbed"
+msgstr ""
 
-#~ msgid "Type of document being scanned"
-#~ msgstr "Dokumenttype som skannes"
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:295
+msgid "3"
+msgstr "3"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:310
+msgid "5"
+msgstr "5"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:326
+msgid "7"
+msgstr "7"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:342
+msgid "10"
+msgstr "10"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:358
+msgid "15"
+msgstr "15"
+
+#. Label after page delay radio buttons
+#: src/preferences-dialog.ui:385
+msgid "Seconds"
+msgstr "Sekunder"
+
+#. Preferences Dialog: Tab label for scanning settings
+#: src/preferences-dialog.ui:413
+msgid "Scanning"
+msgstr "Skanning"
 
-#~ msgid ""
-#~ "Type of document being scanned. 'text' for text documents, 'photo' for "
-#~ "photos. This setting decides on the scan resolution, colors and post-"
-#~ "processing."
-#~ msgstr ""
-#~ "Dokumenttype som skannes. 'tekst' for tekstdokumenter, 'bilde' for bilder. "
-#~ "Denne innstillinger bestemmer oppløsning, farger og etterbehandling for "
-#~ "skanningen."
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:436
+msgid "_Text Resolution"
+msgstr "_Tekstoppløsning"
 
-#~ msgid ""
-#~ "The width of scanned image in pixels. This value is updated to what the last "
-#~ "scanned page was."
-#~ msgstr ""
-#~ "Bredden på skannede bilder, i pixler. Denne verdien settes til størrelsen "
-#~ "fra sist skannede side."
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:452
+msgid "_Photo Resolution"
+msgstr "_Bildeoppløsning"
 
-#~ msgid ""
-#~ "The height of scanned image in pixels. This value is updated to what the "
-#~ "last scanned page was."
-#~ msgstr ""
-#~ "Høyden på skannet bilde, i pixler. Verdien settes til sist skannede side."
+#. Label beside brightness scale
+#: src/preferences-dialog.ui:505
+msgid "Brightness"
+msgstr "Lysstyrke"
 
-#~ msgid "TRUE if the application window is maximized"
-#~ msgstr "SANN hvis programvinduet er maksimert"
+#. Label beside contrast scale
+#: src/preferences-dialog.ui:521
+msgid "Contrast"
+msgstr "Kontrast"
 
-#~ msgid "The resolution in dots-per-inch of the previously scanned image."
-#~ msgstr "Oppløsning i punkter-per-tomme til sist utførte skanning."
+#. Preferences Dialog: Tab for quality settings
+#: src/preferences-dialog.ui:576
+msgid "Quality"
+msgstr "Kvalitet"
 
-#~ msgid "The resolution in dots-per-inch to use when scanning text."
-#~ msgstr "Oppløsningen i punkter-per-tomme for skanning av tekst."
+#. Combo box value for automatic paper size
+#: src/preferences-dialog.vala:77
+msgid "Automatic"
+msgstr "Automatisk"
 
-#~ msgid "The resolution in dots-per-inch to use when scanning photos."
-#~ msgstr "Oppløsning i punkter-per-tomme for skanning av bilder."
+#: src/preferences-dialog.vala:116
+msgid "Darker"
+msgstr "Mørkere"
 
-#~ msgid ""
-#~ "The directory to save files to. Defaults to the documents directory if unset."
-#~ msgstr "Mappen filer skal lagres til. Standard er dokumentmappen."
+#: src/preferences-dialog.vala:118
+msgid "Lighter"
+msgstr "Lysere"
 
-#~ msgid "Window height in pixels"
-#~ msgstr "Vindushøyde i pixler"
+#: src/preferences-dialog.vala:126
+msgid "Less"
+msgstr "Mindre"
 
-#~ msgid "Window width in pixels"
-#~ msgstr "Vindusbredde i pixler"
+#: src/preferences-dialog.vala:128
+msgid "More"
+msgstr "Mer"
 
-#~ msgid "Width of scanned image in pixels"
-#~ msgstr "Bredde på skannet bilde, i pixler"
+#. Preferences dialog: Label for default resolution in resolution list
+#: src/preferences-dialog.vala:440
+#, c-format
+msgid "%d dpi (default)"
+msgstr "%d dpi (standard)"
 
-#~ msgid "Scanned Document"
-#~ msgstr "Skannet dokument"
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: src/preferences-dialog.vala:443
+#, c-format
+msgid "%d dpi (draft)"
+msgstr "%d dpi (kladd)"
 
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: src/preferences-dialog.vala:446
 #, c-format
-#~ msgid ""
-#~ "Help Options:\n"
-#~ "  -d, --debug                     Print debugging messages\n"
-#~ "  -v, --version                   Show release version\n"
-#~ "  -h, --help                      Show help options\n"
-#~ "  --help-all                      Show all help options\n"
-#~ "  --help-gtk                      Show GTK+ options"
-#~ msgstr ""
-#~ "Alternativer for hjelp:\n"
-#~ "  -d, --debug                     Vis feilsøkingsinformasjon\n"
-#~ "  -v, --version                   Vis utgivelsesinformasjon\n"
-#~ "  -h, --help                      Vis alternativer for hjelp\n"
-#~ "  --help-all                      Vis alle alternativer for hjelp\n"
-#~ "  --help-gtk                      Vis alternativer for GTK+"
+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/preferences-dialog.vala:449
 #, c-format
-#~ msgid ""
-#~ "Usage:\n"
-#~ "  %s [DEVICE...] - Scanning utility"
-#~ msgstr ""
-#~ "Bruk:\n"
-#~ "  %s [ENHET...] - Skanneutstyr"
+msgid "%d dpi"
+msgstr "%d dpi"
+
+#. Error displayed when no scanners to scan with
+#: src/scanner.vala:844
+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:874
+msgid "Unable to connect to scanner"
+msgstr "Klarte ikke å koble til skanneren"
+
+#. Error display when unable to start scan
+#: src/scanner.vala:1227
+msgid "Unable to start scan"
+msgstr "Klarte ikke å sette i gang skanneren"
+
+#. Error displayed when communication with scanner broken
+#: src/scanner.vala:1240 src/scanner.vala:1340
+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
+msgid "Show release version"
+msgstr "Vis utgivelsesversjon"
+
+#. Help string for command line --debug flag
+#: src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Vis feilsøkingsmeldinger"
+
+#: 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:392
+msgid "Failed to scan"
+msgstr "Klarte ikke å utføre skanningen"
+
+#. Attempt to inhibit the screensaver when scanning
+#: src/simple-scan.vala:407
+msgid "Scan in progress"
+msgstr "Skanning pågår"
+
+#. Arguments and description for --help text
+#: src/simple-scan.vala:584
+msgid "[DEVICE…] — Scanning utility"
+msgstr "[ENHET …] – Scanneutstyr"
+
+#. Text printed out when an unknown command-line argument provided
+#: src/simple-scan.vala:595
 #, c-format
-#~ msgid ""
-#~ "GTK+ Options:\n"
-#~ "  --class=CLASS                   Program class as used by the window "
-#~ "manager\n"
-#~ "  --name=NAME                     Program name as used by the window "
-#~ "manager\n"
-#~ "  --screen=SCREEN                 X screen to use\n"
-#~ "  --sync                          Make X calls synchronous\n"
-#~ "  --gtk-module=MODULES            Load additional GTK+ modules\n"
-#~ "  --g-fatal-warnings              Make all warnings fatal"
-#~ msgstr ""
-#~ "GTK+ Options:\n"
-#~ "  --class=CLASS                   Program class as used by the window "
-#~ "manager\n"
-#~ "  --name=NAME                     Program name as used by the window "
-#~ "manager\n"
-#~ "  --screen=SCREEN                 X screen to use\n"
-#~ "  --sync                          Make X calls synchronous\n"
-#~ "  --gtk-module=MODULES            Load additional GTK+ modules\n"
-#~ "  --g-fatal-warnings              Make all warnings fatal"
-
-#~ msgid "Select File _Type"
-#~ msgstr "Velg fil_type"
-
-#~ msgid "Please check your installation"
-#~ msgstr "Vennligst undersøk installasjonen"
-
-#~ msgid ""
-#~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
-#~ msgstr ""
-#~ "Siden som skal skannes. Det kan være én av følgende: 'begge' 'forside' "
-#~ "'bakside'"
-
-#~ msgid "Page side to scan"
-#~ msgstr "Side som skal skannes"
-
-#~ msgid "Height of paper in tenths of a mm"
-#~ msgstr "Papirhøyde i tiendels millimeter"
-
-#~ msgid ""
-#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
-#~ msgstr ""
-#~ "Papirhøyde i tiendels millimeter (eller 0 for automatisk gjenkjenning)."
-
-#~ msgid ""
-#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
-#~ msgstr ""
-#~ "Papirbredden i tiendels millimeter (eller 0 for automatisk gjenkjenning)."
-
-#~ msgid "Width of paper in tenths of a mm"
-#~ msgstr "Papirbredde i tiendels millimeter"
-
-#~ msgid "The page side to scan."
-#~ msgstr "Siden som skal scannes."
-
-#~ msgid ""
-#~ "Type of document being scanned. This setting decides on the scan resolution, "
-#~ "colors and post-processing."
-#~ msgstr ""
-#~ "Dokumenttype som skal scannes. Denne innstillingen endrer oppløsning, farger "
-#~ "og etterbehandling."
-
-#~ msgid "The direction of the scanner across the scanned page."
-#~ msgstr "Retningen til scanneren over den scannede siden."
-
-#~ msgid "Quality value to use for JPEG compression."
-#~ msgstr "Kvalitetsverdi som skal brukes til JPEG-komprimering"
-
-#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
-#~ msgstr ""
-#~ "Justering av kontrast fra -100 til 100 (en verdi på 0 gir ingen "
-#~ "forsterkning)."
-
-#~ msgid "Contrast of scan"
-#~ msgstr "Skanningens kontrastforsterkning"
-
-#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
-#~ msgstr "Justering av lysstyrke fra -100 til 100 (0 betyr ingen lys)."
-
-#~ msgid "Brightness of scan"
-#~ msgstr "Skanningens ysstyrke"
-
-#~ msgid "Quality value to use for JPEG compression"
-#~ msgstr "Kvalitetsverdi som skal brukes til JPEG-komprimering"
+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."
diff --git a/po/ne.po b/po/ne.po
new file mode 100644
index 0000000..3c81f60
--- /dev/null
+++ b/po/ne.po
@@ -0,0 +1,1061 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Gnome Nepali Translation Project\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
+"product=simple-scan&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-07-18 08:20+0000\n"
+"PO-Revision-Date: 2017-07-28 11:56+0545\n"
+"Language-Team: Nepali Translation Team <chautari@gmail.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 2.0.3\n"
+"Last-Translator: Pawan Chitrakar <chautari@gmail.com>\n"
+"Language: ne\n"
+
+#: data/org.gnome.SimpleScan.gschema.xml:11
+#, fuzzy
+msgid "Device to scan from"
+msgstr "यसबाट प्रत्यक्ष आगत घटना पढ्ने यन्त्र ।"
+
+#: data/org.gnome.SimpleScan.gschema.xml:12
+msgid "SANE device to acquire images from."
+msgstr ""
+
+#: data/org.gnome.SimpleScan.gschema.xml:20
+#, fuzzy
+msgid "Type of document being scanned"
+msgstr "डक्युमेन्ट टाईप डेफिनेसन"
+
+#: data/org.gnome.SimpleScan.gschema.xml:21
+msgid ""
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+msgstr ""
+
+#: data/org.gnome.SimpleScan.gschema.xml:25
+#, fuzzy
+msgid "Width of paper in tenths of a mm"
+msgstr "कागजको चौडाइ"
+
+#: data/org.gnome.SimpleScan.gschema.xml:26
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+
+#: data/org.gnome.SimpleScan.gschema.xml:30
+#, fuzzy
+msgid "Height of paper in tenths of a mm"
+msgstr "कागजको उचाइ"
+
+#: data/org.gnome.SimpleScan.gschema.xml:31
+msgid ""
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+
+#: data/org.gnome.SimpleScan.gschema.xml:35
+#, fuzzy
+msgid "Brightness of scan"
+msgstr "चम्लिकोपना"
+
+#: data/org.gnome.SimpleScan.gschema.xml:36
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr ""
+
+#: data/org.gnome.SimpleScan.gschema.xml:40
+#, fuzzy
+msgid "Contrast of scan"
+msgstr "व्यतिरेक"
+
+#: data/org.gnome.SimpleScan.gschema.xml:41
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr ""
+
+#: data/org.gnome.SimpleScan.gschema.xml:45
+#, fuzzy
+msgid "Resolution for text scans"
+msgstr "स्क्यान्सको आवश्यक सङ्ख्या"
+
+#: data/org.gnome.SimpleScan.gschema.xml:46
+msgid "The resolution in dots-per-inch to use when scanning text."
+msgstr ""
+
+#: data/org.gnome.SimpleScan.gschema.xml:50
+#, fuzzy
+msgid "Resolution for photo scans"
+msgstr "फोटो रिजोल्युसन"
+
+#: data/org.gnome.SimpleScan.gschema.xml:51
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr ""
+
+#: data/org.gnome.SimpleScan.gschema.xml:55
+#, fuzzy
+msgid "Page side to scan"
+msgstr "स्क्यान"
+
+#: data/org.gnome.SimpleScan.gschema.xml:56
+#, fuzzy
+msgid "The page side to scan."
+msgstr "पोर्ट स्क्यान"
+
+#: data/org.gnome.SimpleScan.gschema.xml:60
+#, fuzzy
+msgid "Directory to save files to"
+msgstr "युआई फाइलहरूको लागि डाटा निर्देशिका"
+
+#: data/org.gnome.SimpleScan.gschema.xml:61
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+
+#: data/org.gnome.SimpleScan.gschema.xml:66
+#, fuzzy
+msgid "Quality value to use for JPEG compression"
+msgstr "JPEG सङ्कुचन गुण:"
+
+#: data/org.gnome.SimpleScan.gschema.xml:67
+#, fuzzy
+msgid "Quality value to use for JPEG compression."
+msgstr "JPEG सङ्कुचन गुण:"
+
+#: data/org.gnome.SimpleScan.gschema.xml:72
+#, fuzzy
+msgid "Delay in millisecond between pages"
+msgstr "फोटोहरूको बीचमा समय"
+
+#: data/org.gnome.SimpleScan.gschema.xml:73
+#, fuzzy
+msgid "Delay in millisecond between pages."
+msgstr "फोटोहरूको बीचमा समय"
+
+#. Title of scan window
+#. Set HeaderBar title here because Glade doesn't keep it translated
+#. https://bugzilla.gnome.org/show_bug.cgi?id=782753
+#. Title of scan window
+#: data/simple-scan.appdata.xml.in:6 data/simple-scan.desktop.in:3
+#: src/app-window.ui:76 src/app-window.vala:1560
+#, fuzzy
+msgid "Simple Scan"
+msgstr "सरल"
+
+#: data/simple-scan.appdata.xml.in:7 data/simple-scan.desktop.in:5
+#, fuzzy
+msgid "Scan Documents"
+msgstr "स्क्यान"
+
+#: 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 "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: data/simple-scan.appdata.xml.in:14
+msgid "Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
+#: data/simple-scan.desktop.in:4
+#, fuzzy
+msgid "Document Scanner"
+msgstr "स्क्यानर"
+
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: data/simple-scan.desktop.in:7
+msgid "scan;scanner;flatbed;adf;"
+msgstr ""
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: data/simple-scan.desktop.in:10
+msgid "scanner"
+msgstr "scanner"
+
+#. Toolbar scan menu item to scan a single page from the scanner
+#. Scan menu item to scan a single page from the scanner
+#. Toolbar scan menu item to scan a single page from the scanner
+#: src/app-window.ui:22 src/app-window.ui:123 src/app-window.ui:820
+#, fuzzy
+msgid "Single _Page"
+msgstr "एकल"
+
+#. Toolbar scan menu item to scan all pages from a document feeder
+#. Scan menu item to scan all pages from a document feeder
+#. Toolbar scan menu item to scan all pages from a document feeder
+#: src/app-window.ui:31 src/app-window.ui:133 src/app-window.ui:829
+#, fuzzy
+msgid "All Pages From _Feeder"
+msgstr "सबैबाट सदस्यता हटाउनुहोस्"
+
+#. Toolbar scan menu item to scan continuously from the flatbed
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/app-window.ui:40 src/app-window.ui:143 src/app-window.ui:838
+#, fuzzy
+msgid "_Multiple Pages From Flatbed"
+msgstr "बहुविध पृष्ठहरू देखाउनुहोस्"
+
+#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:853
+msgid "Text"
+msgstr "पाट"
+
+#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:863
+msgid "Photo"
+msgstr "तस्वीर"
+
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: src/app-window.ui:91
+msgid "_Document"
+msgstr "कागजात"
+
+#. Scan menu item
+#: src/app-window.ui:110
+#, fuzzy
+msgid "Sc_an"
+msgstr "स्केल"
+
+#. Menu entry to stop current scan
+#: src/app-window.ui:154
+#, fuzzy
+msgid "_Stop Scan"
+msgstr "स्क्यान"
+
+#. Menu item to reorder pages
+#. Title of dialog to reorder pages
+#: src/app-window.ui:196 src/app-window.vala:967 src/app-window.vala:1590
+#, fuzzy
+msgid "Reorder Pages"
+msgstr "नोडहरू फेरि क्रमबद्ध गर्न तान्नुहोस्"
+
+#. Label on email menu item
+#: src/app-window.ui:215
+msgid "_Email"
+msgstr "इमेल"
+
+#. Page menu (contains action for each page, e.g. delete, crop)
+#: src/app-window.ui:280
+msgid "_Page"
+msgstr "पृष्ठ"
+
+#. Menu item to rotate page to left (anti-clockwise)
+#: src/app-window.ui:290
+msgid "Rotate _Left"
+msgstr "बायाँ घुमाउनुहोस्"
+
+#. Menu item to rotate page to right (clockwise)
+#: src/app-window.ui:300
+msgid "Rotate _Right"
+msgstr "दायाँ घुमाउनुहोस्"
+
+#. Label for page crop submenu
+#: src/app-window.ui:310
+msgid "_Crop"
+msgstr "काटछाँट गर्नुहोस्"
+
+#. Radio button for no crop
+#: src/app-window.ui:320
+msgid "_None"
+msgstr "केही छैन"
+
+#. Radio button for cropping page to A4 size
+#: src/app-window.ui:331
+msgid "A_4"
+msgstr ""
+
+#. Radio button for cropping page to A5 size
+#: src/app-window.ui:342
+msgid "A_5"
+msgstr ""
+
+#. Radio button for cropping page to A6 size
+#: src/app-window.ui:353
+msgid "A_6"
+msgstr ""
+
+#. Radio button for cropping page to US letter size
+#: src/app-window.ui:364
+#, fuzzy
+msgid "_Letter"
+msgstr "लाइन खालीस्थान समायोजन गर्नुहोस्"
+
+#. Radio button for cropping to page to US legal size
+#: src/app-window.ui:375
+#, fuzzy
+msgid "Le_gal"
+msgstr "ताई ले"
+
+#. Radio button for cropping page to 4x6 inch
+#: src/app-window.ui:386
+#, fuzzy
+msgid "4×6"
+msgstr "६×६"
+
+#. Radio button for cropping to custom page size
+#: src/app-window.ui:397
+msgid "_Custom"
+msgstr "अनुकूलन गर्नुहोस्"
+
+#. Menu item to rotate the crop area
+#: src/app-window.ui:415
+#, fuzzy
+msgid "_Rotate Crop"
+msgstr " ↶घुमाउनुहोस्:"
+
+#. Menu item to move the selected page to the left
+#: src/app-window.ui:428
+msgid "Move Left"
+msgstr "बाँया सार्नुहोस्"
+
+#. Menu item to move the selected page to the right
+#: src/app-window.ui:437
+msgid "Move Right"
+msgstr "दाँया सार्नुहोस्"
+
+#. Label on help menu
+#: src/app-window.ui:474
+msgid "_Help"
+msgstr "मद्दत गर्नुहोस्"
+
+#. Help|Contents menu
+#: src/app-window.ui:482
+msgid "_Contents"
+msgstr "सामग्री"
+
+#. Tooltip for scan toolbar button
+#: src/app-window.ui:520 src/app-window.ui:720
+msgid "Scan a single page from the scanner"
+msgstr ""
+
+#. Label on scan toolbar item
+#: src/app-window.ui:522 src/app-window.ui:716
+msgid "Scan"
+msgstr "स्क्यान"
+
+#. Tooltip for save toolbar button
+#: src/app-window.ui:538 src/app-window.ui:787
+msgid "Save document to a file"
+msgstr "फाइल बचत गर्नुहोस्"
+
+#: src/app-window.ui:540
+msgid "Save"
+msgstr "बचत गर्नुहोस्"
+
+#. Tooltip for stop button
+#: src/app-window.ui:555 src/app-window.ui:700
+#, fuzzy
+msgid "Stop the current scan"
+msgstr "स्क्यान"
+
+#: src/app-window.ui:556 src/app-window.ui:697
+msgid "Stop"
+msgstr "रोक्नुहोस्"
+
+#. Label shown when searching for scanners
+#: src/app-window.ui:611
+#, fuzzy
+msgid "Searching for Scanners…"
+msgstr "खोज्दै छु ।"
+
+#: src/app-window.vala:237 src/app-window.vala:1380
+msgid "_Close"
+msgstr "_Close"
+
+#. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
+#: src/app-window.vala:246
+#, fuzzy, c-format
+msgid "Username and password required to access “%s”"
+msgstr "“%s” जडान गर्न पासवर्ड चाहिने छ"
+
+#. Label shown when detected a scanner
+#: src/app-window.vala:266 src/app-window.vala:584
+#, fuzzy
+msgid "Ready to Scan"
+msgstr "तयार"
+
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: src/app-window.vala:273
+#, fuzzy
+msgid "Additional software needed"
+msgstr "अतिरिक्त सफ्टवेयर स्थापना गर्ने ?"
+
+#. Instructions to install driver software
+#: src/app-window.vala:275
+msgid ""
+"You need to <a href=\"install-firmware\">install driver software</a> for "
+"your scanner."
+msgstr ""
+
+#. Warning displayed when no scanners are detected
+#: src/app-window.vala:281
+#, fuzzy
+msgid "No scanners detected"
+msgstr "स्क्यानरका लागि उपलब्ध प्रोफाइलहरू"
+
+#. Hint to user on why there are no scanners detected
+#: src/app-window.vala:283
+msgid "Please check your scanner is connected and powered on"
+msgstr ""
+
+#. Save dialog: Dialog title
+#: src/app-window.vala:298
+msgid "Save As…"
+msgstr "...यस रुपमा बचत गर्नुहोस्"
+
+#: src/app-window.vala:301 src/app-window.vala:471 src/app-window.vala:552
+msgid "_Cancel"
+msgstr "_रद्द गर्नुहोस्"
+
+#: src/app-window.vala:302 src/app-window.vala:553
+msgid "_Save"
+msgstr "बचत गर्नुहोस्"
+
+#. Default filename to use when saving document
+#: src/app-window.vala:310
+#, fuzzy
+msgid "Scanned Document.pdf"
+msgstr "यो उपकरण नयाँ सामग्रीको लागि स्क्यान गरिनेछ"
+
+#. Save dialog: Filter name to show only supported image files
+#: src/app-window.vala:316
+msgid "Image Files"
+msgstr "छवि फाइल"
+
+#. Save dialog: Filter name to show all files
+#: src/app-window.vala:326
+msgid "All Files"
+msgstr "सबै फाइल"
+
+#. Save dialog: Label for saving in PDF format
+#: src/app-window.vala:335
+msgid "PDF (multi-page document)"
+msgstr ""
+
+#. Save dialog: Label for saving in JPEG format
+#: src/app-window.vala:341
+#, fuzzy
+msgid "JPEG (compressed)"
+msgstr "JPEG"
+
+#. Save dialog: Label for saving in PNG format
+#: src/app-window.vala:347
+#, fuzzy
+msgid "PNG (lossless)"
+msgstr "PNG + delta PNG"
+
+#. Save dialog: Label for sabing in WEBP format
+#: src/app-window.vala:354
+#, fuzzy
+msgid "WebP (compressed)"
+msgstr "च्यापिएको साइज: "
+
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
+#: src/app-window.vala:364
+#, fuzzy
+msgid "File format:"
+msgstr "GZip संग सङ्कुचित फाइल ढाँचा SVG"
+
+#. Label in save dialog beside compression slider
+#: src/app-window.vala:376
+#, fuzzy
+msgid "Compression:"
+msgstr "दवाब"
+
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/app-window.vala:470
+#, fuzzy, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr "फाइल नाम \"%s\" पहिल्यै अवस्थित छ। के तपाईँ यसलाई बदल्नु चाहनुहुन्छ ?"
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/app-window.vala:473
+msgid "_Replace"
+msgstr "प्रतिस्थापन गर्नुहोस्"
+
+#: src/app-window.vala:512
+msgid "Saving"
+msgstr "फाइल बचत गर्दैछ..."
+
+#. Title of error dialog when save failed
+#: src/app-window.vala:527
+#, fuzzy
+msgid "Failed to save file"
+msgstr "PPM फाइल '%s' बचत गर्न असफल भयो: %s"
+
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:550
+#, fuzzy
+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/app-window.vala:591
+#, fuzzy
+msgid "Save current document?"
+msgstr "हालको कागजातको प्रतिलिपी बचत गर्नुहोस्"
+
+#. Button in dialog to create new document and discard unsaved document
+#: src/app-window.vala:593
+msgid "Discard Changes"
+msgstr "परिवर्तनहरू छोड्नुहोस्"
+
+#. Label shown when scan started
+#: src/app-window.vala:692
+#, fuzzy
+msgid "Contacting scanner…"
+msgstr "स्क्यानर"
+
+#. Error message display when unable to save image for preview
+#: src/app-window.vala:800
+#, fuzzy
+msgid "Unable to save image for preview"
+msgstr "_यस रूपमा छवि बचत गर्नुहोस्..."
+
+#. Error message display when unable to preview image
+#: src/app-window.vala:812
+msgid "Unable to open image preview application"
+msgstr ""
+
+#. Label on button for combining sides in reordering dialog
+#: src/app-window.vala:990
+#, fuzzy
+msgid "Combine sides"
+msgstr "साइड:"
+
+#. Label on button for combining sides in reverse order in reordering dialog
+#: src/app-window.vala:1000
+#, fuzzy
+msgid "Combine sides (reverse)"
+msgstr "साइड:"
+
+#. Label on button for reversing in reordering dialog
+#: src/app-window.vala:1010
+msgid "Reverse"
+msgstr "उल्टाउनुहोस्"
+
+#. Label on button for cancelling page reordering dialog
+#: src/app-window.vala:1020
+#, fuzzy
+msgid "Keep unchanged"
+msgstr "पासवर्ड परिवर्तन गरिएको छैन"
+
+#. Error message displayed when unable to launch help browser
+#: src/app-window.vala:1250
+msgid "Unable to open help file"
+msgstr "मद्दत फाइल खोल्न असक्षम भयो"
+
+#. The license this software is under (GPL3+)
+#: src/app-window.vala:1271
+msgid ""
+"This program is free software: you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation, either version 3 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License\n"
+"along with this program.  If not, see <http://www.gnu.org/licenses/>."
+msgstr ""
+
+#. Title of about dialog
+#: src/app-window.vala:1274
+#, fuzzy
+msgid "About Simple Scan"
+msgstr "सरल"
+
+#. Description of program
+#: src/app-window.vala:1277
+msgid "Simple document scanning tool"
+msgstr ""
+
+#: src/app-window.vala:1286
+msgid "translator-credits"
+msgstr "Pawan Chitrakar < chautari@gmail.com >"
+
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:1308
+#, fuzzy
+msgid "Save document before quitting?"
+msgstr "बन्द गर्नु अघि कागजात \"%s\" प्रतिलिपी बचत गर्नहुन्छ ?"
+
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:1310
+msgid "Quit without Saving"
+msgstr "बचत नगरी बन्द गर्नुहोस्"
+
+#. Message to indicate a Brother scanner has been detected
+#: src/app-window.vala:1357
+msgid "You appear to have a Brother scanner."
+msgstr ""
+
+#. Instructions on how to install Brother scanner drivers
+#: src/app-window.vala:1359
+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/app-window.vala:1363
+msgid "You appear to have a Samsung scanner."
+msgstr ""
+
+#. Instructions on how to install Samsung scanner drivers
+#: src/app-window.vala:1365
+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/app-window.vala:1369
+msgid "You appear to have an HP scanner."
+msgstr ""
+
+#. Message to indicate an Epson scanner has been detected
+#: src/app-window.vala:1374
+msgid "You appear to have an Epson scanner."
+msgstr ""
+
+#. Instructions on how to install Epson scanner drivers
+#: src/app-window.vala:1376
+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/app-window.vala:1380
+msgid "Install drivers"
+msgstr "ड्राइभर स्थापना गर्नुहोस्"
+
+#. Message in driver install dialog
+#: src/app-window.vala:1411
+msgid "Once installed you will need to restart Simple Scan."
+msgstr ""
+
+#. Label shown while installing drivers
+#: src/app-window.vala:1423
+msgid "Installing drivers…"
+msgstr "ड्राइभर स्थापना गर्नु…"
+
+#. Label shown once drivers successfully installed
+#: src/app-window.vala:1431
+msgid "Drivers installed successfully!"
+msgstr "ड्राइभर स्थापना सफल!"
+
+#. Label shown if failed to install drivers
+#: src/app-window.vala:1441
+#, c-format
+msgid "Failed to install drivers (error code %d)."
+msgstr ""
+
+#. Label shown if failed to install drivers
+#: src/app-window.vala:1447
+msgid "Failed to install drivers."
+msgstr "ड्राइभर स्थापन असफल"
+
+#. Label shown to prompt user to install packages (when PackageKit not available)
+#: src/app-window.vala:1454
+#, c-format
+msgid "You need to install the %s package."
+msgid_plural "You need to install the %s packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#. Title of preferences dialog
+#: src/app-window.vala:1568 src/app-window.vala:1591
+#: src/preferences-dialog.ui:53
+msgid "Preferences"
+msgstr "प्राथमिकताहरू"
+
+#: src/app-window.vala:1572
+msgid "Keyboard Shortcuts"
+msgstr "कुञ्जीपाटी सर्टकटहरू"
+
+#: src/app-window.vala:1573
+msgid "Help"
+msgstr "मद्दत"
+
+#: src/app-window.vala:1574
+msgid "About"
+msgstr "बारेमा"
+
+#: src/app-window.vala:1575
+msgid "Quit"
+msgstr "बन्द गर्नुहोस्"
+
+#: src/app-window.vala:1589
+msgid "Email"
+msgstr "इमेल"
+
+#. Populate ActionBar (not supported in Glade)
+#. https://bugzilla.gnome.org/show_bug.cgi?id=769966
+#. Label on new document button
+#: src/app-window.vala:1599
+msgid "Start Again…"
+msgstr "फेरि सुरु गर्नुहोस्…"
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: src/app-window.vala:1616
+#, fuzzy
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "९०° घडीसरह पृष्ठ घुमाउनुहोस्"
+
+#. Tooltip for rotate right (clockwise) button
+#: src/app-window.vala:1623
+#, fuzzy
+msgid "Rotate the page to the right (clockwise)"
+msgstr "९०° घडीसरह पृष्ठ घुमाउनुहोस्"
+
+#. Tooltip for crop button
+#: src/app-window.vala:1633
+msgid "Crop the selected page"
+msgstr "छानिएको पृष्ठलाई काँटछाँट गर्नुहोस्"
+
+#. Tooltip for delete button
+#: src/app-window.vala:1649
+#, fuzzy
+msgid "Delete the selected page"
+msgstr "चयन गरिएका सम्पर्कहरू मेट्नुहोस्"
+
+#. Text of button for cancelling save
+#: src/app-window.vala:1814
+msgid "Cancel"
+msgstr "रद्द गर्ने"
+
+#. Button to submit authorization dialog
+#: src/authorize-dialog.ui:25
+msgid "_Authorize"
+msgstr "अधिकार दिनुहोस्"
+
+#. Label beside username entry
+#: src/authorize-dialog.ui:99
+#, fuzzy
+msgid "_Username for resource:"
+msgstr "प्रयोगकर्ताको नाम:"
+
+#. Label beside password entry
+#: src/authorize-dialog.ui:112
+msgid "_Password:"
+msgstr "_पासवर्ड:"
+
+#: src/book.vala:331 src/book.vala:337
+#, c-format
+msgid "Unable to encode page %i"
+msgstr ""
+
+#: src/help-overlay.ui:12
+msgctxt "shortcut window"
+msgid "Scanning"
+msgstr "स्क्यान गर्दै"
+
+#: src/help-overlay.ui:17
+#, fuzzy
+msgctxt "shortcut window"
+msgid "Scan a single page"
+msgstr "एकल"
+
+#: src/help-overlay.ui:24
+msgctxt "shortcut window"
+msgid "Scan all pages from document feeder"
+msgstr ""
+
+#: src/help-overlay.ui:31
+msgctxt "shortcut window"
+msgid "Scan continuously from a flatbed scanner"
+msgstr ""
+
+#: src/help-overlay.ui:38
+#, fuzzy
+msgctxt "shortcut window"
+msgid "Stop scan in progress"
+msgstr "प्रगति"
+
+#: src/help-overlay.ui:46
+#, fuzzy
+msgctxt "shortcut window"
+msgid "Document Modification"
+msgstr "परिमार्जन मितिद्वारा"
+
+#: src/help-overlay.ui:51
+#, fuzzy
+msgctxt "shortcut window"
+msgid "Move page left"
+msgstr "बाँया सार्नुहोस्"
+
+#: src/help-overlay.ui:58
+#, fuzzy
+msgctxt "shortcut window"
+msgid "Move page right"
+msgstr "दाँया सार्नुहोस्"
+
+#: src/help-overlay.ui:65
+#, fuzzy
+msgctxt "shortcut window"
+msgid "Rotate page to the left (anti-clockwise)"
+msgstr "९०° घडीसरह पृष्ठ घुमाउनुहोस्"
+
+#: src/help-overlay.ui:72
+#, fuzzy
+msgctxt "shortcut window"
+msgid "Rotate page to the right (clockwise)"
+msgstr "९०° घडीसरह पृष्ठ घुमाउनुहोस्"
+
+#: src/help-overlay.ui:79
+msgctxt "shortcut window"
+msgid "Delete page"
+msgstr "पृष्ठ मेट्नुहोस्"
+
+#: src/help-overlay.ui:87
+msgctxt "shortcut window"
+msgid "Document Management"
+msgstr "कागजात प्रबन्ध"
+
+#: src/help-overlay.ui:92
+msgctxt "shortcut window"
+msgid "Start new document"
+msgstr "नयाँ कागजात सुरु गर्नुहोस्"
+
+#: src/help-overlay.ui:99
+#, fuzzy
+msgctxt "shortcut window"
+msgid "Save scanned document"
+msgstr "बचत असफल कागजात “%s”"
+
+#: src/help-overlay.ui:106
+#, fuzzy
+msgctxt "shortcut window"
+msgid "Email scanned document"
+msgstr "इमेल कागजात"
+
+#: src/help-overlay.ui:113
+#, fuzzy
+msgctxt "shortcut window"
+msgid "Print scanned document"
+msgstr "यो कागजातलाई मुद्रण गर्नुहोस्"
+
+#: src/help-overlay.ui:120
+#, fuzzy
+msgctxt "shortcut window"
+msgid "Copy current page to clipboard"
+msgstr "क्लिपबोर्डमा प्रतिलिपि गर्नुहोस् ।"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:113
+msgid "_Scanner"
+msgstr "स्क्यानर"
+
+#. Label beside scan side combo box
+#: src/preferences-dialog.ui:143
+#, fuzzy
+msgid "Scan Sides"
+msgstr "साइड:"
+
+#. Label beside page size combo box
+#: src/preferences-dialog.ui:160
+msgid "Page Size"
+msgstr "पन्नाको आकार"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:191
+msgid "Front"
+msgstr "अगाडी ल्याउनुहोस्"
+
+#. Preferences Dialog: Toggle button to select scanning on the back side of a page
+#: src/preferences-dialog.ui:206
+msgid "Back"
+msgstr "पछाडि"
+
+#. Preferences Dialog: Toggle button to select scanning on both sides of a page
+#: src/preferences-dialog.ui:221
+msgid "Both"
+msgstr "दुवै"
+
+#. Label beside page delay scale
+#: src/preferences-dialog.ui:260
+msgid "Delay"
+msgstr "ढिलाई"
+
+#. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
+#: src/preferences-dialog.ui:276
+#, fuzzy
+msgid "Multiple page from flatbed"
+msgstr "कर्सरको स्थानदेखि पृष्ठ चय नित ।"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:295
+msgid "3"
+msgstr "३"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:310
+msgid "5"
+msgstr "५"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:326
+msgid "7"
+msgstr "७"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:342
+msgid "10"
+msgstr "१०"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:358
+msgid "15"
+msgstr "१५"
+
+#. Label after page delay radio buttons
+#: src/preferences-dialog.ui:385
+msgid "Seconds"
+msgstr "सेकेन्ड"
+
+#. Preferences Dialog: Tab label for scanning settings
+#: src/preferences-dialog.ui:413
+msgid "Scanning"
+msgstr "स्क्यान गर्दै"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:436
+msgid "_Text Resolution"
+msgstr "पाठ रिजोल्युसन"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:452
+#, fuzzy
+msgid "_Photo Resolution"
+msgstr "फोटो रिजोल्युसन"
+
+#. Label beside brightness scale
+#: src/preferences-dialog.ui:505
+msgid "Brightness"
+msgstr "चम्लिकोपना"
+
+#. Label beside contrast scale
+#: src/preferences-dialog.ui:521
+msgid "Contrast"
+msgstr "व्यतिरेक"
+
+#. Preferences Dialog: Tab for quality settings
+#: src/preferences-dialog.ui:576
+msgid "Quality"
+msgstr "गुणस्तर"
+
+#. Combo box value for automatic paper size
+#: src/preferences-dialog.vala:77
+msgid "Automatic"
+msgstr "स्वाचालित"
+
+#: src/preferences-dialog.vala:116
+msgid "Darker"
+msgstr "अँध्यारो"
+
+#: src/preferences-dialog.vala:118
+msgid "Lighter"
+msgstr "उज्यालो"
+
+#: src/preferences-dialog.vala:126
+msgid "Less"
+msgstr "भन्दा सानो"
+
+#: src/preferences-dialog.vala:128
+msgid "More"
+msgstr "बढि"
+
+#. Preferences dialog: Label for default resolution in resolution list
+#: src/preferences-dialog.vala:440
+#, fuzzy, c-format
+msgid "%d dpi (default)"
+msgstr "फन्ट DPI"
+
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: src/preferences-dialog.vala:443
+#, fuzzy, c-format
+msgid "%d dpi (draft)"
+msgstr "ड्राफ्ट"
+
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: src/preferences-dialog.vala:446
+#, fuzzy, c-format
+msgid "%d dpi (high resolution)"
+msgstr "उच्च-रिजोल्युसन किनारा अनुसन्धान"
+
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: src/preferences-dialog.vala:449
+#, fuzzy, c-format
+msgid "%d dpi"
+msgstr "DPI"
+
+#. Error displayed when no scanners to scan with
+#: src/scanner.vala:844
+msgid "No scanners available.  Please connect a scanner."
+msgstr ""
+
+#. Error displayed when cannot connect to scanner
+#: src/scanner.vala:874
+#, fuzzy
+msgid "Unable to connect to scanner"
+msgstr "स्क्यानर"
+
+#. Error display when unable to start scan
+#: src/scanner.vala:1227
+#, fuzzy
+msgid "Unable to start scan"
+msgstr "फ्रन्टइन्ड सुरु गर्न अक्षम: %s"
+
+#. Error displayed when communication with scanner broken
+#: src/scanner.vala:1240 src/scanner.vala:1340
+#, fuzzy
+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 "डिबग सन्देशहरु प्रिन्ट गर्ने।"
+
+#: 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:392
+msgid "Failed to scan"
+msgstr "स्क्यान असफल"
+
+#. Attempt to inhibit the screensaver when scanning
+#: src/simple-scan.vala:407
+#, fuzzy
+msgid "Scan in progress"
+msgstr "प्रगति"
+
+#. Arguments and description for --help text
+#: src/simple-scan.vala:584
+#, fuzzy
+msgid "[DEVICE…] — Scanning utility"
+msgstr "स्क्यान गर्दै"
+
+#. Text printed out when an unknown command-line argument provided
+#: src/simple-scan.vala:595
+#, fuzzy, c-format
+msgid "Run “%s --help” to see a full list of available command line options."
+msgstr "उपलब्ध कमाण्ड लाइन विकल्पको पूरै सूची हेर्न  '%s --help' चलाउनुहोस् ।"
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..649b11e 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -1,523 +1,540 @@
 # Dutch translation for simple-scan
 # Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
 # This file is distributed under the same license as the simple-scan package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
 #
+# Nathan Follens <nthn@unseen.is>, 2017.
+# Hannie Dumoleyn <hannie@ubuntu-nl.org>, 2017.
 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:04+0000\n"
-"Last-Translator: Robert Ancell <robert.ancell@canonical.com>\n"
-"Language-Team: Dutch <nl@li.org>\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=simple-"
+"scan&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-08-07 02:27+0000\n"
+"PO-Revision-Date: 2017-08-25 12:56+0100\n"
+"Last-Translator: Hannie Dumoleyn <hannie@ubuntu-nl.org>\n"
+"Language-Team: Dutch <gnome-nl-list@gnome.org>\n"
+"Language: nl\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-25 06:10+0000\n"
+"X-Generator: Lokalize 2.0\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. Button to submit authorization dialog
-#: data/simple-scan.ui:24
-msgid "_Authorize"
-msgstr "M_achtigen"
+#: data/org.gnome.SimpleScan.gschema.xml:11
+msgid "Device to scan from"
+msgstr "Te gebruiken scanapparaat"
 
-#. Label beside username entry
-#: data/simple-scan.ui:102
-msgid "_Username for resource:"
-msgstr "Gebr_uikersnaam voor bron:"
+#: data/org.gnome.SimpleScan.gschema.xml:12
+msgid "SANE device to acquire images from."
+msgstr "SANE-apparaat om beeld van te ontvangen"
 
-#. Label beside password entry
-#: data/simple-scan.ui:117
-msgid "_Password:"
-msgstr "_Wachtwoord:"
+#: data/org.gnome.SimpleScan.gschema.xml:20
+msgid "Type of document being scanned"
+msgstr "Type document dat gescand wordt"
 
-#. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
-msgid "Front and Back"
-msgstr "Voor- en achterzijde"
+#: data/org.gnome.SimpleScan.gschema.xml:21
+msgid ""
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+msgstr ""
+"Het type document dat gescand wordt. Deze instelling bepaalt de te scannen "
+"resolutie, kleuren en nabewerking."
 
-#. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
-msgid "Front"
-msgstr "Voorzijde"
+#: data/org.gnome.SimpleScan.gschema.xml:25
+msgid "Width of paper in tenths of a mm"
+msgstr "Breedte van het papier in tienden van een mm"
 
-#. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
-msgid "Back"
-msgstr "Achterzijde"
+#: data/org.gnome.SimpleScan.gschema.xml:26
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"De breedte van het papier in tienden van een mm (of 0 voor automatische "
+"papierdetectie)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:30
+msgid "Height of paper in tenths of a mm"
+msgstr "Hoogte van het papier in tienden van een mm"
+
+#: data/org.gnome.SimpleScan.gschema.xml:31
+msgid ""
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"De hoogte van het papier in tienden van een mm (of 0 voor automatische "
+"papierdetectie)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:35
+msgid "Brightness of scan"
+msgstr "Helderheid van de scan"
+
+#: data/org.gnome.SimpleScan.gschema.xml:36
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr "Aanpassing van de helderheid van -100 tot 100 (0 is geen)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:40
+msgid "Contrast of scan"
+msgstr "Contrast van de scan"
+
+#: data/org.gnome.SimpleScan.gschema.xml:41
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr "Aanpassing van het contrast van -100 tot 100 (0 is geen)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:45
+msgid "Resolution for text scans"
+msgstr "Resolutie voor gescande tekst"
+
+#: data/org.gnome.SimpleScan.gschema.xml:46
+msgid "The resolution in dots-per-inch to use when scanning text."
+msgstr ""
+"De te gebruiken resolutie in punten-per-inch (dtp) tijdens het scannen van "
+"tekst."
+
+#: data/org.gnome.SimpleScan.gschema.xml:50
+msgid "Resolution for photo scans"
+msgstr "Resolutie voor gescande foto's"
+
+#: data/org.gnome.SimpleScan.gschema.xml:51
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr ""
+"De te gebruiken resolutie in punten-per-inch (dtp) tijdens het scannen van "
+"foto's."
+
+#: data/org.gnome.SimpleScan.gschema.xml:55
+msgid "Page side to scan"
+msgstr "Te scannen paginazijde"
+
+#: data/org.gnome.SimpleScan.gschema.xml:56
+msgid "The page side to scan."
+msgstr "De paginazijde om te scannen."
+
+#: data/org.gnome.SimpleScan.gschema.xml:60
+msgid "Directory to save files to"
+msgstr "Map om bestanden in op te slaan"
+
+#: data/org.gnome.SimpleScan.gschema.xml:61
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+"De map waarin bestanden worden opgeslagen. Dit is standaard de map "
+"Documenten indien niet ingesteld."
+
+#: data/org.gnome.SimpleScan.gschema.xml:66
+msgid "Quality value to use for JPEG compression"
+msgstr "De kwaliteitswaarde die gebruikt zal worden voor JPEG-compressie"
+
+#: data/org.gnome.SimpleScan.gschema.xml:67
+msgid "Quality value to use for JPEG compression."
+msgstr "De kwaliteitswaarde die gebruikt zal worden voor JPEG-compressie."
+
+#: data/org.gnome.SimpleScan.gschema.xml:72
+msgid "Delay in millisecond between pages"
+msgstr "Vertraging tussen pagina's in milliseconden"
+
+#: data/org.gnome.SimpleScan.gschema.xml:73
+msgid "Delay in millisecond between pages."
+msgstr "Vertraging tussen pagina's in milliseconden."
 
 #. 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
+#. Set HeaderBar title here because Glade doesn't keep it translated
+#. https://bugzilla.gnome.org/show_bug.cgi?id=782753
+#. Title of scan window
+#: data/simple-scan.appdata.xml.in:6 data/simple-scan.desktop.in:3
+#: src/app-window.ui:76 src/app-window.vala:1560
 msgid "Simple Scan"
 msgstr "Scannen"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
-msgid "_Document"
-msgstr "_Document"
+#: data/simple-scan.appdata.xml.in:7 data/simple-scan.desktop.in:5
+msgid "Scan Documents"
+msgstr "Documenten scannen"
 
-#. Scan menu item
-#: data/simple-scan.ui:260
-msgid "Sc_an"
-msgstr "Sc_annen"
+#: 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 "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+"Een heel makkelijke manier om zowel documenten als foto's te scannen. U kunt "
+"de lelijke delen van een foto wegsnijden en hem draaien als hij niet goed "
+"staat. U kunt uw scans afdrukken, exporteren naar pdf, of opslaan in een "
+"reeks afbeeldingsbestandsoorten."
 
+#: data/simple-scan.appdata.xml.in:14
+msgid "Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+"Simple Scan gebruikt het SANE-kader om de meeste scanners te kunnen "
+"gebruiken."
+
+#: data/simple-scan.desktop.in:4
+msgid "Document Scanner"
+msgstr "Documentenscanner"
+
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: data/simple-scan.desktop.in:7
+msgid "scan;scanner;flatbed;adf;"
+msgstr "scan;scanner;flatbed;adf;"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: data/simple-scan.desktop.in:10
+msgid "scanner"
+msgstr "scanner"
+
+#. Toolbar scan menu item to scan a single page from the scanner
 #. 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/app-window.ui:22 src/app-window.ui:123 src/app-window.ui:820
 msgid "Single _Page"
 msgstr "Enkele _pagina"
 
+#. Toolbar scan menu item to scan all pages from a document feeder
 #. 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/app-window.ui:31 src/app-window.ui:133 src/app-window.ui:829
 msgid "All Pages From _Feeder"
 msgstr "Alle pagina's van in_voer"
 
-#. Menu entry to stop current scan
-#: data/simple-scan.ui:294
-msgid "_Stop Scan"
-msgstr "_Scannen staken"
+#. Toolbar scan menu item to scan continuously from the flatbed
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/app-window.ui:40 src/app-window.ui:143 src/app-window.ui:838
+msgid "_Multiple Pages From Flatbed"
+msgstr "_Meerdere pagina's van vlakbed"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:853
 msgid "Text"
 msgstr "Tekst"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:863
 msgid "Photo"
 msgstr "Foto"
 
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: src/app-window.ui:91
+msgid "_Document"
+msgstr "_Document"
+
+#. Scan menu item
+#: src/app-window.ui:110
+msgid "Sc_an"
+msgstr "Sc_annen"
+
+#. Menu entry to stop current scan
+#: src/app-window.ui:154
+msgid "_Stop Scan"
+msgstr "_Scannen staken"
+
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/app-window.ui:196 src/app-window.vala:967 src/app-window.vala:1590
 msgid "Reorder Pages"
 msgstr "Bladzijden herschikken"
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/app-window.ui:215
 msgid "_Email"
 msgstr "_E-mailen"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/app-window.ui:280
 msgid "_Page"
 msgstr "_Pagina"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/app-window.ui:290
 msgid "Rotate _Left"
 msgstr "_Linksom draaien"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/app-window.ui:300
 msgid "Rotate _Right"
 msgstr "_Rechtsom draaien"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/app-window.ui:310
 msgid "_Crop"
 msgstr "_Bijsnijden"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/app-window.ui:320
 msgid "_None"
 msgstr "_Geen"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/app-window.ui:331
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/app-window.ui:342
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/app-window.ui:353
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/app-window.ui:364
 msgid "_Letter"
 msgstr "VS _Letter"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/app-window.ui:375
 msgid "Le_gal"
 msgstr "VS Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/app-window.ui:386
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/app-window.ui:397
 msgid "_Custom"
 msgstr "_Aangepast"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/app-window.ui:415
 msgid "_Rotate Crop"
 msgstr "Bijsnijden d_raaien"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/app-window.ui:428
 msgid "Move Left"
 msgstr "Naar links verplaatsen"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/app-window.ui:437
 msgid "Move Right"
 msgstr "Naar rechts verplaatsen"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/app-window.ui:474
 msgid "_Help"
 msgstr "_Hulp"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/app-window.ui:482
 msgid "_Contents"
 msgstr "_Inhoud"
 
-#. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
-msgid "Start a new document"
-msgstr "Een nieuw document beginnen"
-
-#: data/simple-scan.ui:675
-msgid "New"
-msgstr "Nieuw"
-
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/app-window.ui:520 src/app-window.ui:720
 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/app-window.ui:522 src/app-window.ui:716
 msgid "Scan"
 msgstr "Scannen"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/app-window.ui:538 src/app-window.ui:787
 msgid "Save document to a file"
 msgstr "Document naar een bestand opslaan"
 
-#: ../src/ui.vala:1842
+#: src/app-window.ui:540
 msgid "Save"
 msgstr "Opslaan"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/app-window.ui:555 src/app-window.ui:700
 msgid "Stop the current scan"
 msgstr "De huidige scan stoppen"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/app-window.ui:556 src/app-window.ui:697
 msgid "Stop"
 msgstr "Stoppen"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "De pagina linksom draaien (tegen de klok in)"
-
-#. Label on rotate page left (anti-clockwise) item
-#: data/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
-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
-msgid "Rotate Right"
-msgstr "Rechtsom draaien"
-
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
-msgid "Crop the selected page"
-msgstr "De geselecteerde pagina bijsnijden"
-
-#: data/simple-scan.ui:781
-msgid "Crop"
-msgstr "Bijsnijden"
-
-#: ../src/ui.vala:1849
-msgid "Preferences"
-msgstr "Voorkeuren"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1048
-msgid "Scan S_ource:"
-msgstr "Scanner:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1079
-msgid "_Text Resolution:"
-msgstr "_Tekstresolutie:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1095
-msgid "_Photo Resolution:"
-msgstr "_Fotoresolutie:"
-
-#. Label beside scan side combo box
-#: data/simple-scan.ui:1139
-msgid "Scan Side:"
-msgstr "Scangrootte:"
-
-#. Label beside page size combo box
-#: data/simple-scan.ui:1169
-msgid "Page Size:"
-msgstr "Paginagrootte:"
-
-#. Label beside brightness scale
-#: data/simple-scan.ui:1199
-msgid "Brightness:"
-msgstr "Helderheid:"
-
-#. Label beside contrast scale
-#: data/simple-scan.ui:1229
-msgid "Contrast:"
-msgstr "Contrast:"
-
-#. Label beside quality scale
-#: data/simple-scan.ui:1260
-msgid "Quality:"
-msgstr "Kwaliteit:"
-
-#: data/simple-scan.desktop.in:4
-msgid "Document Scanner"
-msgstr "Documentenscanner"
+#. Label shown when searching for scanners
+#: src/app-window.ui:611
+msgid "Searching for Scanners…"
+msgstr "Zoeken naar scanners…"
 
-#: data/simple-scan.desktop.in:5
-msgid "Scan Documents"
-msgstr "Documenten scannen"
+#: src/app-window.vala:237 src/app-window.vala:1380
+msgid "_Close"
+msgstr "_Sluiten"
 
-#: data/simple-scan.desktop.in:6
-msgid "scan;scanner;flatbed;adf;"
-msgstr "scan;scanner;flatbed;adf;"
+#. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
+#: src/app-window.vala:246
+#, c-format
+#| msgid "Username and password required to access '%s'"
+msgid "Username and password required to access “%s”"
+msgstr "Gebruikersnaam en wachtwoord vereist om toegang te krijgen tot  ‘%s’"
 
-#: data/simple-scan.desktop.in:8
-msgid "scanner"
-msgstr ""
+#. Label shown when detected a scanner
+#: src/app-window.vala:266 src/app-window.vala:584
+#| msgid "Failed to scan"
+msgid "Ready to Scan"
+msgstr "Klaar om te scannen"
 
-#: data/simple-scan.appdata.xml.in:8
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-"Een heel makkelijke manier om zowel documenten als foto's te scannen. U kunt "
-"de lelijke delen van een foto wegsnijden en hem draaien als hij niet goed "
-"staat. U kunt uw scans afdrukken, exporteren naar pdf, of opslaan in een "
-"reeks afbeeldingsbestandsoorten."
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: src/app-window.vala:273
+msgid "Additional software needed"
+msgstr "Extra programmatuur vereist"
 
-#: data/simple-scan.appdata.xml.in:13
+#. Instructions to install driver software
+#: src/app-window.vala:275
+#| msgid "You need to install driver software for your scanner."
 msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
-"Simple Scan gebruikt het SANE-kader om de meeste scanners te kunnen "
-"gebruiken."
-
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
-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
-msgid "Unable to connect to scanner"
-msgstr "Kan niet verbinden met de scanner"
-
-#. Error display when unable to start scan
-#: ../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
-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
-msgid "Show release version"
-msgstr "Uitgaveversie tonen"
-
-#. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
-msgid "Print debugging messages"
-msgstr "Debugberichten weergeven"
-
-#: ../src/simple-scan.vala:26
-msgid "Fix PDF files generated with older versions of Simple Scan"
+"You need to <a href=\"install-firmware\">install driver software</a> for "
+"your scanner."
 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
-msgid "Failed to scan"
-msgstr "Scannen is mislukt"
-
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
-msgid "[DEVICE...] - Scanning utility"
-msgstr "[APPARAAT...] - Hulpmiddel voor scannen"
-
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
-#, 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
-msgid "_Close"
-msgstr "_Sluiten"
-
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../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'"
+"U dient <a href=\"install-firmware\">een stuurprogramma te installeren</a>"
+" voor uw scanner."
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/app-window.vala:281
 msgid "No scanners detected"
 msgstr "Geen scanners gevonden"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/app-window.vala:283
 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
-msgid "Additional software needed"
-msgstr "Extra programmatuur vereist"
-
-#. Instructions to install driver software
-#: ../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
-msgid "Save As..."
-msgstr "Opslaan als..."
+#: src/app-window.vala:298
+#| msgid "Save As..."
+msgid "Save As…"
+msgstr "Opslaan als…"
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/app-window.vala:301 src/app-window.vala:471 src/app-window.vala:552
 msgid "_Cancel"
 msgstr "_Annuleren"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/app-window.vala:302 src/app-window.vala:553
 msgid "_Save"
 msgstr "_Opslaan"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/app-window.vala:310
 msgid "Scanned Document.pdf"
 msgstr "Gescand document.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#. Save dialog: Filter name to show only supported image files
+#: src/app-window.vala:316
 msgid "Image Files"
 msgstr "Afbeeldingsbestanden"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/app-window.vala:326
 msgid "All Files"
 msgstr "Alle bestanden"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/app-window.vala:335
 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/app-window.vala:341
 msgid "JPEG (compressed)"
 msgstr "JPEG (gecomprimeerd)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/app-window.vala:347
 msgid "PNG (lossless)"
 msgstr "PNG (lossless)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#. Save dialog: Label for sabing in WEBP format
+#: src/app-window.vala:354
+#| msgid "JPEG (compressed)"
+msgid "WebP (compressed)"
+msgstr "WebP (gecomprimeerd)"
+
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
+#: src/app-window.vala:364
 msgid "File format:"
 msgstr "Bestandsformaat:"
 
+#. Label in save dialog beside compression slider
+#: src/app-window.vala:376
+msgid "Compression:"
+msgstr "Compressie:"
+
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/app-window.vala:470
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr "Het bestand ‘%s’ bestaat al. Wilt u het vervangen?"
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/app-window.vala:473
+msgid "_Replace"
+msgstr "Ve_rvangen"
+
+#: src/app-window.vala:512
+msgid "Saving"
+msgstr "Bezig met opslaan"
+
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/app-window.vala:527
 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
-msgid "If you don't save, changes will be permanently lost."
+#: src/app-window.vala:550
+#| msgid "If you don't save, changes will be permanently lost."
+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/app-window.vala:591
 msgid "Save current document?"
 msgstr "Huidige document opslaan?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/app-window.vala:593
 msgid "Discard Changes"
 msgstr "Wijzigingen negeren"
 
+#. Label shown when scan started
+#: src/app-window.vala:692
+#| msgid "Change _Scanner"
+msgid "Contacting scanner…"
+msgstr "Contact maken met _Scanner…"
+
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/app-window.vala:800
 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/app-window.vala:812
 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/app-window.vala:990
 msgid "Combine sides"
 msgstr "Zijden samenvoegen"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/app-window.vala:1000
 msgid "Combine sides (reverse)"
 msgstr "Zijden samenvoegen (omgekeerd)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/app-window.vala:1010
 msgid "Reverse"
 msgstr "Omgekeerd"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/app-window.vala:1020
 msgid "Keep unchanged"
 msgstr "Onveranderd laten"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/app-window.vala:1250
 msgid "Unable to open help file"
 msgstr "Kon hulpbestand niet openen"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/app-window.vala:1271
 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 +565,23 @@ msgstr ""
 "<http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/app-window.vala:1274
 msgid "About Simple Scan"
 msgstr "Info over Scanhulpmiddel"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/app-window.vala:1277
 msgid "Simple document scanning tool"
 msgstr "Eenvoudig hulpmiddel voor het scannen van documenten"
 
-#: ../src/ui.vala:1487
+#: src/app-window.vala:1286
 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"
@@ -579,201 +596,552 @@ msgstr ""
 "  Wouter Bolsterlee https://launchpad.net/~uws\n"
 "  cumulus007 https://launchpad.net/~cumulus-007\n"
 "  kay van der Zander https://launchpad.net/~kay20\n"
-"  rob https://launchpad.net/~rvdb"
+"  rob https://launchpad.net/~rvdb\n"
+"  Nathan Follens"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/app-window.vala:1308
 msgid "Save document before quitting?"
 msgstr "Document opslaan voor afsluiten?"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:1310
 msgid "Quit without Saving"
 msgstr "Afsluiten zonder opslaan"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/app-window.vala:1357
 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/app-window.vala:1359
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.brother.com\">Brother website</a>."
+"Drivers for this are available on the <a href=\"http://support.brother.com"
+"\">Brother website</a>."
 msgstr ""
-"Stuurprogramma's hiervoor zijn beschikbaar op de <a "
-"href=\"http://support.brother.com\">website van Brother</a>."
+"Stuurprogramma's hiervoor zijn beschikbaar op de <a href=\"http://support."
+"brother.com\">website van Brother</a>."
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/app-window.vala:1363
 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/app-window.vala:1365
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://samsung.com/support\">Samsung website</a>."
+"Drivers for this are available on the <a href=\"http://samsung.com/support"
+"\">Samsung website</a>."
 msgstr ""
-"Stuurprogramma's hiervoor zijn beschikbaar op de <a "
-"href=\"http://samsung.com/support\">website van Samsung</a>."
+"Stuurprogramma's hiervoor zijn beschikbaar op de <a href=\"http://samsung."
+"com/support\">website van Samsung</a>."
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/app-window.vala:1369
 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/app-window.vala:1374
 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/app-window.vala:1376
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.epson.com\">Epson website</a>."
+"Drivers for this are available on the <a href=\"http://support.epson.com"
+"\">Epson website</a>."
 msgstr ""
-"Stuurprogramma's hiervoor zijn beschikbaar op de <a "
-"href=\"http://support.epson.com\">Epson-website</a>."
+"Stuurprogramma's hiervoor zijn beschikbaar op de <a href=\"http://support."
+"epson.com\">Epson-website</a>."
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/app-window.vala:1380
 msgid "Install drivers"
 msgstr "Stuurprogramma's installeren"
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/app-window.vala:1411
 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
-msgid "Installing drivers..."
-msgstr "Stuurprogramma's aan het installeren..."
+#: src/app-window.vala:1423
+#| msgid "Installing drivers..."
+msgid "Installing drivers…"
+msgstr "Installeren van stuurprogramma's…"
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/app-window.vala:1431
 msgid "Drivers installed successfully!"
 msgstr "Stuurprogramma's met succes geïnstalleerd!"
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/app-window.vala:1441
 #, c-format
 msgid "Failed to install drivers (error code %d)."
-msgstr "Kon geen stuurprogramma's installeren (foutcode %d)."
+msgstr "Installeren van stuurprogramma's mislukt (foutcode %d)."
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/app-window.vala:1447
 msgid "Failed to install drivers."
-msgstr "Kon geen stuurprogramma's installeren."
+msgstr "Installeren van stuurprogramma's mislukt."
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/app-window.vala:1454
+#, c-format
+#| msgid "You need to install the %s package(s)."
+msgid "You need to install the %s package."
+msgid_plural "You need to install the %s packages."
+msgstr[0] "U dient het %s pakket te installeren."
+msgstr[1] "U dient de %s pakketten te installeren."
+
+#. Title of preferences dialog
+#: src/app-window.vala:1568 src/app-window.vala:1591
+#: src/preferences-dialog.ui:53
+msgid "Preferences"
+msgstr "Voorkeuren"
+
+#: src/app-window.vala:1572
+msgid "Keyboard Shortcuts"
+msgstr "Sneltoetsen"
+
+#: src/app-window.vala:1573
+msgid "Help"
+msgstr "Hulp"
+
+#: src/app-window.vala:1574
+msgid "About"
+msgstr "Over"
+
+#: src/app-window.vala:1575
+msgid "Quit"
+msgstr "Afsluiten"
+
+#: src/app-window.vala:1589
+#| msgid "_Email"
+msgid "Email"
+msgstr "E-mail"
+
+#. Populate ActionBar (not supported in Glade)
+#. https://bugzilla.gnome.org/show_bug.cgi?id=769966
+#. Label on new document button
+#: src/app-window.vala:1599
+msgid "Start Again…"
+msgstr "Opnieuw starten…"
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: src/app-window.vala:1616
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "De pagina linksom draaien (tegen de klok in)"
+
+#. Tooltip for rotate right (clockwise) button
+#: src/app-window.vala:1623
+msgid "Rotate the page to the right (clockwise)"
+msgstr "De pagina rechtsom draaien (met de klok mee)"
+
+#. Tooltip for crop button
+#: src/app-window.vala:1633
+msgid "Crop the selected page"
+msgstr "De geselecteerde pagina bijsnijden"
+
+#. Tooltip for delete button
+#: src/app-window.vala:1649
+#| msgid "Crop the selected page"
+msgid "Delete the selected page"
+msgstr "De geselecteerde pagina verwijderen"
+
+#. Text of button for cancelling save
+#: src/app-window.vala:1814
+#| msgid "_Cancel"
+msgid "Cancel"
+msgstr "Annuleren"
+
+#. Button to submit authorization dialog
+#: src/authorize-dialog.ui:25
+msgid "_Authorize"
+msgstr "M_achtigen"
+
+#. Label beside username entry
+#: src/authorize-dialog.ui:99
+msgid "_Username for resource:"
+msgstr "Gebr_uikersnaam voor bron:"
+
+#. Label beside password entry
+#: src/authorize-dialog.ui:112
+msgid "_Password:"
+msgstr "_Wachtwoord:"
+
+#: src/book.vala:331 src/book.vala:337
 #, c-format
-msgid "You need to install the %s package(s)."
-msgstr "U moet de %s pakket(ten) installeren"
+#| msgid "Unable to open help file"
+msgid "Unable to encode page %i"
+msgstr "Coderen van pagina %i mislukt"
+
+#: src/help-overlay.ui:12
+#| msgid "Scan"
+msgctxt "shortcut window"
+msgid "Scanning"
+msgstr "Scannen"
+
+#: src/help-overlay.ui:17
+#| msgid "Scan a single page from the scanner"
+msgctxt "shortcut window"
+msgid "Scan a single page"
+msgstr "Een enkele pagina scannen"
+
+#: src/help-overlay.ui:24
+#| msgid "Scan a single page from the scanner"
+msgctxt "shortcut window"
+msgid "Scan all pages from document feeder"
+msgstr "Alle pagina's van documentinvoer scannen"
+
+#: src/help-overlay.ui:31
+#| msgid "Scan a single page from the scanner"
+msgctxt "shortcut window"
+msgid "Scan continuously from a flatbed scanner"
+msgstr "Continu scannen van een flatbedscanner"
+
+#: src/help-overlay.ui:38
+msgctxt "shortcut window"
+msgid "Stop scan in progress"
+msgstr "Scan in uitvoering stoppen"
+
+#: src/help-overlay.ui:46
+#| msgid "Document Scanner"
+msgctxt "shortcut window"
+msgid "Document Modification"
+msgstr "Documentwijziging"
+
+#: src/help-overlay.ui:51
+#| msgid "Move Left"
+msgctxt "shortcut window"
+msgid "Move page left"
+msgstr "Pagina naar links verplaatsen"
+
+#: src/help-overlay.ui:58
+#| msgid "Move Right"
+msgctxt "shortcut window"
+msgid "Move page right"
+msgstr "Pagina naar rechts verplaatsen"
+
+#: src/help-overlay.ui:65
+#| msgid "Rotate the page to the left (counter-clockwise)"
+msgctxt "shortcut window"
+msgid "Rotate page to the left (anti-clockwise)"
+msgstr "De pagina linksom draaien (tegen de klok in)"
+
+#: src/help-overlay.ui:72
+#| msgid "Rotate the page to the right (clockwise)"
+msgctxt "shortcut window"
+msgid "Rotate page to the right (clockwise)"
+msgstr "De pagina rechtsom draaien (met de klok mee)"
+
+#: src/help-overlay.ui:79
+#| msgid "Delay between pages:"
+msgctxt "shortcut window"
+msgid "Delete page"
+msgstr "Pagina verwijderen"
+
+#: src/help-overlay.ui:87
+#| msgid "Document Scanner"
+msgctxt "shortcut window"
+msgid "Document Management"
+msgstr "Documentbeheer"
+
+#: src/help-overlay.ui:92
+#| msgid "Start a new document"
+msgctxt "shortcut window"
+msgid "Start new document"
+msgstr "Een nieuw document beginnen"
+
+#: src/help-overlay.ui:99
+#| msgid "Scanned Document"
+msgctxt "shortcut window"
+msgid "Save scanned document"
+msgstr "Gescand document opslaan"
+
+#: src/help-overlay.ui:106
+#| msgid "Scanned Document"
+msgctxt "shortcut window"
+msgid "Email scanned document"
+msgstr "Gescand document per e-mail versturen"
+
+#: src/help-overlay.ui:113
+#| msgid "Scanned Document"
+msgctxt "shortcut window"
+msgid "Print scanned document"
+msgstr "Gescand document afdrukken"
+
+#: src/help-overlay.ui:120
+msgctxt "shortcut window"
+msgid "Copy current page to clipboard"
+msgstr "Huidige pagina naar het klembord kopiëren"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:113
+#| msgid "scanner"
+msgid "_Scanner"
+msgstr "_Scanner"
+
+#. Label beside scan side combo box
+#: src/preferences-dialog.ui:143
+#| msgid "Scan Side:"
+msgid "Scan Sides"
+msgstr "Zijden scannen"
+
+#. Label beside page size combo box
+#: src/preferences-dialog.ui:160
+#| msgid "Page Size:"
+msgid "Page Size"
+msgstr "Paginagrootte"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:191
+msgid "Front"
+msgstr "Voorzijde"
+
+#. Preferences Dialog: Toggle button to select scanning on the back side of a page
+#: src/preferences-dialog.ui:206
+msgid "Back"
+msgstr "Achterzijde"
+
+#. Preferences Dialog: Toggle button to select scanning on both sides of a page
+#: src/preferences-dialog.ui:221
+msgid "Both"
+msgstr "Beide"
+
+#. Label beside page delay scale
+#: src/preferences-dialog.ui:260
+msgid "Delay"
+msgstr "Vertraging"
+
+#. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
+#: src/preferences-dialog.ui:276
+#| msgid "_Multiple Pages From Flatbed"
+msgid "Multiple pages from flatbed"
+msgstr "Meerdere pagina's van vlakbed"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:295
+msgid "3"
+msgstr "3"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:310
+msgid "5"
+msgstr "5"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:326
+msgid "7"
+msgstr "7"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:342
+msgid "10"
+msgstr "10"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:358
+msgid "15"
+msgstr "15"
+
+#. Label after page delay radio buttons
+#: src/preferences-dialog.ui:385
+msgid "Seconds"
+msgstr "Seconden"
+
+#. Preferences Dialog: Tab label for scanning settings
+#: src/preferences-dialog.ui:413
+#| msgid "Scan"
+msgid "Scanning"
+msgstr "Bezig met scannen"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:436
+#| msgid "_Text Resolution:"
+msgid "_Text Resolution"
+msgstr "_Tekstresolutie"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:452
+#| msgid "_Photo Resolution:"
+msgid "_Photo Resolution"
+msgstr "_Fotoresolutie"
+
+#. Label beside brightness scale
+#: src/preferences-dialog.ui:505
+#| msgid "Brightness:"
+msgid "Brightness"
+msgstr "Helderheid"
+
+#. Label beside contrast scale
+#: src/preferences-dialog.ui:521
+#| msgid "Contrast:"
+msgid "Contrast"
+msgstr "Contrast"
+
+#. Preferences Dialog: Tab for quality settings
+#: src/preferences-dialog.ui:576
+#| msgid "Quality:"
+msgid "Quality"
+msgstr "Kwaliteit"
+
+#. Combo box value for automatic paper size
+#: src/preferences-dialog.vala:77
+msgid "Automatic"
+msgstr "Automatisch"
+
+#: src/preferences-dialog.vala:116
+msgid "Darker"
+msgstr "Donkerder"
+
+#: src/preferences-dialog.vala:118
+msgid "Lighter"
+msgstr "Lichter"
+
+#: src/preferences-dialog.vala:126
+msgid "Less"
+msgstr "Minder"
+
+#: src/preferences-dialog.vala:128
+msgid "More"
+msgstr "Meer"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/preferences-dialog.vala:440
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (standaard)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/preferences-dialog.vala:443
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (klad)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/preferences-dialog.vala:446
 #, 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/preferences-dialog.vala:449
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1835
-msgid "New Document"
-msgstr "Nieuw document"
+#. Error displayed when no scanners to scan with
+#: src/scanner.vala:844
+msgid "No scanners available.  Please connect a scanner."
+msgstr ""
+"Geen scanners beschikbaar. Sluit een scanner aan om dit programma te "
+"gebruiken."
 
-#: ../src/ui.vala:1840
-msgid "Document"
-msgstr "Document"
+#. Error displayed when cannot connect to scanner
+#: src/scanner.vala:874
+msgid "Unable to connect to scanner"
+msgstr "Kan niet verbinden met de scanner"
 
-#: ../src/ui.vala:1844
-msgid "Email..."
-msgstr "E-mail..."
+#. Error display when unable to start scan
+#: src/scanner.vala:1227
+msgid "Unable to start scan"
+msgstr "Kan de scan niet starten"
 
-#: ../src/ui.vala:1845
-msgid "Print..."
-msgstr "Afdrukken..."
+#. Error displayed when communication with scanner broken
+#: src/scanner.vala:1240 src/scanner.vala:1340
+msgid "Error communicating with scanner"
+msgstr "Fout tijdens het communiceren met de scanner"
 
-#: ../src/ui.vala:1853
-msgid "Help"
-msgstr "Hulp"
+#. Help string for command line --version flag
+#: src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "Uitgaveversie tonen"
 
-#: ../src/ui.vala:1854
-msgid "About"
-msgstr "Over"
+#. Help string for command line --debug flag
+#: src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Debugberichten weergeven"
 
-#: ../src/ui.vala:1855
-msgid "Quit"
-msgstr "Afsluiten"
+#: 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"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
-msgid "Change _Scanner"
-msgstr "_Scanner wijzigen"
+#. Title of error dialog when scan failed
+#: src/simple-scan.vala:392
+msgid "Failed to scan"
+msgstr "Scannen is mislukt"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
-msgid "_Install Drivers"
-msgstr "Stuurprogramma's _installeren"
+#. Attempt to inhibit the screensaver when scanning
+#: src/simple-scan.vala:407
+msgid "Scan in progress"
+msgstr "Scan in uitvoering"
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
-msgid "Automatic"
-msgstr "Automatisch"
+#. Arguments and description for --help text
+#: src/simple-scan.vala:584
+#| msgid "[DEVICE...] - Scanning utility"
+msgid "[DEVICE…] — Scanning utility"
+msgstr "[APPARAAT…] — Hulpmiddel voor scannen"
 
-#: ../src/ui.vala:1947
-msgid "Darker"
-msgstr "Donkerder"
+#. Text printed out when an unknown command-line argument provided
+#: src/simple-scan.vala:595
+#, c-format
+#| msgid ""
+#| "Run '%s --help' to see a full list of available command line options."
+msgid "Run “%s --help” to see a full list of available command line options."
+msgstr ""
+"Voer ‘%s --help’ uit om een volledige lijst van beschikbare"
+" opdrachtregelopties te zien."
 
-#: ../src/ui.vala:1949
-msgid "Lighter"
-msgstr "Lichter"
+#~ msgid "Front and Back"
+#~ msgstr "Voor- en achterzijde"
 
-#: ../src/ui.vala:1957
-msgid "Less"
-msgstr "Minder"
+#~ msgid "New"
+#~ msgstr "Nieuw"
 
-#: ../src/ui.vala:1959
-msgid "More"
-msgstr "Meer"
+#~ msgid "Rotate Left"
+#~ msgstr "Linksom draaien"
 
-#: ../src/ui.vala:1967
-msgid "Minimum"
-msgstr "Minimum"
+#~ msgid "Rotate Right"
+#~ msgstr "Rechtsom draaien"
 
-#: ../src/ui.vala:1969
-msgid "Maximum"
-msgstr "Maximum"
+#~ msgid "Crop"
+#~ msgstr "Bijsnijden"
 
-#: ../src/ui.vala:2008
-msgid "Saving document..."
-msgstr "Bezig met opslaan van document..."
+#~ msgid "Scan S_ource:"
+#~ msgstr "Scanner:"
 
-#: ../src/ui.vala:2173
-#, c-format
-msgid "Saving page %d out of %d"
-msgstr "Bezig met opslaan van pagina %d van %d"
+#~ msgid "New Document"
+#~ msgstr "Nieuw document"
+
+#~ msgid "Document"
+#~ msgstr "Document"
+
+#~ msgid "Email..."
+#~ msgstr "E-mail..."
+
+#~ msgid "Print..."
+#~ msgstr "Afdrukken..."
+
+#~ msgid "_Install Drivers"
+#~ msgstr "Stuurprogramma's _installeren"
+
+#~ msgid "Minimum"
+#~ msgstr "Minimum"
+
+#~ msgid "Maximum"
+#~ msgstr "Maximum"
+
+#~ msgid "Saving document..."
+#~ msgstr "Bezig met opslaan van document..."
+
+#~ msgid "Saving page %d out of %d"
+#~ msgstr "Bezig met opslaan van pagina %d van %d"
 
 #~ msgid "4&#xD7;6"
 #~ msgstr "4&#xD7;6"
@@ -781,7 +1149,6 @@ msgstr "Bezig met opslaan van pagina %d van %d"
 #~ msgid "Files missing"
 #~ msgstr "Ontbrekende bestanden"
 
-#, c-format
 #~ msgid ""
 #~ "Usage:\n"
 #~ "  %s [DEVICE...] - Scanning utility"
@@ -792,7 +1159,6 @@ msgstr "Bezig met opslaan van pagina %d van %d"
 #~ msgid "Please check your installation"
 #~ msgstr "Controleer uw installatie"
 
-#, c-format
 #~ msgid ""
 #~ "GTK+ Options:\n"
 #~ "  --class=CLASS                   Program class as used by the window "
@@ -805,8 +1171,8 @@ msgstr "Bezig met opslaan van pagina %d van %d"
 #~ "  --g-fatal-warnings              Make all warnings fatal"
 #~ msgstr ""
 #~ "GTK+ Opties:\n"
-#~ "  --class=KLASSE                   Programmaklasse, zoals gebruikt door de "
-#~ "vensterbeheerder\n"
+#~ "  --class=KLASSE                   Programmaklasse, zoals gebruikt door "
+#~ "de vensterbeheerder\n"
 #~ "  --name=NAAM                     Programmanaam, zoals gebruikt door de "
 #~ "vensterbeheerder\n"
 #~ "  --screen=SCHERM                 Te gebruiken X-scherm\n"
@@ -817,25 +1183,15 @@ msgstr "Bezig met opslaan van pagina %d van %d"
 #~ msgid "TRUE if the application window is maximized"
 #~ msgstr "TRUE als het programmavenster gemaximaliseerd is"
 
-#~ msgid "Device to scan from"
-#~ msgstr "Te gebruiken scanapparaat"
-
-#~ msgid "SANE device to acquire images from."
-#~ msgstr "SANE-apparaat om beeld van te ontvangen"
-
 #~ msgid "Direction of scan"
 #~ msgstr "Scanrichting"
 
-#~ msgid "Type of document being scanned"
-#~ msgstr "Type document dat gescand wordt"
-
 #~ msgid "Window height in pixels"
 #~ msgstr "Vensterhoogte in pixels"
 
 #~ msgid "Window width in pixels"
 #~ msgstr "Vensterbreedte in pixels"
 
-#, c-format
 #~ msgid ""
 #~ "Help Options:\n"
 #~ "  -d, --debug                     Print debugging messages\n"
@@ -852,8 +1208,9 @@ msgstr "Bezig met opslaan van pagina %d van %d"
 #~ "  --help-gtk                      GTK+-opties weergeven"
 
 #~ msgid ""
-#~ "The direction of the scanner across the scanned page. It can be one of the "
-#~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+#~ "The direction of the scanner across the scanned page. It can be one of "
+#~ "the following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-"
+#~ "left'"
 #~ msgstr ""
 #~ "De richting van de scanner over de gescande pagina. Dit kan een van de "
 #~ "volgende waarden zijn: 'top-to-bottom' 'bottom-to-top' 'left-to-right' "
@@ -864,8 +1221,9 @@ msgstr "Bezig met opslaan van pagina %d van %d"
 #~ "photos. This setting decides on the scan resolution, colors and post-"
 #~ "processing."
 #~ msgstr ""
-#~ "Type document dat gescand wordt. 'text' voor tekstdocumenten, 'photo' voor "
-#~ "foto's. Deze instelling bepaalt de scanresolutie, de kleuren en naverwerking."
+#~ "Type document dat gescand wordt. 'text' voor tekstdocumenten, 'photo' "
+#~ "voor foto's. Deze instelling bepaalt de scanresolutie, de kleuren en "
+#~ "naverwerking."
 
 #~ msgid "Height of scanned image in pixels"
 #~ msgstr "Hoogte van gescande afbeelding in pixels"
@@ -874,14 +1232,8 @@ msgstr "Bezig met opslaan van pagina %d van %d"
 #~ "The height of scanned image in pixels. This value is updated to what the "
 #~ "last scanned page was."
 #~ msgstr ""
-#~ "De hoogte van de gescande afbeelding in pixels. Deze waarde representeert de "
-#~ "laatst gescande pagina."
-
-#~ msgid "Resolution for text scans"
-#~ msgstr "Resolutie voor gescande tekst"
-
-#~ msgid "Resolution for photo scans"
-#~ msgstr "Resolutie voor gescande foto's"
+#~ "De hoogte van de gescande afbeelding in pixels. Deze waarde representeert "
+#~ "de laatst gescande pagina."
 
 #~ msgid "The resolution in dots-per-inch of the previously scanned image."
 #~ msgstr ""
@@ -891,95 +1243,24 @@ msgstr "Bezig met opslaan van pagina %d van %d"
 #~ msgstr "Resolutie van laatste gescande afbeelding"
 
 #~ msgid ""
-#~ "The directory to save files to. Defaults to the documents directory if unset."
-#~ msgstr ""
-#~ "De map waarin bestanden worden opgeslagen. Dit is standaard de map "
-#~ "Documenten indien niet ingesteld."
-
-#~ msgid "Directory to save files to"
-#~ msgstr "Map om bestanden in op te slaan"
-
-#~ msgid ""
-#~ "The width of scanned image in pixels. This value is updated to what the last "
-#~ "scanned page was."
-#~ msgstr ""
-#~ "De breedte van de gescande afbeelding in pixels. Deze waarde representeert "
-#~ "de laatst gescande pagina."
-
-#~ msgid "The resolution in dots-per-inch to use when scanning text."
-#~ msgstr ""
-#~ "De te gebruiken resolutie in punten-per-inch (dtp) tijdens het scannen van "
-#~ "tekst."
-
-#~ msgid "The resolution in dots-per-inch to use when scanning photos."
+#~ "The width of scanned image in pixels. This value is updated to what the "
+#~ "last scanned page was."
 #~ msgstr ""
-#~ "De te gebruiken resolutie in punten-per-inch (dtp) tijdens het scannen van "
-#~ "foto's."
+#~ "De breedte van de gescande afbeelding in pixels. Deze waarde "
+#~ "representeert de laatst gescande pagina."
 
 #~ msgid "Width of scanned image in pixels"
 #~ msgstr "Breedte van gescande afbeelding in pixels"
 
-#~ msgid "Scanned Document"
-#~ msgstr "Gescand document"
-
 #~ msgid "Select File _Type"
 #~ msgstr "Bestands_type selecteren"
 
-#~ msgid "Page side to scan"
-#~ msgstr "Te scannen paginazijde"
-
-#~ msgid ""
-#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
-#~ msgstr ""
-#~ "De hoogte van het papier in tienden van een mm (of 0 voor automatische "
-#~ "papierdetectie)."
-
-#~ msgid "Height of paper in tenths of a mm"
-#~ msgstr "Hoogte van het papier in tienden van een mm"
-
-#~ msgid ""
-#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
-#~ msgstr ""
-#~ "De breedte van het papier in tienden van een mm (of 0 voor automatische "
-#~ "papierdetectie)."
-
-#~ msgid "Width of paper in tenths of a mm"
-#~ msgstr "Breedte van het papier in tienden van een mm"
-
-#~ msgid ""
-#~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
-#~ msgstr ""
-#~ "De te scannen paginazijde. Mogelijke waarden zijn ‘both’, ‘front’ en ‘back’."
-
-#~ msgid "The page side to scan."
-#~ msgstr "De paginazijde om te scannen."
-
 #~ msgid ""
-#~ "Type of document being scanned. This setting decides on the scan resolution, "
-#~ "colors and post-processing."
+#~ "The page side to scan. It can be one of the following: 'both' 'front' "
+#~ "'back'"
 #~ msgstr ""
-#~ "Het type document dat gescand wordt. Deze instelling bepaalt de te scannen "
-#~ "resolutie, kleuren en nabewerking."
+#~ "De te scannen paginazijde. Mogelijke waarden zijn ‘both’, ‘front’ en "
+#~ "‘back’."
 
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "De richting van de scanner over de te scannen pagina."
-
-#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
-#~ msgstr "Aanpassing van het contrast van -100 tot 100 (0 is geen)."
-
-#~ msgid "Contrast of scan"
-#~ msgstr "Contrast van de scan"
-
-#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
-#~ msgstr "Aanpassing van de helderheid van -100 tot 100 (0 is geen)."
-
-#~ msgid "Brightness of scan"
-#~ msgstr "Helderheid van de scan"
-
-#~ msgid "Quality value to use for JPEG compression."
-#~ msgstr "De kwaliteitswaarde die gebruikt zal worden voor JPEG-compressie."
-
-#~ msgid "Quality value to use for JPEG compression"
-#~ msgstr "De kwaliteitswaarde die gebruikt zal worden voor JPEG-compressie"
diff --git a/po/oc.gmo b/po/oc.gmo
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..a4cccda 100644
--- a/po/oc.po
+++ b/po/oc.po
@@ -7,297 +7,311 @@ 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-04-16 08:54-0400\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"
+"Language: oc\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-25 06:10+0000\n"
+"X-Generator: Launchpad (build 18361)\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:231 src/simple-scan.ui:815 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:247
 msgid "_Document"
 msgstr "_Document"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/simple-scan.ui:266
 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:279 src/simple-scan.ui:1343 src/simple-scan.ui:1402
 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:289 src/simple-scan.ui:1352 src/simple-scan.ui:1411
 msgid "All Pages From _Feeder"
 msgstr "Totas las paginas del _nauc"
 
+#. 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 "_Arrestar la numerizacion"
 
-#: 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 "Tèxte"
 
-#: 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 "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:352 src/ui.vala:1247 src/ui.vala:1891
 msgid "Reorder Pages"
-msgstr ""
+msgstr "Reorganizar las paginas"
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/simple-scan.ui:371
 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:436
 msgid "_Page"
 msgstr "_Pagina"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:446
 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:456
 msgid "Rotate _Right"
 msgstr "Pivotar cap a _drecha"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:466
 msgid "_Crop"
 msgstr "Re_quadrar"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:476
 msgid "_None"
 msgstr "_Pas cap"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:487
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:498
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:509
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:520
 msgid "_Letter"
 msgstr "_Letter (US)"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:531
 msgid "Le_gal"
 msgstr "_Legal (US)"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:542
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:553
 msgid "_Custom"
 msgstr "_Personalizar"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:571
 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:584
 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:593
 msgid "Move Right"
 msgstr "Se desplaçar cap a drecha"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:630
 msgid "_Help"
 msgstr "_Ajuda"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:638
 msgid "_Contents"
 msgstr "_Ensenhador"
 
 #. 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 "Crear un document novèl"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:681
 msgid "New"
 msgstr "Novèl"
 
 #. 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 "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:697 src/simple-scan.ui:843
 msgid "Scan"
 msgstr "Numerizar"
 
 #. 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 "Enregistrar lo document dins un fichièr"
 
-#: ../src/ui.vala:1842
+#: src/simple-scan.ui:715 src/ui.vala:1892
 msgid "Save"
 msgstr "Enregistrar"
 
 #. 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 "Arrestar la numerizacion en cors"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:731 src/simple-scan.ui:831
 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:755 src/simple-scan.ui:942
 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:756
 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:770 src/simple-scan.ui:920
 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:771
 msgid "Rotate Right"
 msgstr "Rotacion a drecha"
 
-#: 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 "Requadrar la pagina seleccionada"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:787
 msgid "Crop"
 msgstr "Requadrar"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:1003 src/ui.vala:1898
 msgid "Preferences"
 msgstr "Preferéncias"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1054
 msgid "Scan S_ource:"
 msgstr "F_ont de numerizacion :"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1085
 msgid "_Text Resolution:"
 msgstr "Resolucion del _Tèxte :"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1101
 msgid "_Photo Resolution:"
 msgstr "Resolucion de la _fòto :"
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1145
 msgid "Scan Side:"
 msgstr "Fàcia de numerizar :"
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1175
 msgid "Page Size:"
 msgstr "Talha de la pagina :"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1205
 msgid "Brightness:"
 msgstr "Luminositat :"
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1235
 msgid "Contrast:"
 msgstr "Contraste :"
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1266
 msgid "Quality:"
 msgstr "Qualitat :"
 
+#. 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 "Numerizar de documents"
 
@@ -309,7 +323,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 +331,210 @@ 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:844
 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:874
 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:1227
 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:1240 src/scanner.vala:1340
 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:332 src/ui.vala:1655 src/ui.vala:1935
 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:341
 #, 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:389
 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:391
 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:396
 msgid "Additional software needed"
-msgstr ""
+msgstr "Logicial suplementari necessari"
 
 #. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:398
 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:510
 msgid "Save As..."
 msgstr "Enregistrar jos..."
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:513 src/ui.vala:648 src/ui.vala:723
 msgid "_Cancel"
 msgstr "A_nullar"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:514 src/ui.vala:724
 msgid "_Save"
 msgstr "_Salvar"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:522
 msgid "Scanned Document.pdf"
 msgstr "Document.pdf numerizat"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:528
 msgid "Image Files"
 msgstr "Fichièrs imatges"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:534
 msgid "All Files"
 msgstr "Totes los fichièrs"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:543
 msgid "PDF (multi-page document)"
 msgstr "PDF (document multipaginas)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:549
 msgid "JPEG (compressed)"
 msgstr "JPEG (compressat)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:555
 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:564
 msgid "File format:"
 msgstr "Format del fichièr :"
 
+#. 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:650
+#: src/ui.vala:698
 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:721
 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:763
 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:765
 msgid "Discard Changes"
 msgstr "Abandonar las modificacions"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:1056
 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:1068
 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:1270
 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:1280
 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:1290
 msgid "Reverse"
 msgstr "Inversar"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1300
 msgid "Keep unchanged"
-msgstr ""
+msgstr "Manténer incambiat"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1504
 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: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"
@@ -539,16 +564,16 @@ msgstr ""
 "<http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1528
 msgid "About Simple Scan"
 msgstr "A prepaus de Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1531
 msgid "Simple document scanning tool"
 msgstr "Numerizar simplament vòstres documents"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1540
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -556,189 +581,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:1562
 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:1564
 msgid "Quit without Saving"
 msgstr "Quitar sens enregistrar"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1632
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1634
 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:1638
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1640
 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:1644
 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:1649
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1651
 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:1655
 msgid "Install drivers"
-msgstr ""
+msgstr "Installar los pilòts"
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1686
 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:1698
 msgid "Installing drivers..."
-msgstr ""
+msgstr "Installacion dels pilòts..."
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1706
 msgid "Drivers installed successfully!"
 msgstr ""
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1716
 #, 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:1722
 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:1729
 #, 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:1833
 #, 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:1836
 #, 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:1839
 #, 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:1842
 #, c-format
 msgid "%d dpi"
 msgstr "%d ppp"
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1885
 msgid "New Document"
 msgstr "Document novèl"
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1890
 msgid "Document"
 msgstr "Document"
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1893
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1894
 msgid "Print..."
 msgstr "Imprimir..."
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1902
 msgid "Help"
 msgstr "Ajuda"
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1903
 msgid "About"
 msgstr "A prepaus"
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1904
 msgid "Quit"
 msgstr "Quitar"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1937
 msgid "Change _Scanner"
 msgstr "Cambiar de _scanner"
 
 #. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1939
 msgid "_Install Drivers"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1945
 msgid "Automatic"
 msgstr "Automatic"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1995
 msgid "Darker"
 msgstr "Mai escur"
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1997
 msgid "Lighter"
 msgstr "Mai clar"
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:2005
 msgid "Less"
 msgstr "Mens"
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:2007
 msgid "More"
 msgstr "Mai"
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:2015
 msgid "Minimum"
 msgstr "Minimum"
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:2017
 msgid "Maximum"
 msgstr "Maximum"
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2068
 msgid "Saving document..."
 msgstr "Enregistrament del document..."
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2242
 #, 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..ffe4a6f 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -1,511 +1,534 @@
 # Punjabi translation for simple-scan
 # Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
 # This file is distributed under the same license as the simple-scan package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
 #
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+# A S Alam <aalam@users.sf.net>, 2017.
 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"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=simple-"
+"scan&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-08-13 21:51+0000\n"
+"PO-Revision-Date: 2017-08-20 19:30-0600\n"
+"Last-Translator: A S Alam <aalam@users.sf.net>\n"
 "Language-Team: Punjabi <pa@li.org>\n"
+"Language: pa\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-25 06:10+0000\n"
+"X-Generator: Lokalize 2.0\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#. Button to submit authorization dialog
-#: data/simple-scan.ui:24
-msgid "_Authorize"
-msgstr "ਪਰਮਾਣਿਤ(_A)"
+#: data/org.gnome.SimpleScan.gschema.xml:11
+msgid "Device to scan from"
+msgstr "ਸਕੈਨ ਕਰਨ ਲਈ ਜੰਤਰ"
 
-#. Label beside username entry
-#: data/simple-scan.ui:102
-msgid "_Username for resource:"
-msgstr "ਸਰੋਤ ਲਈ ਯੂਜ਼ਰ-ਨਾਂ(_U):"
+#: data/org.gnome.SimpleScan.gschema.xml:12
+msgid "SANE device to acquire images from."
+msgstr "ਚਿੱਤਰ ਲੈਣ ਲਈ ਸੈਨ (SANE) ਜੰਤਰ"
 
-#. Label beside password entry
-#: data/simple-scan.ui:117
-msgid "_Password:"
-msgstr "ਪਾਸਵਰਡ(_P):"
+#: data/org.gnome.SimpleScan.gschema.xml:20
+msgid "Type of document being scanned"
+msgstr "ਸਕੈਨ ਕੀਤੇ ਜਾਣ ਵਾਲੇ ਡੌਕੂਮੈਂਟ ਦੀ ਕਿਸਮ"
 
-#. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
-msgid "Front and Back"
-msgstr "ਅੱਗੇ ਅਤੇ ਪਿੱਛੇ"
+#: data/org.gnome.SimpleScan.gschema.xml:21
+msgid ""
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+msgstr ""
+"ਸਕੈਨ ਕੀਤੇ ਜਾਣ ਵਾਲੇ ਦਸਤਾਵੇਜ਼ ਦੀ ਕਿਸਮ ਹੈ। ਇਹ ਸੈਟਿੰਗ ਸਕੈਨ ਰੈਜ਼ੋਲੂਸ਼ਨ, ਰੰਗ ਅਤੇ"
+" ਸਕੈਨ ਕਰਨ ਤੋਂ ਬਾਅਦ ਦੀਆਂ ਕਾਰਵਾਈਆਂ "
+"ਤਹਿ ਕਰਦੀ ਹੈ।"
 
-#. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
-msgid "Front"
-msgstr "ਅੱਗੇ"
+#: data/org.gnome.SimpleScan.gschema.xml:25
+msgid "Width of paper in tenths of a mm"
+msgstr "ਮਿਲੀਮੀਟਰ ਦੇ ਦਸਵੇਂ ਹਿੱਸੇ 'ਚ ਪੇਪਰ ਦੀ ਚੌੜਾਈ"
 
-#. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
-msgid "Back"
-msgstr "ਪਿੱਛੇ"
+#: data/org.gnome.SimpleScan.gschema.xml:26
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"ਮਿਲੀਮੀਟਰ ਦੇ ਦਸਵੇਂ ਹਿੱਸੇ ਤੱਕ ਪੇਪਰ ਦੀ ਚੌੌੜਾਈ (ਜਾਂ ਆਪਣੇ-ਆਪ ਪੇਪਰ ਨੂੰ ਖੋਜਣ ਲਈ 0)।"
+
+#: data/org.gnome.SimpleScan.gschema.xml:30
+msgid "Height of paper in tenths of a mm"
+msgstr "ਮਿਲੀਮੀਟਰ ਦੇ ਦਸਵੇਂ ਹਿੱਸੇ 'ਚ ਪੇਪਰ ਦੀ ਉਚਾਈ"
+
+#: data/org.gnome.SimpleScan.gschema.xml:31
+msgid ""
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"ਮਿਲੀਮੀਟਰ ਦੇ ਦਸਵੇਂ ਹਿੱਸੇ ਤੱਕ ਪੇਪਰ ਦੀ ਉਚਾਈ (ਜਾਂ ਆਪਣੇ-ਆਪ ਪੇਪਰ ਨੂੰ ਖੋਜਣ ਲਈ 0)।"
 
+#: data/org.gnome.SimpleScan.gschema.xml:35
+#| msgid "Direction of scan"
+msgid "Brightness of scan"
+msgstr "ਸਕੈਨ ਦੀ ਚਮਕ"
+
+#: data/org.gnome.SimpleScan.gschema.xml:36
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr "-100 ਤੋਂ 100 ਤੱਕ ਚਮਕ ਅਡਜੱਸਟਮੈਂਟ (0 ਭਾਵ ਕੁਝ ਨਹੀਂ)।"
+
+#: data/org.gnome.SimpleScan.gschema.xml:40
+#| msgid "Direction of scan"
+msgid "Contrast of scan"
+msgstr "ਸਕੈਨ ਦਾ ਕਨਟਰਾਸਟ"
+
+#: data/org.gnome.SimpleScan.gschema.xml:41
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr "-100 ਤੋਂ 100 ਤੱਕ ਕਨਟਰਾਸਟ ਅਡਜੱਸਟਮੈਂਟ (0 ਭਾਵ ਕੁਝ ਨਹੀਂ)।"
+
+#: data/org.gnome.SimpleScan.gschema.xml:45
+msgid "Resolution for text scans"
+msgstr "ਲਿਖਤ ਸਕੈਨ ਲਈ ਰੈਜ਼ੋਲੂਸ਼ਨ"
+
+#: data/org.gnome.SimpleScan.gschema.xml:46
+msgid "The resolution in dots-per-inch to use when scanning text."
+msgstr ""
+"ਟੈਕਸਟ ਨੂੰ ਸਕੈਨ ਕਰਨ ਦੌਰਾਨ ਵਰਤਣ ਵਾਸਤੇ ਰੈਜ਼ੋਲੂਸ਼ਨ ਪ੍ਰਤੀ-ਇੰਚ-ਬਿੰਦੀਆਂ ਦੇ ਰੂਪ 'ਚ।"
+
+#: data/org.gnome.SimpleScan.gschema.xml:50
+msgid "Resolution for photo scans"
+msgstr "ਫੋਟੋ ਸਕੈਨ ਲਈ ਰੈਜੋਲੂਸ਼ਨ"
+
+#: data/org.gnome.SimpleScan.gschema.xml:51
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr "ਫੋਟੋ ਸਕੈਨ ਕਰਨ ਦੌਰਾਨ ਵਰਤਣ ਵਾਸਤੇ ਰੈਜ਼ੋਲੂਸ਼ਨ ਪ੍ਰਤੀ-ਇੰਚ-ਬਿੰਦੀਆਂ ਦੇ ਰੂਪ 'ਚ।"
+
+#: data/org.gnome.SimpleScan.gschema.xml:55
+msgid "Page side to scan"
+msgstr "ਸਕੈਨ ਕਰਨ ਲਈ ਸਫ਼ੇ ਦਾ ਪਾਸਾ"
+
+#: data/org.gnome.SimpleScan.gschema.xml:56
+#| msgid "Page side to scan"
+msgid "The page side to scan."
+msgstr "ਸਕੈਨ ਕਰਨ ਲਈ ਸਫ਼ੇ ਦਾ ਪਾਸਾ।"
+
+#: data/org.gnome.SimpleScan.gschema.xml:60
+msgid "Directory to save files to"
+msgstr "ਫਾਇਲਾਂ ਸੰਭਾਲਣ ਲਈ ਡਾਇਰੈਕਟਰੀ"
+
+#: data/org.gnome.SimpleScan.gschema.xml:61
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+"ਫਾਇਲਾਂ ਸੰਭਾਲਣ ਲਈ ਡਾਇਰੈਕਟਰੀ ਹੈ। ਜੇ ਸੈੱਟ ਨਾ ਕੀਤਾ ਤਾਂ ਡਿਫਾਲਟ ਡੌਕੂਮੈਂਟ ਡਾਇਰੈਕਟਰੀ"
+" ਹੈ।"
+
+#: data/org.gnome.SimpleScan.gschema.xml:66
+msgid "Quality value to use for JPEG compression"
+msgstr "JPEG ਕੰਪਰੈਸ਼ਨ ਲਈ ਵਰਤਣ ਵਾਸਤੇ ਕੁਆਲਟੀ ਮੁੱਲ"
+
+#: data/org.gnome.SimpleScan.gschema.xml:67
+msgid "Quality value to use for JPEG compression."
+msgstr "JPEG ਕੰਪਰੈਸ਼ਨ ਲਈ ਵਰਤਣ ਵਾਸਤੇ ਕੁਆਲਟੀ ਮੁੱਲ।"
+
+#: data/org.gnome.SimpleScan.gschema.xml:72
+msgid "Delay in millisecond between pages"
+msgstr "ਸਫ਼ਿਆਂ ਦੇ ਵਿਚਾਲੇ ਮਿਲੀਸਕਿੰਟਾਂ 'ਚ ਦੇਰੀ"
+
+#: data/org.gnome.SimpleScan.gschema.xml:73
+msgid "Delay in millisecond between pages."
+msgstr "ਸਫ਼ਿਆਂ ਦੇ ਵਿਚਾਲੇ ਮਿਲੀਸਕਿੰਟਾਂ 'ਚ ਦੇਰੀ।"
+
+#. Title of scan window
+#. Set HeaderBar title here because Glade doesn't keep it translated
+#. https://bugzilla.gnome.org/show_bug.cgi?id=782753
 #. 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
+#: data/simple-scan.appdata.xml.in:6 data/simple-scan.desktop.in:3
+#: src/app-window.ui:76 src/app-window.vala:1560
 msgid "Simple Scan"
 msgstr "ਸੌਖਾ ਸਕੈਨ"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
-msgid "_Document"
-msgstr "ਡੌਕੂਮੈਂਟ(_D)"
+#: data/simple-scan.appdata.xml.in:7 data/simple-scan.desktop.in:5
+msgid "Scan Documents"
+msgstr "ਸਕੈਨ ਕੀਤੇ ਡੌਕੂਮੈਂਟ"
 
-#. Scan menu item
-#: data/simple-scan.ui:260
-msgid "Sc_an"
-msgstr "ਸਕੈਨ ਕਰੋ(_a)"
+#: 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 "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
 
+#: data/simple-scan.appdata.xml.in:14
+msgid "Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+"ਸੈਂਪਲ ਸਕੈਨਰ ਸਭ ਤੋਂ ਵੱਧ ਮੌਜੂਦ ਸਕੈਨਰਾਂ ਲਈ ਸਹਿਯੋਗ ਵਾਸਤੇ SANE ਫਰੇਮਵਰਕ ਵਰਤਦਾ ਹੈ।"
+
+#: data/simple-scan.desktop.in:4
+msgid "Document Scanner"
+msgstr "ਡੌਕੂਮੈਂਟ ਸਕੈਨਰ"
+
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: data/simple-scan.desktop.in:7
+msgid "scan;scanner;flatbed;adf;"
+msgstr "ਸਕੈਨ;ਸਕੈਨਰ;ਸਕੈਨ ਕਰੋ;ਫਲੈਟਬੈਡ;"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: data/simple-scan.desktop.in:10
+msgid "scanner"
+msgstr "scanner"
+
+#. Toolbar scan menu item to scan a single page from the scanner
 #. 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/app-window.ui:22 src/app-window.ui:123 src/app-window.ui:820
 msgid "Single _Page"
 msgstr "ਇੱਕਲਾ ਸਫ਼ਾ(_P)"
 
+#. Toolbar scan menu item to scan all pages from a document feeder
 #. 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/app-window.ui:31 src/app-window.ui:133 src/app-window.ui:829
 msgid "All Pages From _Feeder"
 msgstr "ਫੀਡਰ ਤੋਂ ਸਭ ਸਫ਼ੇ(_F)"
 
-#. Menu entry to stop current scan
-#: data/simple-scan.ui:294
-msgid "_Stop Scan"
-msgstr "ਸਕੈਨ ਨੂੰ ਰੋਕੋ(_S)"
+#. Toolbar scan menu item to scan continuously from the flatbed
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/app-window.ui:40 src/app-window.ui:143 src/app-window.ui:838
+msgid "_Multiple Pages From Flatbed"
+msgstr "ਫਲੈਟਬੈਡ ਤੋਂ ਕਈ ਸਫ਼ੇ(_M)"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:853
 msgid "Text"
 msgstr "ਟੈਕਸਟ"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:863
 msgid "Photo"
 msgstr "ਫੋਟੋ"
 
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: src/app-window.ui:91
+msgid "_Document"
+msgstr "ਡੌਕੂਮੈਂਟ(_D)"
+
+#. Scan menu item
+#: src/app-window.ui:110
+msgid "Sc_an"
+msgstr "ਸਕੈਨ ਕਰੋ(_a)"
+
+#. Menu entry to stop current scan
+#: src/app-window.ui:154
+msgid "_Stop Scan"
+msgstr "ਸਕੈਨ ਨੂੰ ਰੋਕੋ(_S)"
+
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/app-window.ui:196 src/app-window.vala:967 src/app-window.vala:1590
 msgid "Reorder Pages"
-msgstr ""
+msgstr "ਸਫ਼ਿਆਂ ਦੀ ਲੜੀ ਬਦਲੋ"
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/app-window.ui:215
 msgid "_Email"
 msgstr "ਈਮੇਲ(_E)"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/app-window.ui:280
 msgid "_Page"
 msgstr "ਸਫ਼ਾ(_P)"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/app-window.ui:290
 msgid "Rotate _Left"
 msgstr "ਖੱਬੇ ਘੁੰਮਾਓ(_L)"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/app-window.ui:300
 msgid "Rotate _Right"
 msgstr "ਸੱਜੇ ਘੁੰਮਾਓ(_R)"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/app-window.ui:310
 msgid "_Crop"
 msgstr "ਕਰੋਪ ਕਰੋ(_C)"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/app-window.ui:320
 msgid "_None"
 msgstr "ਕੁਝ ਨਹੀਂ(_N)"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/app-window.ui:331
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/app-window.ui:342
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/app-window.ui:353
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/app-window.ui:364
 msgid "_Letter"
 msgstr "ਪੱਤਰ(_L)"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/app-window.ui:375
 msgid "Le_gal"
 msgstr "ਲੀਗਲ(_g)"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/app-window.ui:386
 msgid "4×6"
-msgstr ""
+msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/app-window.ui:397
 msgid "_Custom"
 msgstr "ਕਸਟਮ(_C)"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/app-window.ui:415
 msgid "_Rotate Crop"
 msgstr "ਕਰੋਪ ਨੂੰ ਘੁੰਮਾਓ(_R)"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/app-window.ui:428
 msgid "Move Left"
-msgstr ""
+msgstr "ਖੱਬੇ ਭੇਜੋ"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/app-window.ui:437
 msgid "Move Right"
-msgstr ""
+msgstr "ਸੱਜੇ ਭੇਜੋ"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/app-window.ui:474
 msgid "_Help"
 msgstr "ਮੱਦਦ(_H)"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/app-window.ui:482
 msgid "_Contents"
 msgstr "ਸਮੱਗਰੀ(_C)"
 
-#. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
-msgid "Start a new document"
-msgstr "ਨਵਾਂ ਡੌਕੂਮੈਂਟ ਸ਼ੁਰੂ ਕਰੋ"
-
-#: data/simple-scan.ui:675
-msgid "New"
-msgstr "ਨਵਾਂ"
-
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/app-window.ui:520 src/app-window.ui:720
 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/app-window.ui:522 src/app-window.ui:716
 msgid "Scan"
 msgstr "ਸਕੈਨ"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/app-window.ui:538 src/app-window.ui:787
 msgid "Save document to a file"
 msgstr "ਡੌਕੂਮੈਂਟ ਫਾਇਲ ਵਿੱਚ ਸੰਭਾਲੋ"
 
-#: ../src/ui.vala:1842
+#: src/app-window.ui:540
 msgid "Save"
 msgstr "ਸੰਭਾਲੋ"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/app-window.ui:555 src/app-window.ui:700
 msgid "Stop the current scan"
 msgstr "ਮੌਜੂਦਾ ਸਕੈਨ ਰੋਕੋ"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/app-window.ui:556 src/app-window.ui:697
 msgid "Stop"
 msgstr "ਰੋਕੋ"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "ਸਫ਼ੇ ਨੂੰ ਖੱਬੇ ਘੁੰਮਾਉ (ਘੜੀ ਦੀ ਉਲਟ ਦਿਸ਼ਾ ਵਿੱਚ)"
-
-#. Label on rotate page left (anti-clockwise) item
-#: data/simple-scan.ui:750
-msgid "Rotate Left"
-msgstr "ਖੱਬੇ ਘੁੰਮਾਓ"
-
-#. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
-msgid "Rotate the page to the right (clockwise)"
-msgstr "ਸਫ਼ੇ ਨੂੰ ਸੱਜੇ ਘੁੰਮਾਉ (ਘੜੀ ਦੀ ਦਿਸ਼ਾ ਵਿੱਚ)"
-
-#. Label on rotate page right (clockwise) item
-#: data/simple-scan.ui:765
-msgid "Rotate Right"
-msgstr "ਸੱਜੇ ਘੁੰਮਾਓ"
-
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
-msgid "Crop the selected page"
-msgstr "ਚੁਣੇ ਸਫ਼ੇ ਨੂੰ ਕਰੋਪ ਕਰੋ"
+#. Label shown when searching for scanners
+#: src/app-window.ui:611
+msgid "Searching for Scanners…"
+msgstr "…ਸਕੈਨਰ ਲੱਭੇ ਜਾ ਰਹੇ ਹਨ"
 
-#: data/simple-scan.ui:781
-msgid "Crop"
-msgstr "ਕਰੋਪ ਕਰੋ"
-
-#: ../src/ui.vala:1849
-msgid "Preferences"
-msgstr "ਮੇਰੀ ਪਸੰਦ"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1048
-msgid "Scan S_ource:"
-msgstr "ਸਕੈਨ ਸਰੋਤ(_o):"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1079
-msgid "_Text Resolution:"
-msgstr "ਟੈਕਸਟ ਰੈਜ਼ੋਲੂਸ਼ਨ(_T):"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1095
-msgid "_Photo Resolution:"
-msgstr "ਫੋਟੋ ਰੈਜ਼ੋਲੂਸ਼ਨ(_P):"
-
-#. Label beside scan side combo box
-#: data/simple-scan.ui:1139
-msgid "Scan Side:"
-msgstr "ਸਕੈਨ ਸਾਈਡ"
-
-#. Label beside page size combo box
-#: data/simple-scan.ui:1169
-msgid "Page Size:"
-msgstr "ਸਫਾ ਆਕਾਰ:"
-
-#. Label beside brightness scale
-#: data/simple-scan.ui:1199
-msgid "Brightness:"
-msgstr ""
-
-#. Label beside contrast scale
-#: data/simple-scan.ui:1229
-msgid "Contrast:"
-msgstr ""
-
-#. Label beside quality scale
-#: data/simple-scan.ui:1260
-msgid "Quality:"
-msgstr ""
-
-#: data/simple-scan.desktop.in:4
-msgid "Document Scanner"
-msgstr ""
-
-#: data/simple-scan.desktop.in:5
-msgid "Scan Documents"
-msgstr "ਸਕੈਨ ਕੀਤੇ ਡੌਕੂਮੈਂਟ"
+#: src/app-window.vala:237 src/app-window.vala:1380
+msgid "_Close"
+msgstr "ਬੰਦ ਕਰੋ(_C)"
 
-#: data/simple-scan.desktop.in:6
-msgid "scan;scanner;flatbed;adf;"
-msgstr ""
+#. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
+#: src/app-window.vala:246
+#, c-format
+#| msgid "Username and password required to access '%s'"
+msgid "Username and password required to access “%s”"
+msgstr "“%s” ਵਰਤਣ ਲਈ ਵਰਤੋਂਕਾਰ-ਨਾਂ ਅਤੇ ਪਾਸਵਰਡ ਚਾਹੀਦਾ ਹੈ"
 
-#: data/simple-scan.desktop.in:8
-msgid "scanner"
-msgstr ""
+#. Label shown when detected a scanner
+#: src/app-window.vala:266 src/app-window.vala:584
+#| msgid "Failed to scan"
+msgid "Ready to Scan"
+msgstr "ਸਕੈਨ ਕਰਨ ਲਈ ਤਿਆਰ"
 
-#: data/simple-scan.appdata.xml.in:8
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: src/app-window.vala:273
+msgid "Additional software needed"
+msgstr "ਹੋਰ ਸਾਫਟਵੇਅਰ ਚਾਹੀਦੇ ਹਨ"
 
-#: data/simple-scan.appdata.xml.in:13
+#. Instructions to install driver software
+#: src/app-window.vala:275
 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
-msgid "No scanners available.  Please connect a scanner."
-msgstr "ਕੋਈ ਵੀ ਸਕੈਨਰ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ। ਸਕੈਨਰ ਨਾਲ ਕੁਨੈਕਟ ਕਰੋ ਜੀ।"
-
-#. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
-msgid "Unable to connect to scanner"
-msgstr "ਸਕੈਨਰ ਨਾਲ ਜੁੜਨ ਲਈ ਅਸਮਰੱਥ"
-
-#. Error display when unable to start scan
-#: ../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
-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 ""
-
-#: ../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
-msgid "Failed to scan"
-msgstr "ਸਕੈਨ ਕਰਨ ਲਈ ਫੇਲ੍ਹ"
-
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
-msgid "[DEVICE...] - Scanning utility"
-msgstr ""
-
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
-#, c-format
-msgid "Run '%s --help' to see a full list of available command line options."
-msgstr ""
-
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
-msgid "_Close"
+"You need to <a href=\"install-firmware\">install driver software</a> for "
+"your scanner."
 msgstr ""
-
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
-#, c-format
-msgid "Username and password required to access '%s'"
-msgstr "'%s' ਵਰਤਣ ਲਈ ਯੂਜ਼ਰ-ਨਾਂ ਅਤੇ ਪਾਸਵਰਡ ਚਾਹੀਦਾ ਹੈ"
+"ਤੁਹਾਨੂੰ ਆਪਣੇ ਸਕੈਨਰ ਲਈ <a href=\"install-firmware\">ਡਰਾਇਵਰ ਸਾਫਟਵੇਅਰ ਇੰਸਟਾਲ</a>"
+" ਕਰਨ ਦੀ ਲੋੜ ਹੈ।"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/app-window.vala:281
 msgid "No scanners detected"
 msgstr "ਕੋਈ ਸਕੈਨਰ ਨਹੀਂ ਮਿਲਿਆ"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/app-window.vala:283
 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
-msgid "Additional software needed"
-msgstr ""
-
-#. Instructions to install driver software
-#: ../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
-msgid "Save As..."
-msgstr "ਇੰਝ ਸੰਭਾਲੋ..."
+#: src/app-window.vala:298
+#| msgid "Save As..."
+msgid "Save As…"
+msgstr "…ਵਜੋਂ ਸੰਭਾਲੋ"
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/app-window.vala:301 src/app-window.vala:471 src/app-window.vala:552
 msgid "_Cancel"
-msgstr ""
+msgstr "ਰੱਦ ਕਰੋ(_C)"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/app-window.vala:302 src/app-window.vala:553
 msgid "_Save"
-msgstr ""
+msgstr "ਸੰਭਾਲੋ(_S)"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/app-window.vala:310
 msgid "Scanned Document.pdf"
 msgstr "ਸਕੈਨ ਕੀਤਾ ਡੌਕੂਮੈਂਟ.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#. Save dialog: Filter name to show only supported image files
+#: src/app-window.vala:316
 msgid "Image Files"
 msgstr "ਚਿੱਤਰ ਫਾਇਲਾਂ"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/app-window.vala:326
 msgid "All Files"
 msgstr "ਸਭ ਫਾਇਲਾਂ"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/app-window.vala:335
 msgid "PDF (multi-page document)"
 msgstr "PDF (ਬਹੁ-ਸਫ਼ਾ ਡੌਕੂਮੈਂਟ)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/app-window.vala:341
 msgid "JPEG (compressed)"
-msgstr "JPEG (compressed)"
+msgstr "JPEG (ਕੰਪਰੈਸਡ)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/app-window.vala:347
 msgid "PNG (lossless)"
 msgstr "PNG (lossless)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#. Save dialog: Label for sabing in WEBP format
+#: src/app-window.vala:354
+#| msgid "JPEG (compressed)"
+msgid "WebP (compressed)"
+msgstr "WebP (ਕੰਪਰੈਸਡ)"
+
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
+#: src/app-window.vala:364
 msgid "File format:"
+msgstr "ਫਾਇਲ ਫਾਰਮੈਟ:"
+
+#. Label in save dialog beside compression slider
+#: src/app-window.vala:376
+msgid "Compression:"
+msgstr "ਕੰਪਰੈੱਸ਼ਨ:"
+
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/app-window.vala:470
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
 msgstr ""
+"ਇੱਕ ਫਾਇਲ ਨਾਂ “%s” ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ। ਕੀ ਤੁਸੀਂ ਇਸ ਨੂੰ ਬਦਲਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/app-window.vala:473
+msgid "_Replace"
+msgstr "ਬਦਲੋ(_R)"
+
+#: src/app-window.vala:512
+msgid "Saving"
+msgstr "ਸੰਭਾਲਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/app-window.vala:527
 msgid "Failed to save file"
 msgstr "ਫਾਇਲ ਸੰਭਾਲਣ ਲਈ ਫੇਲ੍ਹ ਹੈ"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
-msgid "If you don't save, changes will be permanently lost."
-msgstr "ਜੇ ਤੁਸੀਂ ਨਾ ਸੰਭਾਲਿਆ ਤਾਂ ਸਭ ਬਦਲਾਅ ਖਤਮ ਹੋ ਜਾਣਗੇ।"
+#: src/app-window.vala:550
+#| msgid "If you don't save, changes will be permanently lost."
+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/app-window.vala:591
 msgid "Save current document?"
 msgstr "ਮੌਜੂਦਾ ਡੌਕੂਮੈਂਟ ਸੰਭਾਲਣਾ ਹੈ?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/app-window.vala:593
 msgid "Discard Changes"
 msgstr "ਬਦਲਾਅ ਅਣਡਿੱਠੇ"
 
+#. Label shown when scan started
+#: src/app-window.vala:692
+#| msgid "Change _Scanner"
+msgid "Contacting scanner…"
+msgstr "…ਸਕੈਨਰ ਨਾਲ ਸੰਪਰਕ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
+
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/app-window.vala:800
 msgid "Unable to save image for preview"
-msgstr ""
+msgstr "ਝਲਕ ਲਈ ਚਿੱਤਰ ਸੰਭਾਲਣ ਵਾਸਤੇ ਅਸਮਰੱਥ"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/app-window.vala:812
 msgid "Unable to open image preview application"
 msgstr "ਚਿੱਤਰ ਝਲਕ ਐਪਲੀਕੇਸ਼ਨ ਖੋਲ੍ਹਣ ਲਈ ਅਸਮਰੱਥ"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/app-window.vala:990
 msgid "Combine sides"
-msgstr ""
+msgstr "ਪਾਸਿਓ ਨੂੰ ਜੋੜੋ"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/app-window.vala:1000
 msgid "Combine sides (reverse)"
-msgstr ""
+msgstr "ਪਾਸਿਓ ਨੂੰ ਜੋੜੋ (ਉਲਟ)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/app-window.vala:1010
 msgid "Reverse"
-msgstr ""
+msgstr "ਉਲਟ"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/app-window.vala:1020
 msgid "Keep unchanged"
-msgstr ""
+msgstr "ਅਣ-ਬਦਲਿਆ ਹੀ ਰੱਖੋ"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/app-window.vala:1250
 msgid "Unable to open help file"
-msgstr "ਮੱਦਦ ਫਾਇਲ ਖੋਲ੍ਹਣ ਲਈ ਅਸਮਰੱਥ"
+msgstr "ਮਦਦ ਫਾਇਲ ਖੋਲ੍ਹਣ ਲਈ ਅਸਮਰੱਥ"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/app-window.vala:1271
 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,239 +543,538 @@ 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 ""
+"ਇਹ ਪਰੋਗਰਾਮ ਮੁਫ਼ਤ/ਮੁਕਤ ਸਾਫਟਵੇਅਰ ਹੈ, ਤੁਸੀਂ ਇਸਨੂੰ ਫਰੀ ਸਾਫਵੇਅਰ ਫਾਊਂਡੇਸ਼ਨ ਵਲੋਂ"
+" ਪਰਕਾਸ਼ਿਤ ਕੀਤੇ\n"
+"GNU ਜਨਰਲ ਪਬਲਿਕ ਲਸੰਸ; ਵਰਜਨ 3, ਜਾਂ (ਤੁਹਾਡੀ ਪਸੰਦ ਮੁਤਾਬਿਕ) ਨਵੇਂ, ਦੀਆਂ ਸ਼ਰਤਾਂ ਅਧੀਨ\n"
+"ਰੀ-ਡਿਸਟੀਬਿਊਟ ਅਤੇ/ਜਾਂ ਸੋਧ ਸਕਦੇ ਹੋ\n"
+"\n"
+"ਇਸ ਪਰੋਗਰਾਮ ਨੂੰ ਡਿਸਟਰੀਬਿਊਟ ਕਰਨ ਦਾ ਮਕਸਦ ਹੈ ਕਿ ਇਹ ਵਰਤੋਂ ਯੋਗ ਹੋਵੇਗਾ, ਪਰ ਬਿਨਾਂ"
+" ਕਿਸੇ ਵਾਰੰਟੀ;\n "
+"ਗਾਹਕ ਦੀ ਵਾਰੰਟੀ ਤੋਂ ਵੀ ਬਿਨਾਂ ਜਾਂ ਕਿਸੇ ਖਾਸ ਉਦੇਸ਼ ਦੀ ਪੂਰਤੀ ਵਾਲੀ ਵਾਰੰਟੀ ਤੋਂ ਬਿਨਾਂ।"
+"  ਵਧੇਰੇ\n"
+"ਜਾਣਕਾਰੀ ਲਈ GNU ਜਨਰਲ ਪਬਲਿਕ ਲਸੰਸ ਵੇਖੋ।\n"
+"\n"
+"ਤੁਹਾਨੂੰ ਇਸ ਪਰੋਗਰਾਮ ਨਾਲ GNU ਜਨਰਲ ਪਬਲਿਕ ਲਸੰਸ ਦੀ ਕਾਪੀ ਵੀ ਮਿਲਣੀ ਚਾਹੀਦੀ ਹੈ।\n"
+"ਜੇ ਨਹੀਂ, ਤਾਂ <http://www.gnu.org/licenses/> ਵੇਖੋ।"
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/app-window.vala:1274
 msgid "About Simple Scan"
 msgstr "ਸੈਂਪਲ ਸਕੈਨ ਬਾਰੇ"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/app-window.vala:1277
 msgid "Simple document scanning tool"
 msgstr "ਸੈਂਪਲ ਡੌਕੂਮੈਂਟ ਸਕੈਨਿੰਗ ਟੂਲ"
 
-#: ../src/ui.vala:1487
+#: src/app-window.vala:1286
 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/app-window.vala:1308
 msgid "Save document before quitting?"
 msgstr "ਕੀ ਬੰਦ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਡੌਕੂਮੈਂਟ ਸੰਭਾਲਣਾ ਹੈ?"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:1310
 msgid "Quit without Saving"
 msgstr "ਬਿਨਾਂ ਸੰਭਾਲੇ ਬੰਦ ਕਰਨਾ ਹੈ"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/app-window.vala:1357
 msgid "You appear to have a Brother scanner."
-msgstr ""
+msgstr "ਤੁਹਾਡੇ ਕੋਲ Brother ਸਕੈਨਰ ਜਾਪਦਾ ਹੈ।"
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/app-window.vala:1359
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.brother.com\">Brother website</a>."
+"Drivers for this are available on the <a href=\"http://support.brother.com"
+"\">Brother website</a>."
 msgstr ""
+"ਇਸ ਵਾਸਤੇ ਡਰਾਇਵਰ <a href=\"http://support.brother.com"
+"\">Brother ਵੈੱਬਸਾਈਟ</a> 'ਤੇ ਮੌਜੂਦ ਹਨ।"
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/app-window.vala:1363
 msgid "You appear to have a Samsung scanner."
-msgstr ""
+msgstr "ਤੁਹਾਡੇ ਕੋਲ ਸੈਮਸੰਗ ਸਕੈਨਰ ਜਾਪਦਾ ਹੈ।"
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/app-window.vala:1365
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://samsung.com/support\">Samsung website</a>."
+"Drivers for this are available on the <a href=\"http://samsung.com/support"
+"\">Samsung website</a>."
 msgstr ""
+"ਇਸ ਵਾਸਤੇ ਡਰਾਇਵਰ <a href=\"http://samsung.com/support"
+"\">Samsung ਵੈੱਬਸਾਈਟ</a> 'ਤੇ ਮੌਜੂਦ ਹਨ।"
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/app-window.vala:1369
 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/app-window.vala:1374
 msgid "You appear to have an Epson scanner."
-msgstr ""
+msgstr "ਤੁਹਾਡੇ ਕੋਲ ਇਪਸਨ (Epson) ਸਕੈਨਰ ਜਾਪਦਾ ਹੈ।"
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/app-window.vala:1376
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.epson.com\">Epson website</a>."
+"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/app-window.vala:1380
 msgid "Install drivers"
-msgstr ""
+msgstr "ਡਰਾਇਵਰ ਇੰਸਟਾਲ ਕਰੋ"
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/app-window.vala:1411
 msgid "Once installed you will need to restart Simple Scan."
-msgstr ""
+msgstr "ਇੰਸਟਾਲ ਕਰਨ ਦੇ ਬਾਅਦ ਤੁਹਾਨੂੰ ਸੈਂਪਲ ਸਕੈਨ ਨੂੰ ਮੁੜ-ਚਾਲੂ ਕਰਨ ਦੀ ਲੋੜ ਹੋਵੇਗੀ।"
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
-msgid "Installing drivers..."
-msgstr ""
+#: src/app-window.vala:1423
+msgid "Installing drivers…"
+msgstr "…ਡਰਾਇਵਰ ਇੰਸਟਾਲ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ"
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/app-window.vala:1431
 msgid "Drivers installed successfully!"
-msgstr ""
+msgstr "ਡਰਾਇਵਰ ਕਾਮਯਾਬੀ ਨਾਲ ਇੰਸਟਾਲ ਕੀਤੇ ਗਏ!"
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/app-window.vala:1441
 #, 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/app-window.vala:1447
 msgid "Failed to install drivers."
-msgstr ""
+msgstr "ਡਰਾਇਵਰ ਇੰਸਟਾਲ ਕਰਨ ਲਈ ਅਸਫ਼ਲ ਹੈ।"
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/app-window.vala:1454
 #, c-format
-msgid "You need to install the %s package(s)."
-msgstr ""
+msgid "You need to install the %s package."
+msgid_plural "You need to install the %s packages."
+msgstr[0] "ਤੁਹਾਨੂੰ %s ਪੈਕੇਜ ਇੰਸਟਾਲ ਕਰਨ ਦੀ ਲੋੜ ਹੈ।"
+msgstr[1] "ਤੁਹਾਨੂੰ %s ਪੈਕੇਜ ਇੰਸਟਾਲ ਕਰਨ ਦੀ ਲੋੜ ਹੈ।"
+
+#. Title of preferences dialog
+#: src/app-window.vala:1568 src/app-window.vala:1591
+#: src/preferences-dialog.ui:53
+msgid "Preferences"
+msgstr "ਮੇਰੀ ਪਸੰਦ"
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
-#, c-format
-msgid "%d dpi (default)"
-msgstr "%d dpi (ਡਿਫਾਲਟ)"
+#: src/app-window.vala:1572
+msgid "Keyboard Shortcuts"
+msgstr "ਕੀ-ਬੋਰਡ ਸ਼ਾਰਟਕੱਟ"
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
-#, c-format
-msgid "%d dpi (draft)"
-msgstr "%d dpi (draft)"
+#: src/app-window.vala:1573
+msgid "Help"
+msgstr "ਮਦਦ"
 
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
-#, c-format
-msgid "%d dpi (high resolution)"
-msgstr "%d dpi (ਵੱਧ ਰੈਜ਼ੋਲੂਸ਼ਨ)"
+#: src/app-window.vala:1574
+msgid "About"
+msgstr "ਇਸ ਬਾਰੇ"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/app-window.vala:1575
+msgid "Quit"
+msgstr "ਬਾਹਰ"
+
+#: src/app-window.vala:1589
+#| msgid "_Email"
+msgid "Email"
+msgstr "ਈਮੇਲ ਕਰੋ"
+
+#. Populate ActionBar (not supported in Glade)
+#. https://bugzilla.gnome.org/show_bug.cgi?id=769966
+#. Label on new document button
+#: src/app-window.vala:1599
+msgid "Start Again…"
+msgstr "…ਮੁੜ ਸ਼ੁਰੂ ਕਰੋ"
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: src/app-window.vala:1616
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "ਸਫ਼ੇ ਨੂੰ ਖੱਬੇ ਘੁੰਮਾਉ (ਘੜੀ ਦੀ ਉਲਟ ਦਿਸ਼ਾ ਵਿੱਚ)"
+
+#. Tooltip for rotate right (clockwise) button
+#: src/app-window.vala:1623
+msgid "Rotate the page to the right (clockwise)"
+msgstr "ਸਫ਼ੇ ਨੂੰ ਸੱਜੇ ਘੁੰਮਾਉ (ਘੜੀ ਦੀ ਦਿਸ਼ਾ ਵਿੱਚ)"
+
+#. Tooltip for crop button
+#: src/app-window.vala:1633
+msgid "Crop the selected page"
+msgstr "ਚੁਣੇ ਸਫ਼ੇ ਨੂੰ ਕਰੋਪ ਕਰੋ"
+
+#. Tooltip for delete button
+#: src/app-window.vala:1649
+#| msgid "Crop the selected page"
+msgid "Delete the selected page"
+msgstr "ਚੁਣੇ ਸਫ਼ੇ ਨੂੰ ਹਟਾਓ"
+
+#. Text of button for cancelling save
+#: src/app-window.vala:1814
+msgid "Cancel"
+msgstr "ਰੱਦ ਕਰੋ"
+
+#. Button to submit authorization dialog
+#: src/authorize-dialog.ui:25
+msgid "_Authorize"
+msgstr "ਪਰਮਾਣਿਤ(_A)"
+
+#. Label beside username entry
+#: src/authorize-dialog.ui:99
+msgid "_Username for resource:"
+msgstr "ਸਰੋਤ ਲਈ ਯੂਜ਼ਰ-ਨਾਂ(_U):"
+
+#. Label beside password entry
+#: src/authorize-dialog.ui:112
+msgid "_Password:"
+msgstr "ਪਾਸਵਰਡ(_P):"
+
+#: src/book.vala:331 src/book.vala:337
 #, c-format
-msgid "%d dpi"
-msgstr "%d dpi"
+#| msgid "Unable to open help file"
+msgid "Unable to encode page %i"
+msgstr "%i ਸਫ਼ੇ ਨੂੰ ਇੰਕੋਡ ਕਰਨ ਲਈ ਅਸਮਰੱਥ"
+
+#: src/help-overlay.ui:12
+#| msgid "Scan"
+msgctxt "shortcut window"
+msgid "Scanning"
+msgstr "ਸਕੈਨ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
+
+#: src/help-overlay.ui:17
+#| msgid "Scan a single page from the scanner"
+msgctxt "shortcut window"
+msgid "Scan a single page"
+msgstr "ਇਕੱਲੇ ਸਫ਼ੇ ਨੂੰ ਸਕੈਨ ਕਰੋ"
+
+#: src/help-overlay.ui:24
+#| msgid "Scan a single page from the scanner"
+msgctxt "shortcut window"
+msgid "Scan all pages from document feeder"
+msgstr "ਡੌਕੂਮੈਂਟ ਫੀਡਰ ਤੋਂ ਸਾਰੇ ਸਫ਼ੇ ਸਕੈਨ ਕਰੋ"
+
+#: src/help-overlay.ui:31
+#| msgid "Scan a single page from the scanner"
+msgctxt "shortcut window"
+msgid "Scan continuously from a flatbed scanner"
+msgstr "ਫਲੈਟਬੈਡ ਸਕੈਨਰ ਤੋਂ ਲਗਾਤਾਰ ਸਕੈਨ ਕਰੋ"
+
+#: src/help-overlay.ui:38
+msgctxt "shortcut window"
+msgid "Stop scan in progress"
+msgstr "ਜਾਰੀ ਸਕੈਨ ਕਰਨ ਨੂੰ ਰੋਕੋ"
+
+#: src/help-overlay.ui:46
+msgctxt "shortcut window"
+msgid "Document Modification"
+msgstr "ਡੌਕੂਮੈਂਟ ਸੋਧ"
+
+#: src/help-overlay.ui:51
+msgctxt "shortcut window"
+msgid "Move page left"
+msgstr "ਸਫ਼ਾ ਖੱਬੇ ਪਾਸੇ ਭੇਜੋ"
+
+#: src/help-overlay.ui:58
+msgctxt "shortcut window"
+msgid "Move page right"
+msgstr "ਸਫ਼ਾ ਸੱਜੇ ਪਾਸੇ ਭੇਜੋ"
+
+#: src/help-overlay.ui:65
+#| msgid "Rotate the page to the left (counter-clockwise)"
+msgctxt "shortcut window"
+msgid "Rotate page to the left (anti-clockwise)"
+msgstr "ਸਫ਼ੇ ਨੂੰ ਖੱਬੇ ਘੁੰਮਾਓ (ਘੜੀ ਦੀ ਉਲਟ ਦਿਸ਼ਾ ਵਿੱਚ)"
+
+#: src/help-overlay.ui:72
+#| msgid "Rotate the page to the right (clockwise)"
+msgctxt "shortcut window"
+msgid "Rotate page to the right (clockwise)"
+msgstr "ਸਫ਼ੇ ਨੂੰ ਸੱਜੇ ਘੁੰਮਾਓ (ਘੜੀ ਦੀ ਦਿਸ਼ਾ ਵਿੱਚ)"
+
+#: src/help-overlay.ui:79
+#| msgid "Crop the selected page"
+msgctxt "shortcut window"
+msgid "Delete page"
+msgstr "ਸਫ਼ੇ ਨੂੰ ਹਟਾਓ"
+
+#: src/help-overlay.ui:87
+msgctxt "shortcut window"
+msgid "Document Management"
+msgstr "ਡੌਕੂਮੈਂਟ ਪਰਬੰਧ"
+
+#: src/help-overlay.ui:92
+#| msgid "Start a new document"
+msgctxt "shortcut window"
+msgid "Start new document"
+msgstr "ਨਵਾਂ ਡੌਕੂਮੈਂਟ ਸ਼ੁਰੂ ਕਰੋ"
 
-#: ../src/ui.vala:1835
-msgid "New Document"
-msgstr ""
+#: src/help-overlay.ui:99
+#| msgid "Scanned Document"
+msgctxt "shortcut window"
+msgid "Save scanned document"
+msgstr "ਸਕੈਨ ਕੀਤੇ ਡੌਕੂਮੈਂਟ ਨੂੰ ਸੰਭਾਲੋ"
+
+#: src/help-overlay.ui:106
+#| msgid "Scanned Document"
+msgctxt "shortcut window"
+msgid "Email scanned document"
+msgstr "ਸਕੈਨ ਕੀਤੇ ਡੌਕੂਮੈਂਟ ਨੂੰ ਈਮੇਲ ਕਰੋ"
+
+#: src/help-overlay.ui:113
+#| msgid "Scanned Document"
+msgctxt "shortcut window"
+msgid "Print scanned document"
+msgstr "ਸਕੈਨ ਕੀਤੇ ਡੌਕੂਮੈਂਟ ਨੂੰ ਪਰਿੰਟ ਕਰੋ"
+
+#: src/help-overlay.ui:120
+msgctxt "shortcut window"
+msgid "Copy current page to clipboard"
+msgstr "ਮੌਜੂਦਾ ਸਫ਼ੇ ਨੂੰ ਕਲਿੱਪਬੋਰਡ 'ਚ ਕਾਪੀ ਕਰੋ"
 
-#: ../src/ui.vala:1840
-msgid "Document"
-msgstr ""
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:113
+#| msgid "Change _Scanner"
+msgid "_Scanner"
+msgstr "ਸਕੈਨਰ(_S)"
 
-#: ../src/ui.vala:1844
-msgid "Email..."
-msgstr ""
+#. Label beside scan side combo box
+#: src/preferences-dialog.ui:143
+#| msgid "Scan Side:"
+msgid "Scan Sides"
+msgstr "ਸਲਾਈਡਾਂ ਨੂੰ ਸਕੈਨ ਕਰੋ"
 
-#: ../src/ui.vala:1845
-msgid "Print..."
-msgstr ""
+#. Label beside page size combo box
+#: src/preferences-dialog.ui:160
+#| msgid "Page Size:"
+msgid "Page Size"
+msgstr "ਸਫਾ ਆਕਾਰ"
 
-#: ../src/ui.vala:1853
-msgid "Help"
-msgstr ""
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:191
+msgid "Front"
+msgstr "ਅੱਗੇ"
 
-#: ../src/ui.vala:1854
-msgid "About"
-msgstr ""
+#. Preferences Dialog: Toggle button to select scanning on the back side of a page
+#: src/preferences-dialog.ui:206
+msgid "Back"
+msgstr "ਪਿੱਛੇ"
 
-#: ../src/ui.vala:1855
-msgid "Quit"
-msgstr ""
+#. Preferences Dialog: Toggle button to select scanning on both sides of a page
+#: src/preferences-dialog.ui:221
+msgid "Both"
+msgstr "ਦੋਵੇਂ"
+
+#. Label beside page delay scale
+#: src/preferences-dialog.ui:260
+msgid "Delay"
+msgstr "ਦੇਰੀ"
+
+#. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
+#: src/preferences-dialog.ui:276
+msgid "Multiple pages from flatbed"
+msgstr "ਫਲੈਟਬੈਡ ਤੋਂ ਕਈ ਸਫ਼ੇ"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:295
+msgid "3"
+msgstr "3"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:310
+msgid "5"
+msgstr "5"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:326
+msgid "7"
+msgstr "7"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:342
+msgid "10"
+msgstr "10"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:358
+msgid "15"
+msgstr "15"
+
+#. Label after page delay radio buttons
+#: src/preferences-dialog.ui:385
+msgid "Seconds"
+msgstr "ਸਕਿੰਟ"
+
+#. Preferences Dialog: Tab label for scanning settings
+#: src/preferences-dialog.ui:413
+#| msgid "Scan"
+msgid "Scanning"
+msgstr "ਸਕੈਨ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
-msgid "Change _Scanner"
-msgstr "ਸਕੈਨਰ ਬਦਲੋ(_S)"
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:436
+#| msgid "_Text Resolution:"
+msgid "_Text Resolution"
+msgstr "ਟੈਕਸਟ ਰੈਜ਼ੋਲੂਸ਼ਨ(_T)"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
-msgid "_Install Drivers"
-msgstr ""
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:452
+#| msgid "_Photo Resolution:"
+msgid "_Photo Resolution"
+msgstr "ਫੋਟੋ ਰੈਜ਼ੋਲੂਸ਼ਨ(_P)"
+
+#. Label beside brightness scale
+#: src/preferences-dialog.ui:505
+msgid "Brightness"
+msgstr "ਚਮਕ"
+
+#. Label beside contrast scale
+#: src/preferences-dialog.ui:521
+msgid "Contrast"
+msgstr "ਕਨਟਰਾਸਟ"
+
+#. Preferences Dialog: Tab for quality settings
+#: src/preferences-dialog.ui:576
+msgid "Quality"
+msgstr "ਕੁਆਲਟੀ"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/preferences-dialog.vala:77
 msgid "Automatic"
 msgstr "ਆਟੋਮੈਟਿਕ"
 
-#: ../src/ui.vala:1947
+#: src/preferences-dialog.vala:116
 msgid "Darker"
-msgstr ""
+msgstr "ਗੂੜ੍ਹਾ"
 
-#: ../src/ui.vala:1949
+#: src/preferences-dialog.vala:118
 msgid "Lighter"
-msgstr ""
+msgstr "ਫਿੱਕਾ"
 
-#: ../src/ui.vala:1957
+#: src/preferences-dialog.vala:126
 msgid "Less"
-msgstr ""
+msgstr "ਘੱਟ"
 
-#: ../src/ui.vala:1959
+#: src/preferences-dialog.vala:128
 msgid "More"
-msgstr ""
+msgstr "ਹੋਰ"
 
-#: ../src/ui.vala:1967
-msgid "Minimum"
-msgstr ""
+#. Preferences dialog: Label for default resolution in resolution list
+#: src/preferences-dialog.vala:440
+#, c-format
+msgid "%d dpi (default)"
+msgstr "%d dpi (ਡਿਫਾਲਟ)"
 
-#: ../src/ui.vala:1969
-msgid "Maximum"
-msgstr ""
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: src/preferences-dialog.vala:443
+#, c-format
+msgid "%d dpi (draft)"
+msgstr "%d dpi (draft)"
 
-#: ../src/ui.vala:2008
-msgid "Saving document..."
-msgstr ""
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: src/preferences-dialog.vala:446
+#, c-format
+msgid "%d dpi (high resolution)"
+msgstr "%d dpi (ਵੱਧ ਰੈਜ਼ੋਲੂਸ਼ਨ)"
 
-#: ../src/ui.vala:2173
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: src/preferences-dialog.vala:449
 #, c-format
-msgid "Saving page %d out of %d"
-msgstr ""
+msgid "%d dpi"
+msgstr "%d dpi"
 
-#~ msgid "4&#xD7;6"
-#~ msgstr "4&#xD7;6"
+#. Error displayed when no scanners to scan with
+#: src/scanner.vala:844
+msgid "No scanners available.  Please connect a scanner."
+msgstr "ਕੋਈ ਵੀ ਸਕੈਨਰ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ। ਸਕੈਨਰ ਨਾਲ ਕੁਨੈਕਟ ਕਰੋ ਜੀ।"
 
-#~ msgid "Direction of scan"
-#~ msgstr "ਸਕੈਨ ਦੀ ਦਿਸ਼ਾ"
+#. Error displayed when cannot connect to scanner
+#: src/scanner.vala:874
+msgid "Unable to connect to scanner"
+msgstr "ਸਕੈਨਰ ਨਾਲ ਜੁੜਨ ਲਈ ਅਸਮਰੱਥ"
 
-#~ msgid "Device to scan from"
-#~ msgstr "ਸਕੈਨ ਕਰਨ ਲਈ ਜੰਤਰ"
+#. Error display when unable to start scan
+#: src/scanner.vala:1227
+msgid "Unable to start scan"
+msgstr "ਸਕੈਨ ਕਰਨਾ ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਅਸਮਰੱਥ"
 
-#~ msgid "Directory to save files to"
-#~ msgstr "ਫਾਇਲਾਂ ਸੰਭਾਲਣ ਲਈ ਡਾਇਰੈਕਟਰੀ"
+#. Error displayed when communication with scanner broken
+#: src/scanner.vala:1240 src/scanner.vala:1340
+msgid "Error communicating with scanner"
+msgstr "ਸਕੈਨਰ ਨਾਲ ਸੰਚਾਰ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ"
 
-#~ msgid "SANE device to acquire images from."
-#~ msgstr "ਚਿੱਤਰ ਲੈਣ ਲਈ ਸੈਨ (SANE) ਜੰਤਰ"
+#. Help string for command line --version flag
+#: src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "ਰੀਲਿਜ਼ ਵਰਜਨ ਵੇਖਾਓ"
 
-#~ msgid "Type of document being scanned"
-#~ msgstr "ਸਕੈਨ ਕੀਤੇ ਜਾਣ ਵਾਲੇ ਡੌਕੂਮੈਂਟ ਦੀ ਕਿਸਮ"
+#. Help string for command line --debug flag
+#: src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "ਡੀਬੱਗ ਕਰਨ ਸੁਨੇਹੇ ਛਾਪੋ"
 
+#: src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+msgstr "ਸੈਂਪਲ ਸਕੈਨ ਦੇ ਪੁਰਾਣੇ ਵਰਜ਼ਨ ਨਾਲ ਤਿਆਰ ਕੀਤੀਆਂ PDF  ਫਾਇਲਾਂ ਨੂੰ ਠੀਕ ਕਰੋ"
+
+#. Title of error dialog when scan failed
+#: src/simple-scan.vala:392
+msgid "Failed to scan"
+msgstr "ਸਕੈਨ ਕਰਨ ਲਈ ਫੇਲ੍ਹ"
+
+#. Attempt to inhibit the screensaver when scanning
+#: src/simple-scan.vala:407
+msgid "Scan in progress"
+msgstr "ਸਕੈਨ ਕਰਨਾ ਜਾਰੀ ਹੈ"
+
+#. Arguments and description for --help text
+#: src/simple-scan.vala:584
+#| msgid ""
+#| "Usage:\n"
+#| "  %s [DEVICE...] - Scanning utility"
+msgid "[DEVICE…] — Scanning utility"
+msgstr "[DEVICE…] — ਸਕੈਨ ਕਰਨ ਦੀ ਸਹੂਲਤ"
+
+#. Text printed out when an unknown command-line argument provided
+#: src/simple-scan.vala:595
 #, c-format
-#~ msgid ""
-#~ "Usage:\n"
-#~ "  %s [DEVICE...] - Scanning utility"
-#~ msgstr ""
-#~ "ਵਰਤੋਂ:\n"
-#~ "  %s [DEVICE...] - Scanning utility"
+msgid "Run “%s --help” to see a full list of available command line options."
+msgstr "ਪੂਰੀਆਂ ਉਪਲੱਬਧ ਕਮਾਂਡ ਲਾਈਨ ਚੋਣਾਂ ਵੇਖਣ ਵਾਸਤੇ ”%s --help” ਚਲਾਓ।"
+
+#~ msgid "Front and Back"
+#~ msgstr "ਅੱਗੇ ਅਤੇ ਪਿੱਛੇ"
 
-#~ msgid "Scanned Document"
-#~ msgstr "ਸਕੈਨ ਕੀਤੇ ਡੌਕੂਮੈਂਟ"
+#~ msgid "New"
+#~ msgstr "ਨਵਾਂ"
+
+#~ msgid "Rotate Left"
+#~ msgstr "ਖੱਬੇ ਘੁੰਮਾਓ"
+
+#~ msgid "Rotate Right"
+#~ msgstr "ਸੱਜੇ ਘੁੰਮਾਓ"
+
+#~ msgid "Crop"
+#~ msgstr "ਕਰੋਪ ਕਰੋ"
+
+#~ msgid "Scan S_ource:"
+#~ msgstr "ਸਕੈਨ ਸਰੋਤ(_o):"
+
+#~ msgid "4&#xD7;6"
+#~ msgstr "4&#xD7;6"
 
 #~ msgid "Select File _Type"
 #~ msgstr "ਫਾਇਲ ਕਿਸਮ ਚੁਣੋ(_T)"
@@ -760,20 +1082,5 @@ msgstr ""
 #~ msgid "Please check your installation"
 #~ msgstr "ਆਪਣੀ ਇੰਸਟਾਲੇਸ਼ਨ ਚੈੱਕ ਕਰੋ ਜੀ"
 
-#~ msgid "Page side to scan"
-#~ msgstr "ਸਕੈਨ ਕਰਨ ਲਈ ਸਫ਼ੇ ਦਾ ਪਾਸਾ"
-
-#~ msgid "Resolution for text scans"
-#~ msgstr "ਟੈਕਸਟ ਸਕੈਨ ਲਈ ਰੈਜ਼ੋਲੂਸ਼ਨ"
-
-#~ msgid "Resolution for photo scans"
-#~ msgstr "ਫੋਟੋ ਸਕੈਨ ਲਈ ਰੈਜੋਲੂਸ਼ਨ"
-
 #~ msgid "Resolution of last scanned image"
 #~ msgstr "ਆਖਰੀ ਸਕੈਨ ਕੀਤੇ ਚਿੱਤਰ ਦਾ ਰੈਜ਼ੋਲੂਸ਼ਨ"
-
-#~ msgid ""
-#~ "The directory to save files to. Defaults to the documents directory if unset."
-#~ msgstr ""
-#~ "ਫਾਇਲਾਂ ਸੰਭਾਲਣ ਲਈ ਡਾਇਰੈਕਟਰੀ ਹੈ। ਜੇ ਸੈੱਟ ਨਾ ਕੀਤਾ ਤਾਂ ਡਿਫਾਲਟ ਡੌਕੂਮੈਂਟ ਡਾਇਰੈਕਟਰੀ "
-#~ "ਹੈ।"
diff --git a/po/pl.gmo b/po/pl.gmo
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..97dca48 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,517 +1,528 @@
-# Polish translation for simple-scan
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# Polish translation for simple-scan.
+# Copyright © 2009-2017 the simple-scan authors.
 # This file is distributed under the same license as the simple-scan package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
+# Piotr Drąg <piotrdrag@gmail.com>, 2010-2017.
+# Aviary.pl <community-poland@mozilla.org>, 2017.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-07-29 12:47+1200\n"
-"PO-Revision-Date: 2016-07-31 16:41+0000\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
+"product=simple-scan&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-09-11 03:50+0000\n"
+"PO-Revision-Date: 2017-09-20 04:44+0200\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
-"Language-Team: Polish <pl@li.org>\n"
+"Language-Team: Polish <community-poland@mozilla.org>\n"
+"Language: pl\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"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
 
-#. Button to submit authorization dialog
-#: data/simple-scan.ui:24
-msgid "_Authorize"
-msgstr "Upow_ażnij"
+#: data/org.gnome.SimpleScan.gschema.xml:11
+msgid "Device to scan from"
+msgstr "Urządzenie skanujące"
 
-#. Label beside username entry
-#: data/simple-scan.ui:102
-msgid "_Username for resource:"
-msgstr "Nazwa _użytkownika dla zasobu:"
+#: data/org.gnome.SimpleScan.gschema.xml:12
+msgid "SANE device to acquire images from."
+msgstr "Urządzenie SANE do pobierania obrazu."
 
-#. Label beside password entry
-#: data/simple-scan.ui:117
-msgid "_Password:"
-msgstr "_Hasło:"
+#: data/org.gnome.SimpleScan.gschema.xml:20
+msgid "Type of document being scanned"
+msgstr "Typ skanowanego dokumentu"
 
-#. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
-msgid "Front and Back"
-msgstr "Przód i tył"
+#: data/org.gnome.SimpleScan.gschema.xml:21
+msgid ""
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+msgstr ""
+"Typ skanowanego dokumentu. To ustawienie decyduje o rozdzielczości "
+"skanowania, kolorach i przetwarzaniu końcowym."
 
-#. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
-msgid "Front"
-msgstr "Przód"
+#: data/org.gnome.SimpleScan.gschema.xml:25
+msgid "Width of paper in tenths of a mm"
+msgstr "Szerokość papieru w dziesiątkach milimetrów"
 
-#. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
-msgid "Back"
-msgstr "Tył"
+#: data/org.gnome.SimpleScan.gschema.xml:26
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"Szerokość papieru w dziesiątkach milimetrów (lub 0 dla automatycznego "
+"wykrywania papieru)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:30
+msgid "Height of paper in tenths of a mm"
+msgstr "Wysokość papieru w dziesiątkach milimetrów"
+
+#: data/org.gnome.SimpleScan.gschema.xml:31
+msgid ""
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"Wysokość papieru w dziesiątkach milimetrów (lub 0 dla automatycznego "
+"wykrywania papieru)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:35
+msgid "Brightness of scan"
+msgstr "Jasność skanowania"
+
+#: data/org.gnome.SimpleScan.gschema.xml:36
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr "Dostosowanie jasności, od -100 do 100 (0 oznacza brak)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:40
+msgid "Contrast of scan"
+msgstr "Kontrast skanowania"
+
+#: data/org.gnome.SimpleScan.gschema.xml:41
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr "Dostosowanie kontrastu, od -100 do 100 (0 oznacza brak)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:45
+msgid "Resolution for text scans"
+msgstr "Rozdzielczość skanowanego tekstu"
+
+#: data/org.gnome.SimpleScan.gschema.xml:46
+msgid "The resolution in dots-per-inch to use when scanning text."
+msgstr ""
+"Rozdzielczość używana podczas skanowania tekstu w punktach na cal (DPI)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:50
+msgid "Resolution for photo scans"
+msgstr "Rozdzielczość skanowanych zdjęć"
+
+#: data/org.gnome.SimpleScan.gschema.xml:51
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr ""
+"Rozdzielczość używana podczas skanowania zdjęć w punktach na cal (DPI)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:55
+msgid "Page side to scan"
+msgstr "Strona kartki do skanowania"
+
+#: data/org.gnome.SimpleScan.gschema.xml:56
+msgid "The page side to scan."
+msgstr "Strona kartki do skanowania."
+
+#: data/org.gnome.SimpleScan.gschema.xml:60
+msgid "Directory to save files to"
+msgstr "Katalog do zapisania plików"
+
+#: data/org.gnome.SimpleScan.gschema.xml:61
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+"Katalog do zapisywania plików. Jeśli nie ustawiono, używa domyślnego "
+"katalogu Dokumenty."
+
+#: data/org.gnome.SimpleScan.gschema.xml:66
+msgid "Quality value to use for JPEG compression"
+msgstr "Wartość jakości używana do kompresji JPEG"
+
+#: data/org.gnome.SimpleScan.gschema.xml:67
+msgid "Quality value to use for JPEG compression."
+msgstr "Wartość jakości używana do kompresji JPEG."
+
+#: data/org.gnome.SimpleScan.gschema.xml:72
+msgid "Delay in millisecond between pages"
+msgstr "Opóźnienie między stronami w milisekundach"
+
+#: data/org.gnome.SimpleScan.gschema.xml:73
+msgid "Delay in millisecond between pages."
+msgstr "Opóźnienie między stronami w milisekundach."
 
 #. 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
+#. Set HeaderBar title here because Glade doesn't keep it translated
+#. https://bugzilla.gnome.org/show_bug.cgi?id=782753
+#. Title of scan window
+#: data/simple-scan.appdata.xml.in:6 data/simple-scan.desktop.in:3
+#: src/app-window.ui:76 src/app-window.vala:1560
 msgid "Simple Scan"
 msgstr "Proste skanowanie"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
-msgid "_Document"
-msgstr "_Dokument"
+#: data/simple-scan.appdata.xml.in:7 data/simple-scan.desktop.in:5
+msgid "Scan Documents"
+msgstr "Skanowanie dokumentów"
 
-#. Scan menu item
-#: data/simple-scan.ui:260
-msgid "Sc_an"
-msgstr "Sk_anowanie"
+#: 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 "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+"Bardzo prosty sposób na skanowanie dokumentów i zdjęć. Umożliwia kadrowanie "
+"i obracanie zdjęć, drukowanie, eksportowanie do formatu PDF oraz zapisywanie "
+"w wielu formatach."
 
+#: data/simple-scan.appdata.xml.in:14
+msgid "Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+"Program Proste skanowanie używa mechanizmu SANE do obsługi większości "
+"istniejących skanerów."
+
+#: data/simple-scan.desktop.in:4
+msgid "Document Scanner"
+msgstr "Skaner dokumentów"
+
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: data/simple-scan.desktop.in:7
+msgid "scan;scanner;flatbed;adf;"
+msgstr "skan;skanowanie;skaner;scan;scanner;flatbed;adf;"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: data/simple-scan.desktop.in:10
+msgid "scanner"
+msgstr "scanner"
+
+#. Toolbar scan menu item to scan a single page from the scanner
 #. 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/app-window.ui:22 src/app-window.ui:123 src/app-window.ui:820
 msgid "Single _Page"
 msgstr "_Pojedyncza strona"
 
+#. Toolbar scan menu item to scan all pages from a document feeder
 #. 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/app-window.ui:31 src/app-window.ui:133 src/app-window.ui:829
 msgid "All Pages From _Feeder"
-msgstr "_Wszystkie strony z podajnika"
+msgstr "_Wszystkie strony z podajnika"
 
-#. Menu entry to stop current scan
-#: data/simple-scan.ui:294
-msgid "_Stop Scan"
-msgstr "Zatrzymaj _skanowanie"
+#. Toolbar scan menu item to scan continuously from the flatbed
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/app-window.ui:40 src/app-window.ui:143 src/app-window.ui:838
+msgid "_Multiple Pages From Flatbed"
+msgstr "Wiele _stron ze skanera płaskiego"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:853
 msgid "Text"
 msgstr "Tekst"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:863
 msgid "Photo"
 msgstr "Zdjęcie"
 
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: src/app-window.ui:91
+msgid "_Document"
+msgstr "_Dokument"
+
+#. Scan menu item
+#: src/app-window.ui:110
+msgid "Sc_an"
+msgstr "Sk_anowanie"
+
+#. Menu entry to stop current scan
+#: src/app-window.ui:154
+msgid "_Stop Scan"
+msgstr "_Zatrzymaj skanowanie"
+
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/app-window.ui:196 src/app-window.vala:967 src/app-window.vala:1590
 msgid "Reorder Pages"
 msgstr "Zmień kolejność stron"
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/app-window.ui:215
 msgid "_Email"
 msgstr "_E-mail"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/app-window.ui:280
 msgid "_Page"
 msgstr "_Strona"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/app-window.ui:290
 msgid "Rotate _Left"
-msgstr "Obróć w _lewo"
+msgstr "Obróć w _lewo"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/app-window.ui:300
 msgid "Rotate _Right"
-msgstr "Obróć w p_rawo"
+msgstr "Obróć w p_rawo"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/app-window.ui:310
 msgid "_Crop"
 msgstr "_Kadruj"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/app-window.ui:320
 msgid "_None"
 msgstr "_Brak"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/app-window.ui:331
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/app-window.ui:342
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/app-window.ui:353
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/app-window.ui:364
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/app-window.ui:375
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/app-window.ui:386
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/app-window.ui:397
 msgid "_Custom"
 msgstr "_Niestandardowy"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/app-window.ui:415
 msgid "_Rotate Crop"
 msgstr "Ob_róć obszar kadrowania"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/app-window.ui:428
 msgid "Move Left"
-msgstr "Przesuń w lewo"
+msgstr "Przesuń w lewo"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/app-window.ui:437
 msgid "Move Right"
-msgstr "Przesuń w prawo"
+msgstr "Przesuń w prawo"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/app-window.ui:474
 msgid "_Help"
 msgstr "Pomo_c"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/app-window.ui:482
 msgid "_Contents"
 msgstr "_Spis treści"
 
-#. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
-msgid "Start a new document"
-msgstr "Tworzy nowy dokument"
-
-#: data/simple-scan.ui:675
-msgid "New"
-msgstr "Nowy"
-
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/app-window.ui:520 src/app-window.ui:720
 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/app-window.ui:522 src/app-window.ui:716
 msgid "Scan"
 msgstr "Skanuj"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/app-window.ui:538 src/app-window.ui:787
 msgid "Save document to a file"
 msgstr "Zapisuje dokument do pliku"
 
-#: ../src/ui.vala:1842
+#: src/app-window.ui:540
 msgid "Save"
 msgstr "Zapisz"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/app-window.ui:555 src/app-window.ui:700
 msgid "Stop the current scan"
 msgstr "Zatrzymuje bieżące skanowanie"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/app-window.ui:556 src/app-window.ui:697
 msgid "Stop"
 msgstr "Zatrzymaj"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "Obraca stronę w lewo (przeciwnie do ruchu wskazówek zegara)"
-
-#. Label on rotate page left (anti-clockwise) item
-#: data/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
-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
-msgid "Rotate Right"
-msgstr "Obróć w prawo"
-
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
-msgid "Crop the selected page"
-msgstr "Kadruje zaznaczoną stronę"
-
-#: data/simple-scan.ui:781
-msgid "Crop"
-msgstr "Kadruj"
-
-#: ../src/ui.vala:1849
-msgid "Preferences"
-msgstr "Preferencje"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1048
-msgid "Scan S_ource:"
-msgstr "Źródło skan_owania:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1079
-msgid "_Text Resolution:"
-msgstr "_Rozdzielczość tekstu:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1095
-msgid "_Photo Resolution:"
-msgstr "Rozdzielczość z_djęcia:"
-
-#. Label beside scan side combo box
-#: data/simple-scan.ui:1139
-msgid "Scan Side:"
-msgstr "Skanowanie stron:"
-
-#. Label beside page size combo box
-#: data/simple-scan.ui:1169
-msgid "Page Size:"
-msgstr "Rozmiar strony:"
-
-#. Label beside brightness scale
-#: data/simple-scan.ui:1199
-msgid "Brightness:"
-msgstr "Jasność:"
-
-#. Label beside contrast scale
-#: data/simple-scan.ui:1229
-msgid "Contrast:"
-msgstr "Kontrast:"
+#. Label shown when searching for scanners
+#: src/app-window.ui:611
+msgid "Searching for Scanners…"
+msgstr "Wyszukiwanie skanerów…"
 
-#. Label beside quality scale
-#: data/simple-scan.ui:1260
-msgid "Quality:"
-msgstr "Jakość:"
-
-#: data/simple-scan.desktop.in:4
-msgid "Document Scanner"
-msgstr "Skaner dokumentów"
-
-#: data/simple-scan.desktop.in:5
-msgid "Scan Documents"
-msgstr "Skanowanie dokumentów"
+#: src/app-window.vala:237 src/app-window.vala:1380
+msgid "_Close"
+msgstr "Za_mknij"
 
-#: data/simple-scan.desktop.in:6
-msgid "scan;scanner;flatbed;adf;"
-msgstr "skan;skanowanie;skaner;scan;scanner;flatbed;adf;"
+#. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
+#: src/app-window.vala:246
+#, c-format
+msgid "Username and password required to access “%s”"
+msgstr "Uzyskanie dostępu do „%s” wymaga podania nazwy użytkownika i hasła"
 
-#: data/simple-scan.desktop.in:8
-msgid "scanner"
-msgstr "scanner"
+#. Label shown when detected a scanner
+#: src/app-window.vala:266 src/app-window.vala:584
+msgid "Ready to Scan"
+msgstr "Można rozpocząć skanowanie"
 
-#: data/simple-scan.appdata.xml.in:8
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-"Bardzo prosty sposób na skanowanie dokumentów i zdjęć. Umożliwia kadrowanie "
-"i obracanie zdjęć, drukowanie, eksportowanie do formatu PDF oraz zapisywanie "
-"w wielu formatach."
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: src/app-window.vala:273
+msgid "Additional software needed"
+msgstr "Wymagane jest dodatkowe oprogramowanie"
 
-#: data/simple-scan.appdata.xml.in:13
+#. Instructions to install driver software
+#: src/app-window.vala:275
 msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
+"You need to <a href=\"install-firmware\">install driver software</a> for "
+"your scanner."
 msgstr ""
-"Program Simple Scan używa mechanizmu SANE do obsługi większości istniejących "
-"skanerów."
-
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
-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
-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
-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
-msgid "Error communicating with scanner"
-msgstr "Błąd podczas komunikacji ze skanerem"
-
-#. Help string for command line --version flag
-#: ../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
-msgid "Print debugging messages"
-msgstr "Wyświetla komunikaty diagnozowania błędów"
-
-#: ../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
-msgid "Failed to scan"
-msgstr "Skanowanie się nie powiodło"
-
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
-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
-#, 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
-msgid "_Close"
-msgstr "Za_mknij"
-
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../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"
+"Należy <a href=\"install-firmware\">zainstalować sterownik</a> skanera."
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/app-window.vala:281
 msgid "No scanners detected"
 msgstr "Nie wykryto żadnego skanera"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/app-window.vala:283
 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
-msgid "Additional software needed"
-msgstr "Wymagane dodatkowe oprogramowanie"
-
-#. Instructions to install driver software
-#: ../src/ui.vala:384
-msgid "You need to install driver software for your scanner."
-msgstr "Należy zainstalować sterownik skanera."
+msgstr "Proszę sprawdzić, czy skaner jest podłączony i włączony"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
-msgid "Save As..."
-msgstr "Zapisz jako…"
+#: src/app-window.vala:298
+msgid "Save As…"
+msgstr "Zapis jako…"
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/app-window.vala:301 src/app-window.vala:471 src/app-window.vala:552
 msgid "_Cancel"
 msgstr "_Anuluj"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/app-window.vala:302 src/app-window.vala:553
 msgid "_Save"
 msgstr "_Zapisz"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/app-window.vala:310
 msgid "Scanned Document.pdf"
 msgstr "Zeskanowany dokument.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#. Save dialog: Filter name to show only supported image files
+#: src/app-window.vala:316
 msgid "Image Files"
 msgstr "Pliki obrazów"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/app-window.vala:326
 msgid "All Files"
 msgstr "Wszystkie pliki"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/app-window.vala:335
 msgid "PDF (multi-page document)"
 msgstr "PDF (dokument wielostronicowy)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/app-window.vala:341
 msgid "JPEG (compressed)"
 msgstr "JPEG (skompresowany)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/app-window.vala:347
 msgid "PNG (lossless)"
 msgstr "PNG (bezstratny)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#. Save dialog: Label for sabing in WEBP format
+#: src/app-window.vala:354
+msgid "WebP (compressed)"
+msgstr "WebP (skompresowany)"
+
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
+#: src/app-window.vala:364
 msgid "File format:"
 msgstr "Format pliku:"
 
+#. Label in save dialog beside compression slider
+#: src/app-window.vala:376
+msgid "Compression:"
+msgstr "Kompresja:"
+
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/app-window.vala:470
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr "Plik o nazwie „%s” już istnieje. Zastąpić go?"
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/app-window.vala:473
+msgid "_Replace"
+msgstr "_Zastąp"
+
+#: src/app-window.vala:512
+msgid "Saving"
+msgstr "Zapisywanie"
+
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/app-window.vala:527
 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
-msgid "If you don't save, changes will be permanently lost."
+#: src/app-window.vala:550
+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/app-window.vala:591
 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/app-window.vala:593
 msgid "Discard Changes"
 msgstr "Odrzuć zmiany"
 
+#. Label shown when scan started
+#: src/app-window.vala:692
+msgid "Contacting scanner…"
+msgstr "Łączenie ze skanerem…"
+
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/app-window.vala:800
 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/app-window.vala:812
 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/app-window.vala:990
 msgid "Combine sides"
 msgstr "Połącz strony"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/app-window.vala:1000
 msgid "Combine sides (reverse)"
 msgstr "Połącz strony (odwrotnie)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/app-window.vala:1010
 msgid "Reverse"
 msgstr "Odwrotnie"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/app-window.vala:1020
 msgid "Keep unchanged"
 msgstr "Bez zmiany"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/app-window.vala:1250
 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/app-window.vala:1271
 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,32 +540,34 @@ msgstr ""
 "Niniejszy program jest wolnym oprogramowaniem; można go rozprowadzać dalej\n"
 "i/lub modyfikować na warunkach Powszechnej Licencji Publicznej GNU, wydanej\n"
 "przez Fundację Wolnego Oprogramowania (Free Software Foundation) — według\n"
-"wersji trzeciej tej Licencji lub którejś z późniejszych wersji.\n"
+"wersji trzeciej tej Licencji lub którejś z późniejszych wersji.\n"
 "\n"
-"Niniejszy program rozpowszechniany jest z nadzieją, iż będzie on użyteczny "
-"—\n"
-"jednak BEZ JAKIEJKOLWIEK GWARANCJI, nawet domyślnej gwarancji\n"
-"PRZYDATNOŚCI HANDLOWEJ albo PRZYDATNOŚCI DO OKREŚLONYCH\n"
-"ZASTOSOWAŃ. W celu uzyskania bliższych informacji należy zapoznać się z\n"
-"Powszechną Licencją Publiczną GNU.\n"
+"Niniejszy program rozpowszechniany jest z nadzieją, iż będzie on użyteczny\n"
+"— jednak BEZ JAKIEJKOLWIEK GWARANCJI, nawet domyślnej gwarancji\n"
+"PRZYDATNOŚCI HANDLOWEJ albo PRZYDATNOŚCI DO OKREŚLONYCH ZASTOSOWAŃ.\n"
+"W celu uzyskania bliższych informacji należy zapoznać się\n"
+"z Powszechną Licencją Publiczną GNU.\n"
 "\n"
-"Z pewnością wraz z niniejszym programem dostarczono także egzemplarz\n"
+"Z pewnością wraz z niniejszym programem dostarczono także egzemplarz\n"
 "Powszechnej Licencji Publicznej GNU (GNU General Public License); jeśli nie\n"
 "— proszę odwiedzić stronę internetową <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/app-window.vala:1274
 msgid "About Simple Scan"
-msgstr "O programie"
+msgstr "O programie"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/app-window.vala:1277
 msgid "Simple document scanning tool"
 msgstr "Proste narzędzie do skanowania dokumentów"
 
-#: ../src/ui.vala:1487
+#: src/app-window.vala:1286
 msgid "translator-credits"
 msgstr ""
+"Piotr Drąg <piotrdrag@gmail.com>, 2010-2017\n"
+"Aviary.pl <community-poland@mozilla.org>, 2017\n"
+"\n"
 "Launchpad Contributions:\n"
 "  Arkadiusz Błasiak https://launchpad.net/~ares1112\n"
 "  GTriderXC https://launchpad.net/~gtriderxc\n"
@@ -571,404 +584,462 @@ msgstr ""
 "  Wiatrak https://launchpad.net/~wiatrak."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/app-window.vala:1308
 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
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:1310
 msgid "Quit without Saving"
 msgstr "Zakończ bez zapisywania"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/app-window.vala:1357
 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/app-window.vala:1359
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.brother.com\">Brother website</a>."
+"Drivers for this are available on the <a href=\"http://support.brother.com"
+"\">Brother website</a>."
 msgstr ""
-"Sterowniki dla tego urządzenia są dostępne na <a "
-"href=\"http://support.brother.com\">stronie firmy Brother</a>."
+"Sterowniki dla tego urządzenia są dostępne na <a href=\"http://support."
+"brother.com\">stronie firmy Brother</a>."
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/app-window.vala:1363
 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/app-window.vala:1365
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://samsung.com/support\">Samsung website</a>."
+"Drivers for this are available on the <a href=\"http://samsung.com/support"
+"\">Samsung website</a>."
 msgstr ""
-"Sterowniki dla tego urządzenia są dostępne na <a "
-"href=\"http://samsung.com/support\">stronie firmy Samsung</a>."
+"Sterowniki dla tego urządzenia są dostępne na <a href=\"http://samsung.com/"
+"support\">stronie firmy Samsung</a>."
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/app-window.vala:1369
 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/app-window.vala:1374
 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/app-window.vala:1376
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.epson.com\">Epson website</a>."
+"Drivers for this are available on the <a href=\"http://support.epson.com"
+"\">Epson website</a>."
 msgstr ""
 "Sterowniki są dostępne na <a href=\"http://support.epson.com\">stronie firmy "
 "Epson</a>."
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/app-window.vala:1380
 msgid "Install drivers"
-msgstr "Instalowanie sterowników"
+msgstr "Instalacja sterowników"
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/app-window.vala:1411
 msgid "Once installed you will need to restart Simple Scan."
-msgstr "Po ukończeniu instalowania należy uruchomić program ponownie."
+msgstr "Po ukończeniu instalacji należy uruchomić program ponownie."
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
-msgid "Installing drivers..."
+#: src/app-window.vala:1423
+msgid "Installing drivers…"
 msgstr "Instalowanie sterowników…"
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/app-window.vala:1431
 msgid "Drivers installed successfully!"
 msgstr "Zainstalowano sterowniki."
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/app-window.vala:1441
 #, 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/app-window.vala:1447
 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/app-window.vala:1454
 #, c-format
-msgid "You need to install the %s package(s)."
-msgstr "Należy zainstalować pakiety %s."
+msgid "You need to install the %s package."
+msgid_plural "You need to install the %s packages."
+msgstr[0] "Należy zainstalować pakiet %s."
+msgstr[1] "Należy zainstalować pakiety %s."
+msgstr[2] "Należy zainstalować pakiety %s."
+
+#. Title of preferences dialog
+#: src/app-window.vala:1568 src/app-window.vala:1591
+#: src/preferences-dialog.ui:53
+msgid "Preferences"
+msgstr "Preferencje"
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
-#, c-format
-msgid "%d dpi (default)"
-msgstr "%d DPI (domyślnie)"
+#: src/app-window.vala:1572
+msgid "Keyboard Shortcuts"
+msgstr "Skróty klawiszowe"
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
-#, c-format
-msgid "%d dpi (draft)"
-msgstr "%d DPI (szkic)"
+#: src/app-window.vala:1573
+msgid "Help"
+msgstr "Pomoc"
 
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
-#, c-format
-msgid "%d dpi (high resolution)"
-msgstr "%d DPI (wysoka rozdzielczość)"
+#: src/app-window.vala:1574
+msgid "About"
+msgstr "O programie"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/app-window.vala:1575
+msgid "Quit"
+msgstr "Zakończ"
+
+#: src/app-window.vala:1589
+msgid "Email"
+msgstr "E-mail"
+
+#. Populate ActionBar (not supported in Glade)
+#. https://bugzilla.gnome.org/show_bug.cgi?id=769966
+#. Label on new document button
+#: src/app-window.vala:1599
+msgid "Start Again…"
+msgstr "Nowy dokument…"
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: src/app-window.vala:1616
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Obraca stronę w lewo (przeciwnie do ruchu wskazówek zegara)"
+
+#. Tooltip for rotate right (clockwise) button
+#: src/app-window.vala:1623
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Obraca stronę w prawo (zgodnie z ruchem wskazówek zegara)"
+
+#. Tooltip for crop button
+#: src/app-window.vala:1633
+msgid "Crop the selected page"
+msgstr "Kadruje zaznaczoną stronę"
+
+#. Tooltip for delete button
+#: src/app-window.vala:1649
+msgid "Delete the selected page"
+msgstr "Usuwa zaznaczoną stronę"
+
+#. Text of button for cancelling save
+#: src/app-window.vala:1814
+msgid "Cancel"
+msgstr "Anuluj"
+
+#. Button to submit authorization dialog
+#: src/authorize-dialog.ui:25
+msgid "_Authorize"
+msgstr "Upow_ażnij"
+
+#. Label beside username entry
+#: src/authorize-dialog.ui:99
+msgid "_Username for resource:"
+msgstr "Nazwa _użytkownika dla zasobu:"
+
+#. Label beside password entry
+#: src/authorize-dialog.ui:112
+msgid "_Password:"
+msgstr "_Hasło:"
+
+#: src/book.vala:331 src/book.vala:337
 #, c-format
-msgid "%d dpi"
-msgstr "%d DPI"
+msgid "Unable to encode page %i"
+msgstr "Nie można zakodować %i. strony"
+
+#: src/help-overlay.ui:12
+msgctxt "shortcut window"
+msgid "Scanning"
+msgstr "Skanowanie"
+
+#: src/help-overlay.ui:17
+msgctxt "shortcut window"
+msgid "Scan a single page"
+msgstr "Zeskanowanie pojedynczej strony"
+
+#: src/help-overlay.ui:24
+msgctxt "shortcut window"
+msgid "Scan all pages from document feeder"
+msgstr "Zeskanowanie wszystkich stron z podajnika dokumentów"
+
+#: src/help-overlay.ui:31
+msgctxt "shortcut window"
+msgid "Scan continuously from a flatbed scanner"
+msgstr "Ciągłe skanowanie z płaskiego skanera"
+
+#: src/help-overlay.ui:38
+msgctxt "shortcut window"
+msgid "Stop scan in progress"
+msgstr "Zatrzymanie trwającego skanowania"
+
+#: src/help-overlay.ui:46
+msgctxt "shortcut window"
+msgid "Document Modification"
+msgstr "Modyfikowanie dokumentów"
+
+#: src/help-overlay.ui:51
+msgctxt "shortcut window"
+msgid "Move page left"
+msgstr "Przesunięcie strony w lewo"
+
+#: src/help-overlay.ui:58
+msgctxt "shortcut window"
+msgid "Move page right"
+msgstr "Przesunięcie strony w prawo"
+
+#: src/help-overlay.ui:65
+msgctxt "shortcut window"
+msgid "Rotate page to the left (anti-clockwise)"
+msgstr "Obrót strony w lewo (przeciwnie do ruchu wskazówek zegara)"
+
+#: src/help-overlay.ui:72
+msgctxt "shortcut window"
+msgid "Rotate page to the right (clockwise)"
+msgstr "Obrót strony w prawo (zgodnie z ruchem wskazówek zegara)"
+
+#: src/help-overlay.ui:79
+msgctxt "shortcut window"
+msgid "Delete page"
+msgstr "Usunięcie strony"
+
+#: src/help-overlay.ui:87
+msgctxt "shortcut window"
+msgid "Document Management"
+msgstr "Zarządzanie dokumentami"
+
+#: src/help-overlay.ui:92
+msgctxt "shortcut window"
+msgid "Start new document"
+msgstr "Utworzenie nowego dokumentu"
+
+#: src/help-overlay.ui:99
+msgctxt "shortcut window"
+msgid "Save scanned document"
+msgstr "Zapisanie zeskanowanego dokumentu"
+
+#: src/help-overlay.ui:106
+msgctxt "shortcut window"
+msgid "Email scanned document"
+msgstr "Wysłanie zeskanowanego dokumentu pocztą"
+
+#: src/help-overlay.ui:113
+msgctxt "shortcut window"
+msgid "Print scanned document"
+msgstr "Wydrukowanie zeskanowanego dokumentu"
+
+#: src/help-overlay.ui:120
+msgctxt "shortcut window"
+msgid "Copy current page to clipboard"
+msgstr "Skopiowanie bieżącej strony do schowka"
 
-#: ../src/ui.vala:1835
-msgid "New Document"
-msgstr "Nowy dokument"
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:113
+msgid "_Scanner"
+msgstr "_Skaner"
 
-#: ../src/ui.vala:1840
-msgid "Document"
-msgstr "Dokument"
+#. Label beside scan side combo box
+#: src/preferences-dialog.ui:143
+msgid "Scan Sides"
+msgstr "Skanowanie stron"
 
-#: ../src/ui.vala:1844
-msgid "Email..."
-msgstr "E-mail…"
+#. Label beside page size combo box
+#: src/preferences-dialog.ui:160
+msgid "Page Size"
+msgstr "Rozmiar strony"
 
-#: ../src/ui.vala:1845
-msgid "Print..."
-msgstr "Wydrukuj…"
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:191
+msgid "Front"
+msgstr "Przód"
 
-#: ../src/ui.vala:1853
-msgid "Help"
-msgstr "Pomoc"
+#. Preferences Dialog: Toggle button to select scanning on the back side of a page
+#: src/preferences-dialog.ui:206
+msgid "Back"
+msgstr "Tył"
 
-#: ../src/ui.vala:1854
-msgid "About"
-msgstr "O programie"
+#. Preferences Dialog: Toggle button to select scanning on both sides of a page
+#: src/preferences-dialog.ui:221
+msgid "Both"
+msgstr "Obie"
+
+#. Label beside page delay scale
+#: src/preferences-dialog.ui:260
+msgid "Delay"
+msgstr "Opóźnienie"
+
+#. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
+#: src/preferences-dialog.ui:276
+msgid "Multiple pages from flatbed"
+msgstr "Wiele stron ze skanera płaskiego"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:295
+msgid "3"
+msgstr "3"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:310
+msgid "5"
+msgstr "5"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:326
+msgid "7"
+msgstr "7"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:342
+msgid "10"
+msgstr "10"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:358
+msgid "15"
+msgstr "15"
+
+#. Label after page delay radio buttons
+#: src/preferences-dialog.ui:385
+msgid "Seconds"
+msgstr "s"
+
+#. Preferences Dialog: Tab label for scanning settings
+#: src/preferences-dialog.ui:413
+msgid "Scanning"
+msgstr "Skanowanie"
 
-#: ../src/ui.vala:1855
-msgid "Quit"
-msgstr "Zakończ"
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:436
+msgid "_Text Resolution"
+msgstr "_Rozdzielczość tekstu"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:452
+msgid "_Photo Resolution"
+msgstr "Rozdzielczość z_djęcia"
+
+#. Label beside brightness scale
+#: src/preferences-dialog.ui:505
+msgid "Brightness"
+msgstr "Jasność"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
-msgid "Change _Scanner"
-msgstr "Zmień _skaner"
+#. Label beside contrast scale
+#: src/preferences-dialog.ui:521
+msgid "Contrast"
+msgstr "Kontrast"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
-msgid "_Install Drivers"
-msgstr "_Zainstaluj sterowniki"
+#. Preferences Dialog: Tab for quality settings
+#: src/preferences-dialog.ui:576
+msgid "Quality"
+msgstr "Jakość"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/preferences-dialog.vala:77
 msgid "Automatic"
 msgstr "Automatycznie"
 
-#: ../src/ui.vala:1947
+#: src/preferences-dialog.vala:116
 msgid "Darker"
 msgstr "Ciemniej"
 
-#: ../src/ui.vala:1949
+#: src/preferences-dialog.vala:118
 msgid "Lighter"
 msgstr "Jaśniej"
 
-#: ../src/ui.vala:1957
+#: src/preferences-dialog.vala:126
 msgid "Less"
 msgstr "Mniejszy"
 
-#: ../src/ui.vala:1959
+#: src/preferences-dialog.vala:128
 msgid "More"
 msgstr "Większy"
 
-#: ../src/ui.vala:1967
-msgid "Minimum"
-msgstr "Minimalnie"
+#. Preferences dialog: Label for default resolution in resolution list
+#: src/preferences-dialog.vala:440
+#, c-format
+msgid "%d dpi (default)"
+msgstr "%d DPI (domyślnie)"
 
-#: ../src/ui.vala:1969
-msgid "Maximum"
-msgstr "Maksymalnie"
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: src/preferences-dialog.vala:443
+#, c-format
+msgid "%d dpi (draft)"
+msgstr "%d DPI (szkic)"
 
-#: ../src/ui.vala:2008
-msgid "Saving document..."
-msgstr "Zapisywanie dokumentu…"
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: src/preferences-dialog.vala:446
+#, c-format
+msgid "%d dpi (high resolution)"
+msgstr "%d DPI (wysoka rozdzielczość)"
 
-#: ../src/ui.vala:2173
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: src/preferences-dialog.vala:449
 #, c-format
-msgid "Saving page %d out of %d"
-msgstr "Zapisywanie strony %d z %d"
+msgid "%d dpi"
+msgstr "%d DPI"
 
-#~ msgid "4&#xD7;6"
-#~ msgstr "4x6\""
+#. Error displayed when no scanners to scan with
+#: src/scanner.vala:844
+msgid "No scanners available.  Please connect a scanner."
+msgstr "Brak dostępnych skanerów. Proszę podłączyć skaner."
 
-#~ msgid "Files missing"
-#~ msgstr "Nie można odnaleźć plików"
+#. Error displayed when cannot connect to scanner
+#: src/scanner.vala:874
+msgid "Unable to connect to scanner"
+msgstr "Nie można połączyć ze skanerem"
 
-#, c-format
-#~ msgid ""
-#~ "Usage:\n"
-#~ "  %s [DEVICE...] - Scanning utility"
-#~ msgstr ""
-#~ "Użycie:\n"
-#~ "  %s [URZĄDZENIE...] - Narzędzie do skanowania"
-
-#~ msgid "Height of scanned image in pixels"
-#~ msgstr "Wysokość zeskanowanego obrazu w pikselach"
-
-#~ msgid "Direction of scan"
-#~ msgstr "Kierunek skanowania"
-
-#~ msgid "Device to scan from"
-#~ msgstr "Urządzenie skanujące"
-
-#~ msgid "Resolution for text scans"
-#~ msgstr "Rozdzielczość skanowanego tekstu"
-
-#~ msgid "Resolution for photo scans"
-#~ msgstr "Rozdzielczość skanowanych zdjęć"
-
-#~ msgid "Resolution of last scanned image"
-#~ msgstr "Rozdzielczość ostatnio zeskanowanego obrazu"
-
-#~ msgid "Directory to save files to"
-#~ msgstr "Katalog do zapisania plików"
-
-#~ msgid "SANE device to acquire images from."
-#~ msgstr "Urządzenie SANE do pobierania obrazu."
-
-#~ msgid ""
-#~ "The direction of the scanner across the scanned page. It can be one of the "
-#~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
-#~ msgstr ""
-#~ "Kierunek skanowania na skanowanej stronie. Może być jednym z następujących: "
-#~ "\"top-to-bottom\" (od góry do dołu), \"bottom-to-top\" (od dołu do góry), "
-#~ "\"left-to-right\" (od lewej do prawej), \"right-to-left\" (od prawej do "
-#~ "lewej)"
-
-#~ msgid "Type of document being scanned"
-#~ msgstr "Typ skanowanego dokumentu"
-
-#~ msgid ""
-#~ "Type of document being scanned. 'text' for text documents, 'photo' for "
-#~ "photos. This setting decides on the scan resolution, colors and post-"
-#~ "processing."
-#~ msgstr ""
-#~ "Typ skanowanego dokumentu. Wartość \"text\" (tekst) dla dokumentów "
-#~ "tekstowych, \"photo\" (zdjęcie) dla zdjęć. To ustawienie decyduje o "
-#~ "rozdzielczości skanowania, kolorach i możliwości późniejszej obróbki."
-
-#~ msgid ""
-#~ "The width of scanned image in pixels. This value is updated to what the last "
-#~ "scanned page was."
-#~ msgstr ""
-#~ "Szerokość zeskanowanego obrazu w pikselach. Ta wartość jest aktualizowana do "
-#~ "tej, jaka wynosiła podczas ostatniego skanowania."
-
-#~ msgid ""
-#~ "The height of scanned image in pixels. This value is updated to what the "
-#~ "last scanned page was."
-#~ msgstr ""
-#~ "Wysokość zeskanowanego obrazu w pikselach. Ta wartość jest aktualizowana do "
-#~ "tej, jaka wynosiła podczas ostatniego skanowania."
-
-#~ msgid "TRUE if the application window is maximized"
-#~ msgstr "Wartość \"True\", jeśli okno programu jest zmaksymalizowane"
-
-#~ msgid "The resolution in dots-per-inch of the previously scanned image."
-#~ msgstr "Rozdzielczość ostatnio skanowanego obrazu w punktach na cal (dpi)."
-
-#~ msgid ""
-#~ "The directory to save files to. Defaults to the documents directory if unset."
-#~ msgstr ""
-#~ "Katalog do zapisywania plików. Jeśli nie ustawiono, używa domyślnego "
-#~ "katalogu Dokumenty."
-
-#~ msgid "Window height in pixels"
-#~ msgstr "Wysokość okna w pikselach"
-
-#~ msgid "Window width in pixels"
-#~ msgstr "Szerokość okna w pikselach"
-
-#~ msgid "Scanned Document"
-#~ msgstr "Zeskanowany dokument"
-
-#~ msgid "Width of scanned image in pixels"
-#~ msgstr "Szerokość zeskanowanego obrazu w pikselach"
+#. Error display when unable to start scan
+#: src/scanner.vala:1227
+msgid "Unable to start scan"
+msgstr "Nie można rozpocząć skanowania"
 
-#, c-format
-#~ msgid ""
-#~ "Help Options:\n"
-#~ "  -d, --debug                     Print debugging messages\n"
-#~ "  -v, --version                   Show release version\n"
-#~ "  -h, --help                      Show help options\n"
-#~ "  --help-all                      Show all help options\n"
-#~ "  --help-gtk                      Show GTK+ options"
-#~ msgstr ""
-#~ "Opcje pomocy:\n"
-#~ "  -d, --debug                     Wyświetla komunikaty drukowania\n"
-#~ "  -v, --version                   Wyświetla wersję programu\n"
-#~ "  -h, --help                      Wyświetla opcje pomocy\n"
-#~ "  --help-all                      Wyświetla wszystkie opcje pomocy\n"
-#~ "  --help-gtk                      Wyświetla opcje GTK+"
-
-#~ msgid "Select File _Type"
-#~ msgstr "Proszę wybrać _typ pliku"
-
-#~ msgid "Please check your installation"
-#~ msgstr "Proszę sprawdzić poprawność instalacji"
-
-#~ msgid ""
-#~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
-#~ msgstr ""
-#~ "Strona do skanowania. Może wynosić jedną z wartości: \"both\" (obie), "
-#~ "\"front\" (przód), \"back\" (tył)"
-
-#~ msgid "Page side to scan"
-#~ msgstr "Strona do skanowania"
-
-#~ msgid ""
-#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
-#~ msgstr ""
-#~ "Wysokość papieru w dziesiątkach milimetrów (lub 0 dla automatycznego "
-#~ "wykrywania papieru)."
-
-#~ msgid "Height of paper in tenths of a mm"
-#~ msgstr "Wysokość papieru w dziesiątkach milimetrów"
-
-#~ msgid ""
-#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
-#~ msgstr ""
-#~ "Szerokość papieru w dziesiątkach milimetrów (lub 0 dla automatycznego "
-#~ "wykrywania papieru)."
-
-#~ msgid "Width of paper in tenths of a mm"
-#~ msgstr "Szerokość papieru w dziesiątkach milimetrów"
+#. Error displayed when communication with scanner broken
+#: src/scanner.vala:1240 src/scanner.vala:1340
+msgid "Error communicating with scanner"
+msgstr "Błąd podczas komunikacji ze skanerem"
 
+#. Help string for command line --version flag
+#: src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "Wyświetla informację o wersji"
+
+#. Help string for command line --debug flag
+#: src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Wyświetla komunikaty diagnozowania błędów"
+
+#: src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+msgstr "Naprawia pliki PDF utworzone za pomocą starszych wersji programu"
+
+#. Title of error dialog when scan failed
+#: src/simple-scan.vala:392
+msgid "Failed to scan"
+msgstr "Skanowanie się nie powiodło"
+
+#. Attempt to inhibit the screensaver when scanning
+#: src/simple-scan.vala:407
+msgid "Scan in progress"
+msgstr "Trwa skanowanie"
+
+#. Arguments and description for --help text
+#: src/simple-scan.vala:584
+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:595
 #, c-format
-#~ msgid ""
-#~ "GTK+ Options:\n"
-#~ "  --class=CLASS                   Program class as used by the window "
-#~ "manager\n"
-#~ "  --name=NAME                     Program name as used by the window "
-#~ "manager\n"
-#~ "  --screen=SCREEN                 X screen to use\n"
-#~ "  --sync                          Make X calls synchronous\n"
-#~ "  --gtk-module=MODULES            Load additional GTK+ modules\n"
-#~ "  --g-fatal-warnings              Make all warnings fatal"
-#~ msgstr ""
-#~ "Opcje GTK+:\n"
-#~ "  --class=KLASA                   Klasa programu używana przez menedżera "
-#~ "okien\n"
-#~ "  --name=NAZWA                    Nazwa programu używana przez menedżera "
-#~ "okien\n"
-#~ "  --screen=EKRAN                  Używany ekran X\n"
-#~ "  --sync                          Synchroniczne wywołania X\n"
-#~ "  --gtk-module=MODUŁY             Wczytuje dodatkowe moduły biblioteki GTK+\n"
-#~ "  --g-fatal-warnings              Wszystkie ostrzeżenia są krytyczne"
-
-#~ msgid ""
-#~ "Type of document being scanned. This setting decides on the scan resolution, "
-#~ "colors and post-processing."
-#~ msgstr ""
-#~ "Typ skanowanego dokumentu. To ustawienie decyduje o rozdzielczości "
-#~ "skanowania, kolorach i przetwarzaniu końcowym."
-
-#~ msgid "The page side to scan."
-#~ msgstr "Strona kartki do skanowania."
-
-#~ msgid "The direction of the scanner across the scanned page."
-#~ msgstr "Kierunek skanowania strony."
-
-#~ msgid "Quality value to use for JPEG compression."
-#~ msgstr "Wartość jakości używana do kompresji JPEG."
-
-#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
-#~ msgstr "Dostosowanie kontrastu, od -100 do 100 (0 oznacza brak)."
-
-#~ msgid "Contrast of scan"
-#~ msgstr "Kontrast skanowania"
-
-#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
-#~ msgstr "Dostosowanie jasności, od -100 do 100 (0 oznacza brak)."
-
-#~ msgid "Brightness of scan"
-#~ msgstr "Jasność skanowania"
-
-#~ msgid "Quality value to use for JPEG compression"
-#~ msgstr "Wartość jakości używana do kompresji JPEG"
-
-#~ msgid "The resolution in dots-per-inch to use when scanning text."
-#~ msgstr ""
-#~ "Rozdzielczość do użycia podczas skanowania tekstu w punktach na cal (DPI)."
-
-#~ msgid "The resolution in dots-per-inch to use when scanning photos."
-#~ msgstr ""
-#~ "Rozdzielczość do użycia podczas skanowania zdjęć w punktach na cal (DPI)."
+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ń."
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..9f09628 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,296 +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"
+"POT-Creation-Date: 2017-04-16 08:54-0400\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"
+"Language: pt\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-25 06:10+0000\n"
+"X-Generator: Launchpad (build 18361)\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:231 src/simple-scan.ui:815 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:247
 msgid "_Document"
 msgstr "_Documento"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/simple-scan.ui:266
 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:279 src/simple-scan.ui:1343 src/simple-scan.ui:1402
 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:289 src/simple-scan.ui:1352 src/simple-scan.ui:1411
 msgid "All Pages From _Feeder"
 msgstr "Todas as páginas a partir do _alimentador"
 
+#. 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 "_Parar digitalização"
 
-#: 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 "Texto"
 
-#: 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 "Foto"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/simple-scan.ui:352 src/ui.vala:1247 src/ui.vala:1891
 msgid "Reorder Pages"
 msgstr "Reordenar páginas"
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/simple-scan.ui:371
 msgid "_Email"
 msgstr "_Email"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:436
 msgid "_Page"
 msgstr "_Página"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:446
 msgid "Rotate _Left"
 msgstr "Rodar à _esquerda"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:456
 msgid "Rotate _Right"
 msgstr "Rodar à _direita"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:466
 msgid "_Crop"
 msgstr "_Cortar"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:476
 msgid "_None"
 msgstr "_Nenhum"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:487
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:498
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:509
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:520
 msgid "_Letter"
 msgstr "_Carta"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:531
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:542
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:553
 msgid "_Custom"
 msgstr "_Personalizar"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:571
 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:584
 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:593
 msgid "Move Right"
 msgstr "Mover para a direita"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:630
 msgid "_Help"
 msgstr "_Ajuda"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:638
 msgid "_Contents"
 msgstr "_Conteúdos"
 
 #. 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 "Iniciar um novo documento"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:681
 msgid "New"
 msgstr "Novo"
 
 #. 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 "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:697 src/simple-scan.ui:843
 msgid "Scan"
 msgstr "Digitalizar"
 
 #. 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 "Guardar documento num ficheiro"
 
-#: ../src/ui.vala:1842
+#: src/simple-scan.ui:715 src/ui.vala:1892
 msgid "Save"
 msgstr "Guardar"
 
 #. 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 "Parar digitalização atual"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:731 src/simple-scan.ui:831
 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:755 src/simple-scan.ui:942
 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:756
 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:770 src/simple-scan.ui:920
 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:771
 msgid "Rotate Right"
 msgstr "Rodar à direita"
 
-#: 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 "Cortar a página selecionada"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:787
 msgid "Crop"
 msgstr "Recortar"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:1003 src/ui.vala:1898
 msgid "Preferences"
 msgstr "Preferências"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1054
 msgid "Scan S_ource:"
 msgstr "Origem da digitalizaçã_o:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1085
 msgid "_Text Resolution:"
 msgstr "Resolução do _texto:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1101
 msgid "_Photo Resolution:"
 msgstr "_Resolução da foto:"
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1145
 msgid "Scan Side:"
 msgstr "Lado da digitalização"
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1175
 msgid "Page Size:"
 msgstr "Tamanho da página:"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1205
 msgid "Brightness:"
 msgstr "Brilho:"
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1235
 msgid "Contrast:"
 msgstr "Contraste:"
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1266
 msgid "Quality:"
 msgstr "Qualidade:"
 
+#. 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 "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 +322,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 +333,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 +341,205 @@ msgstr ""
 "atuais."
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:844
 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:874
 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:1227
 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:1240 src/scanner.vala:1340
 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:332 src/ui.vala:1655 src/ui.vala:1935
 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:341
 #, 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:389
 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:391
 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:396
 msgid "Additional software needed"
 msgstr "Software adicional necessário"
 
 #. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:398
 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:510
 msgid "Save As..."
 msgstr "Guardar como..."
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:513 src/ui.vala:648 src/ui.vala:723
 msgid "_Cancel"
 msgstr "Cancelar"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:514 src/ui.vala:724
 msgid "_Save"
 msgstr "Guardar"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:522
 msgid "Scanned Document.pdf"
 msgstr "Documento digitalizado.pdf"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:528
 msgid "Image Files"
 msgstr "Ficheiros de imagem"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:534
 msgid "All Files"
 msgstr "Todos os ficheiros"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:543
 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:549
 msgid "JPEG (compressed)"
 msgstr "JPEG (comprimido)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:555
 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:564
 msgid "File format:"
 msgstr "Formato do ficheiro:"
 
+#. 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:650
+#: src/ui.vala:698
 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:721
 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:763
 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:765
 msgid "Discard Changes"
 msgstr "Descartar alterações"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:1056
 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:1068
 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:1270
 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:1280
 msgid "Combine sides (reverse)"
 msgstr "Combinar lados (inverso)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1290
 msgid "Reverse"
 msgstr "Inverter"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1300
 msgid "Keep unchanged"
 msgstr "Manter inalterado"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1504
 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: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"
@@ -544,16 +569,16 @@ msgstr ""
 "este programa. Caso contrário, veja <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1528
 msgid "About Simple Scan"
 msgstr "Acerca do Digitalizações (Simple Scan)"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1531
 msgid "Simple document scanning tool"
 msgstr "Ferramenta simples para digitalizar documentos"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1540
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -587,22 +612,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:1562
 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:1564
 msgid "Quit without Saving"
 msgstr "Sair sem guardar"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1632
 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:1634
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
@@ -611,12 +636,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:1638
 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:1640
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
@@ -625,17 +650,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:1644
 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:1649
 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:1651
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
@@ -644,139 +669,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:1655
 msgid "Install drivers"
 msgstr "Instalar drivers"
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1686
 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:1698
 msgid "Installing drivers..."
 msgstr "A instalar drivers..."
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1706
 msgid "Drivers installed successfully!"
 msgstr "Controladores instalados com sucesso!"
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1716
 #, 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:1722
 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:1729
 #, 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:1833
 #, 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:1836
 #, 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:1839
 #, 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:1842
 #, c-format
 msgid "%d dpi"
 msgstr "%d ppp"
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1885
 msgid "New Document"
 msgstr "Novo documento"
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1890
 msgid "Document"
 msgstr "Documento"
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1893
 msgid "Email..."
 msgstr "Email..."
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1894
 msgid "Print..."
 msgstr "Imprimir..."
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1902
 msgid "Help"
 msgstr "Ajuda"
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1903
 msgid "About"
 msgstr "Sobre"
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1904
 msgid "Quit"
 msgstr "Sair"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1937
 msgid "Change _Scanner"
 msgstr "Alterar _digitalizador"
 
 #. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1939
 msgid "_Install Drivers"
 msgstr "_Instalar drivers"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1945
 msgid "Automatic"
 msgstr "Automático"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1995
 msgid "Darker"
 msgstr "Escurecer"
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1997
 msgid "Lighter"
 msgstr "Clarear"
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:2005
 msgid "Less"
 msgstr "Menos"
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:2007
 msgid "More"
 msgstr "Mais"
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:2015
 msgid "Minimum"
 msgstr "Mínimo"
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:2017
 msgid "Maximum"
 msgstr "Máximo"
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2068
 msgid "Saving document..."
 msgstr "A guardar o documento..."
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2242
 #, 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..2849fbe 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -1,515 +1,536 @@
 # Brazilian Portuguese translation for simple-scan
 # Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# Copyright (c) 2009-2017 THE simple-scan'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the simple-scan package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
-#
+# Enrico Nicoletto <liverig@gmail.com>, 2017.
+# Fábio Nogueira <fnogueira@gnome.org>, 2017.
+# Isaac F. Ferreira Filho <isaacmob@riseup.net>, 2017.
+# Rafael Fontenelle <rafaelff@gnome.org>, 2017.
 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-04-16 12:21+0000\n"
-"Last-Translator: Neliton Pereira Jr. <nelitonpjr@gmail.com>\n"
-"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
+"product=simple-scan&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-08-29 23:25+0000\n"
+"PO-Revision-Date: 2017-08-29 21:44-0300\n"
+"Last-Translator: Isaac F. Ferreira Filho <isaacmob@riseup.net>\n"
+"Language-Team: Brazilian Portuguese <gnome-pt_br-list@gnome.org>\n"
+"Language: pt_BR\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-Generator: Poedit 2.0.3\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#. Button to submit authorization dialog
-#: data/simple-scan.ui:24
-msgid "_Authorize"
-msgstr "_Autorizar"
+#: data/org.gnome.SimpleScan.gschema.xml:11
+msgid "Device to scan from"
+msgstr "Dispositivo com o qual deve-se digitalizar"
 
-#. Label beside username entry
-#: data/simple-scan.ui:102
-msgid "_Username for resource:"
-msgstr "Nome de _usuário para o recurso:"
+#: data/org.gnome.SimpleScan.gschema.xml:12
+msgid "SANE device to acquire images from."
+msgstr "Dispositivo SANE a partir do qual deve-se adquirir imagens."
 
-#. Label beside password entry
-#: data/simple-scan.ui:117
-msgid "_Password:"
-msgstr "_Senha:"
+#: data/org.gnome.SimpleScan.gschema.xml:20
+msgid "Type of document being scanned"
+msgstr "Tipo do documento a ser digitalizado"
 
-#. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
-msgid "Front and Back"
-msgstr "Frente e verso"
+#: data/org.gnome.SimpleScan.gschema.xml:21
+msgid ""
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+msgstr ""
+"Tipo de documento a ser digitalizado. Esta configuração define a resolução "
+"da digitalização, cores e pós-processamento."
 
-#. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
-msgid "Front"
-msgstr "Frente"
+#: data/org.gnome.SimpleScan.gschema.xml:25
+msgid "Width of paper in tenths of a mm"
+msgstr "Largura do papel em décimos de milímetro"
 
-#. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
-msgid "Back"
-msgstr "Verso"
+#: data/org.gnome.SimpleScan.gschema.xml:26
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"A largura do papel em décimos de mm (ou 0 para detecção automática de papel)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:30
+msgid "Height of paper in tenths of a mm"
+msgstr "Altura do papel em décimos de milímetro"
+
+#: data/org.gnome.SimpleScan.gschema.xml:31
+msgid ""
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"A altura do papel em décimos de milímetro (ou 0 para detecção automática de "
+"papel)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:35
+msgid "Brightness of scan"
+msgstr "Brilho da digitalização"
+
+#: data/org.gnome.SimpleScan.gschema.xml:36
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr "O ajuste do brilho de -100 a 100 (0 sendo nenhum)."
 
+#: data/org.gnome.SimpleScan.gschema.xml:40
+msgid "Contrast of scan"
+msgstr "Contraste da digitalização"
+
+#: data/org.gnome.SimpleScan.gschema.xml:41
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr "O ajuste do contraste de -100 a 100 (0 sendo nenhum)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:45
+msgid "Resolution for text scans"
+msgstr "Resolução para digitalização de textos"
+
+#: data/org.gnome.SimpleScan.gschema.xml:46
+msgid "The resolution in dots-per-inch to use when scanning text."
+msgstr ""
+"A resolução em pontos por polegada (dpi) a ser usada na digitalização e textos."
+
+#: data/org.gnome.SimpleScan.gschema.xml:50
+msgid "Resolution for photo scans"
+msgstr "Resolução para digitalização de fotos"
+
+#: data/org.gnome.SimpleScan.gschema.xml:51
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr ""
+"A resolução em pontos por polegadas (dpi) a ser usada na digitalização de fotos."
+
+#: data/org.gnome.SimpleScan.gschema.xml:55
+msgid "Page side to scan"
+msgstr "Lado da página a ser digitalizado"
+
+#: data/org.gnome.SimpleScan.gschema.xml:56
+msgid "The page side to scan."
+msgstr "O lado da página a ser digitalizado."
+
+#: data/org.gnome.SimpleScan.gschema.xml:60
+msgid "Directory to save files to"
+msgstr "Diretório para salvar arquivos"
+
+#: data/org.gnome.SimpleScan.gschema.xml:61
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+"O diretório no qual salvar os arquivos. Se não configurado, o diretório "
+"Documentos é usado como padrão."
+
+#: data/org.gnome.SimpleScan.gschema.xml:66
+msgid "Quality value to use for JPEG compression"
+msgstr "Qualidade para usar na compressão JPEG"
+
+#: data/org.gnome.SimpleScan.gschema.xml:67
+msgid "Quality value to use for JPEG compression."
+msgstr "Qualidade para usar na compressão JPEG."
+
+#: data/org.gnome.SimpleScan.gschema.xml:72
+msgid "Delay in millisecond between pages"
+msgstr "Atraso em milissegundos entre as páginas"
+
+#: data/org.gnome.SimpleScan.gschema.xml:73
+msgid "Delay in millisecond between pages."
+msgstr "Atraso em milissegundos entre as páginas."
+
+#. Title of scan window
+#. Set HeaderBar title here because Glade doesn't keep it translated
+#. https://bugzilla.gnome.org/show_bug.cgi?id=782753
 #. 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
+#: data/simple-scan.appdata.xml.in:6 data/simple-scan.desktop.in:3
+#: src/app-window.ui:76 src/app-window.vala:1560
 msgid "Simple Scan"
-msgstr "Digitalizador simples"
+msgstr "Digitalização simples"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
-msgid "_Document"
-msgstr "_Documento"
+#: data/simple-scan.appdata.xml.in:7 data/simple-scan.desktop.in:5
+msgid "Scan Documents"
+msgstr "Digitalização de documentos"
 
-#. Scan menu item
-#: data/simple-scan.ui:260
-msgid "Sc_an"
-msgstr "Digit_alizar"
+#: 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 "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+"Uma forma realmente fácil de digitalizar tanto documentos como fotos. Você "
+"pode recortar as partes ruins de uma foto e fazer rotação, caso esteja do "
+"lado errado. Você pode imprimir as suas digitalizações, exportá-las em pdf "
+"ou salvá-las em uma variedade de formatos de imagem."
+
+#: data/simple-scan.appdata.xml.in:14
+msgid "Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+"O Digitalização simples usa o framework SANE para prover suporte à maioria "
+"dos scanners existentes."
 
+#: data/simple-scan.desktop.in:4
+msgid "Document Scanner"
+msgstr "Scanner de documentos"
+
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: data/simple-scan.desktop.in:7
+msgid "scan;scanner;flatbed;adf;"
+msgstr ""
+"digitalizar;digitalizador;digitalização;vidro;alimentador;scan;scanner;scanner de mesa;scanner "
+"plano;flatbed;adf;"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: data/simple-scan.desktop.in:10
+msgid "scanner"
+msgstr "scanner"
+
+#. Toolbar scan menu item to scan a single page from the scanner
 #. 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/app-window.ui:22 src/app-window.ui:123 src/app-window.ui:820
 msgid "Single _Page"
 msgstr "_Página única"
 
+# Opção de alimentador manual, no qual é possível digitalizar várias páginas de uma só vez
+#. Toolbar scan menu item to scan all pages from a document feeder
 #. 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/app-window.ui:31 src/app-window.ui:133 src/app-window.ui:829
 msgid "All Pages From _Feeder"
-msgstr "Todas as páginas do ali_mentador"
+msgstr "Todas as páginas a partir do ali_mentador"
 
-#. Menu entry to stop current scan
-#: data/simple-scan.ui:294
-msgid "_Stop Scan"
-msgstr "Par_ar digitalização"
+# Opção de scanner manual, no vidro, no qual é possível inserir apenas uma página por vez
+#. Toolbar scan menu item to scan continuously from the flatbed
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/app-window.ui:40 src/app-window.ui:143 src/app-window.ui:838
+msgid "_Multiple Pages From Flatbed"
+msgstr "_Múltiplas páginas a partir do vidro do scanner"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:853
 msgid "Text"
 msgstr "Texto"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:863
 msgid "Photo"
 msgstr "Foto"
 
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: src/app-window.ui:91
+msgid "_Document"
+msgstr "_Documento"
+
+#. Scan menu item
+#: src/app-window.ui:110
+msgid "Sc_an"
+msgstr "Digit_alizar"
+
+#. Menu entry to stop current scan
+#: src/app-window.ui:154
+msgid "_Stop Scan"
+msgstr "Par_ar digitalização"
+
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/app-window.ui:196 src/app-window.vala:967 src/app-window.vala:1590
 msgid "Reorder Pages"
 msgstr "Reordenar páginas"
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/app-window.ui:215
 msgid "_Email"
 msgstr "_E-mail"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/app-window.ui:280
 msgid "_Page"
 msgstr "_Página"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/app-window.ui:290
 msgid "Rotate _Left"
 msgstr "Girar à _esquerda"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/app-window.ui:300
 msgid "Rotate _Right"
 msgstr "Girar à di_reita"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/app-window.ui:310
 msgid "_Crop"
 msgstr "Re_cortar"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/app-window.ui:320
 msgid "_None"
 msgstr "_Nenhum"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/app-window.ui:331
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/app-window.ui:342
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/app-window.ui:353
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/app-window.ui:364
 msgid "_Letter"
 msgstr "_Carta"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/app-window.ui:375
 msgid "Le_gal"
 msgstr "_Ofício"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/app-window.ui:386
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/app-window.ui:397
 msgid "_Custom"
 msgstr "_Personalizar"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/app-window.ui:415
 msgid "_Rotate Crop"
 msgstr "Gira_r área recortada"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/app-window.ui:428
 msgid "Move Left"
 msgstr "Mover para a esquerda"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/app-window.ui:437
 msgid "Move Right"
 msgstr "Mover para a direita"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/app-window.ui:474
 msgid "_Help"
 msgstr "A_juda"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/app-window.ui:482
 msgid "_Contents"
 msgstr "_Conteúdo"
 
-#. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
-msgid "Start a new document"
-msgstr "Iniciar um novo documento"
-
-#: data/simple-scan.ui:675
-msgid "New"
-msgstr "Novo"
-
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/app-window.ui:520 src/app-window.ui:720
 msgid "Scan a single page from the scanner"
-msgstr "Digitalizar uma página no digitalizador"
+msgstr "Digitaliza uma única página no scanner"
 
 #. Label on scan toolbar item
-#: data/simple-scan.ui:691 data/simple-scan.ui:837
+#: src/app-window.ui:522 src/app-window.ui:716
 msgid "Scan"
 msgstr "Digitalizar"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/app-window.ui:538 src/app-window.ui:787
 msgid "Save document to a file"
-msgstr "Salvar documento em arquivo"
+msgstr "Salva o documento em um arquivo"
 
-#: ../src/ui.vala:1842
+#: src/app-window.ui:540
 msgid "Save"
 msgstr "Salvar"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/app-window.ui:555 src/app-window.ui:700
 msgid "Stop the current scan"
-msgstr "Parar a digitalização atual"
+msgstr "Interrompe a digitalização atual"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/app-window.ui:556 src/app-window.ui:697
 msgid "Stop"
 msgstr "Parar"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "Girar a página à esquerda (sentido anti-horário)"
-
-#. Label on rotate page left (anti-clockwise) item
-#: data/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
-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
-msgid "Rotate Right"
-msgstr "Girar à direita"
-
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
-msgid "Crop the selected page"
-msgstr "Recortar a página selecionada"
-
-#: data/simple-scan.ui:781
-msgid "Crop"
-msgstr "Recortar"
-
-#: ../src/ui.vala:1849
-msgid "Preferences"
-msgstr "Preferências"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1048
-msgid "Scan S_ource:"
-msgstr "Origem da digitalizaçã_o:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1079
-msgid "_Text Resolution:"
-msgstr "Resolução do _texto:"
+#. Label shown when searching for scanners
+#: src/app-window.ui:611
+msgid "Searching for Scanners…"
+msgstr "Procurando por scanners…"
 
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1095
-msgid "_Photo Resolution:"
-msgstr "Resolução da _foto:"
-
-#. Label beside scan side combo box
-#: data/simple-scan.ui:1139
-msgid "Scan Side:"
-msgstr "Lado a digitalizar:"
-
-#. Label beside page size combo box
-#: data/simple-scan.ui:1169
-msgid "Page Size:"
-msgstr "Tamanho da página:"
-
-#. Label beside brightness scale
-#: data/simple-scan.ui:1199
-msgid "Brightness:"
-msgstr "Brilho:"
-
-#. Label beside contrast scale
-#: data/simple-scan.ui:1229
-msgid "Contrast:"
-msgstr "Contraste:"
-
-#. Label beside quality scale
-#: data/simple-scan.ui:1260
-msgid "Quality:"
-msgstr "Qualidade:"
-
-#: data/simple-scan.desktop.in:4
-msgid "Document Scanner"
-msgstr ""
-
-#: data/simple-scan.desktop.in:5
-msgid "Scan Documents"
-msgstr "Digitalizar documentos"
+#: src/app-window.vala:237 src/app-window.vala:1380
+msgid "_Close"
+msgstr "Fe_char"
 
-#: data/simple-scan.desktop.in:6
-msgid "scan;scanner;flatbed;adf;"
-msgstr ""
+#. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
+#: src/app-window.vala:246
+#, c-format
+msgid "Username and password required to access “%s”"
+msgstr "É necessário o nome de usuário e senha para acessar “%s”"
 
-#: data/simple-scan.desktop.in:8
-msgid "scanner"
-msgstr ""
+#. Label shown when detected a scanner
+#: src/app-window.vala:266 src/app-window.vala:584
+msgid "Ready to Scan"
+msgstr "Pronto para digitalizar"
 
-#: data/simple-scan.appdata.xml.in:8
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: src/app-window.vala:273
+msgid "Additional software needed"
+msgstr "Necessário software adicional"
 
-#: data/simple-scan.appdata.xml.in:13
+#. Instructions to install driver software
+#: src/app-window.vala:275
 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
-msgid "No scanners available.  Please connect a scanner."
+"You need to <a href=\"install-firmware\">install driver software</a> for "
+"your scanner."
 msgstr ""
-"Nenhum digitalizador disponível. Por favor, conecte um digitalizador."
-
-#. Error displayed when cannot connect to scanner
-#: ../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
-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
-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
-msgid "Show release version"
-msgstr "Mostrar versão de lançamento"
-
-#. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
-msgid "Print debugging messages"
-msgstr "Imprimir mensagens de depuração"
-
-#: ../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
-msgid "Failed to scan"
-msgstr "Falha ao digitalizar"
-
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
-msgid "[DEVICE...] - Scanning utility"
-msgstr "[DISPOSITIVO...] - Utilitário de digitalização"
-
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
-#, 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
-msgid "_Close"
-msgstr "Fe_char"
-
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../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'"
+"Você precisa <a href=\"install-firmware\">instalar o software de driver</a> "
+"para o seu scanner."
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/app-window.vala:281
 msgid "No scanners detected"
-msgstr "Nenhum digitalizador detectado"
+msgstr "Nenhum scanner detectado"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/app-window.vala:283
 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
-msgid "Additional software needed"
-msgstr ""
-
-#. Instructions to install driver software
-#: ../src/ui.vala:384
-msgid "You need to install driver software for your scanner."
-msgstr ""
+msgstr "Por favor, verifique se o seu scanner está conectado e ligado"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
-msgid "Save As..."
-msgstr "Salvar como..."
+#: src/app-window.vala:298
+msgid "Save As…"
+msgstr "Salvar como…"
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/app-window.vala:301 src/app-window.vala:471 src/app-window.vala:552
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/app-window.vala:302 src/app-window.vala:553
 msgid "_Save"
 msgstr "_Salvar"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/app-window.vala:310
 msgid "Scanned Document.pdf"
 msgstr "Documento digitalizado.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#. Save dialog: Filter name to show only supported image files
+#: src/app-window.vala:316
 msgid "Image Files"
 msgstr "Arquivos de imagem"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/app-window.vala:326
 msgid "All Files"
 msgstr "Todos os arquivos"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/app-window.vala:335
 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/app-window.vala:341
 msgid "JPEG (compressed)"
 msgstr "JPEG (comprimido)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/app-window.vala:347
 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
+#. Save dialog: Label for sabing in WEBP format
+#: src/app-window.vala:354
+msgid "WebP (compressed)"
+msgstr "WebP (comprimido)"
+
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
+#: src/app-window.vala:364
 msgid "File format:"
-msgstr ""
+msgstr "Formato do arquivo:"
+
+#. Label in save dialog beside compression slider
+#: src/app-window.vala:376
+msgid "Compression:"
+msgstr "Compressão:"
+
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/app-window.vala:470
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr "Já existe um arquivo com o nome “%s”. Você deseja substituí-lo?"
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/app-window.vala:473
+msgid "_Replace"
+msgstr "Subs_tituir"
+
+#: src/app-window.vala:512
+msgid "Saving"
+msgstr "Salvando"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/app-window.vala:527
 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
-msgid "If you don't save, changes will be permanently lost."
+#: src/app-window.vala:550
+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/app-window.vala:591
 msgid "Save current document?"
-msgstr "Salvar documento atual?"
+msgstr "Salvar o documento atual?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/app-window.vala:593
 msgid "Discard Changes"
 msgstr "Descartar alterações"
 
+#. Label shown when scan started
+#: src/app-window.vala:692
+msgid "Contacting scanner…"
+msgstr "Contatando o scanner…"
+
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/app-window.vala:800
 msgid "Unable to save image for preview"
-msgstr "Não é possível salvar imagem para visualização"
+msgstr "Não foi possível salvar imagem para visualização"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/app-window.vala:812
 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/app-window.vala:990
 msgid "Combine sides"
-msgstr "Combine os lados"
+msgstr "Combinar os lados"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/app-window.vala:1000
 msgid "Combine sides (reverse)"
-msgstr "Combine os lados (reverso)"
+msgstr "Combinar os lados (reverso)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/app-window.vala:1010
 msgid "Reverse"
-msgstr "Reverso"
+msgstr "Inverter"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/app-window.vala:1020
 msgid "Keep unchanged"
 msgstr "Manter inalterado"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/app-window.vala:1250
 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/app-window.vala:1271
 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,19 +560,25 @@ msgstr ""
 "este programa. Caso contrário, acesse <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/app-window.vala:1274
 msgid "About Simple Scan"
-msgstr "Sobre o Digitalizador simples"
+msgstr "Sobre o Digitalização simples"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/app-window.vala:1277
 msgid "Simple document scanning tool"
 msgstr "Ferramenta simples para digitalizar documentos"
 
-#: ../src/ui.vala:1487
+#: src/app-window.vala:1286
 msgid "translator-credits"
 msgstr ""
-"Launchpad Contributions:\n"
+"Tradutores do GNOME:\n"
+"  Enrico Nicoletto <liverig@gmail.com>.\n"
+"  Fábio Nogueira <fnogueira@gnome.org>.\n"
+"  Isaac F. Ferreira Filho <isaacmob@riseup.net>.\n"
+"  Rafael Fontenelle <rafaelff@gnome.org>.\n"
+"\n"
+"Tradutores do Launchpad:\n"
 "  André Gondim https://launchpad.net/~andregondim\n"
 "  Beatriz Vital https://launchpad.net/~vitalb\n"
 "  Benjamim Gois https://launchpad.net/~benjamim-gois\n"
@@ -577,192 +604,517 @@ msgstr ""
 "  millemiglia https://launchpad.net/~dnieper650"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/app-window.vala:1308
 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
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:1310
 msgid "Quit without Saving"
 msgstr "Sair sem salvar"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/app-window.vala:1357
 msgid "You appear to have a Brother scanner."
-msgstr ""
+msgstr "Você parece ter um scanner da Brother."
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/app-window.vala:1359
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.brother.com\">Brother website</a>."
+"Drivers for this are available on the <a href=\"http://support.brother.com"
+"\">Brother website</a>."
 msgstr ""
+"Drivers para ele estão disponíveis no <a href=\"http://support.brother.com"
+"\">site da Brother</a>."
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/app-window.vala:1363
 msgid "You appear to have a Samsung scanner."
-msgstr ""
+msgstr "Você parece ter um scanner da Samsung."
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/app-window.vala:1365
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://samsung.com/support\">Samsung website</a>."
+"Drivers for this are available on the <a href=\"http://samsung.com/support"
+"\">Samsung website</a>."
 msgstr ""
+"Drivers para ele estão disponíveis no <a href=\"http://samsung.com/support"
+"\">site da Samsung</a>."
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/app-window.vala:1369
 msgid "You appear to have an HP scanner."
-msgstr ""
+msgstr "Você parece ter um scanner de HP."
 
 #. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/app-window.vala:1374
 msgid "You appear to have an Epson scanner."
-msgstr ""
+msgstr "Você parece ter um scanner de Epson."
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/app-window.vala:1376
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.epson.com\">Epson website</a>."
+"Drivers for this are available on the <a href=\"http://support.epson.com"
+"\">Epson website</a>."
 msgstr ""
+"Drivers para ele estão disponíveis no <a href=\"http://support.epson.com"
+"\">site da Epson</a>."
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/app-window.vala:1380
 msgid "Install drivers"
-msgstr ""
+msgstr "Instalar drivers"
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/app-window.vala:1411
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
+"Assim que for instalado, você precisará reiniciar o Digitalização simples."
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
-msgid "Installing drivers..."
-msgstr ""
+#: src/app-window.vala:1423
+msgid "Installing drivers…"
+msgstr "Instalando drivers…"
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/app-window.vala:1431
 msgid "Drivers installed successfully!"
-msgstr ""
+msgstr "Drivers instalados com sucesso!"
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/app-window.vala:1441
 #, c-format
 msgid "Failed to install drivers (error code %d)."
-msgstr ""
+msgstr "Falha ao instalar drivers (código do erro %d)."
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/app-window.vala:1447
 msgid "Failed to install drivers."
-msgstr ""
+msgstr "Falha ao instalar drivers."
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/app-window.vala:1454
 #, c-format
-msgid "You need to install the %s package(s)."
-msgstr ""
+msgid "You need to install the %s package."
+msgid_plural "You need to install the %s packages."
+msgstr[0] "Você precisa instalar o pacote %s."
+msgstr[1] "Você precisa instalar os pacotes %s."
+
+#. Title of preferences dialog
+#: src/app-window.vala:1568 src/app-window.vala:1591
+#: src/preferences-dialog.ui:53
+msgid "Preferences"
+msgstr "Preferências"
+
+#: src/app-window.vala:1572
+msgid "Keyboard Shortcuts"
+msgstr "Atalhos de teclado"
+
+#: src/app-window.vala:1573
+msgid "Help"
+msgstr "Ajuda"
+
+#: src/app-window.vala:1574
+msgid "About"
+msgstr "Sobre"
+
+#: src/app-window.vala:1575
+msgid "Quit"
+msgstr "Sair"
+
+#: src/app-window.vala:1589
+msgid "Email"
+msgstr "E-mail"
+
+#. Populate ActionBar (not supported in Glade)
+#. https://bugzilla.gnome.org/show_bug.cgi?id=769966
+#. Label on new document button
+#: src/app-window.vala:1599
+msgid "Start Again…"
+msgstr "Começar novamente…"
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: src/app-window.vala:1616
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Gira a página à esquerda (sentido anti-horário)"
+
+#. Tooltip for rotate right (clockwise) button
+#: src/app-window.vala:1623
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Gira a página à direita (sentido horário)"
+
+#. Tooltip for crop button
+#: src/app-window.vala:1633
+msgid "Crop the selected page"
+msgstr "Recorta a página selecionada"
+
+#. Tooltip for delete button
+#: src/app-window.vala:1649
+msgid "Delete the selected page"
+msgstr "Exclui a página selecionada"
+
+#. Text of button for cancelling save
+#: src/app-window.vala:1814
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. Button to submit authorization dialog
+#: src/authorize-dialog.ui:25
+msgid "_Authorize"
+msgstr "_Autorizar"
+
+#. Label beside username entry
+#: src/authorize-dialog.ui:99
+msgid "_Username for resource:"
+msgstr "Nome de _usuário para o recurso:"
+
+#. Label beside password entry
+#: src/authorize-dialog.ui:112
+msgid "_Password:"
+msgstr "_Senha:"
+
+#: src/book.vala:331 src/book.vala:337
+#, c-format
+msgid "Unable to encode page %i"
+msgstr "Não foi possível codificar a página %i"
+
+#: src/help-overlay.ui:12
+msgctxt "shortcut window"
+msgid "Scanning"
+msgstr "Digitalização"
+
+#: src/help-overlay.ui:17
+msgctxt "shortcut window"
+msgid "Scan a single page"
+msgstr "Digitaliza uma única página"
+
+#: src/help-overlay.ui:24
+msgctxt "shortcut window"
+msgid "Scan all pages from document feeder"
+msgstr "Digitaliza todas as páginas por um alimentador"
+
+#: src/help-overlay.ui:31
+msgctxt "shortcut window"
+msgid "Scan continuously from a flatbed scanner"
+msgstr "Digitaliza continuamente por vidro de scanner"
+
+#: src/help-overlay.ui:38
+msgctxt "shortcut window"
+msgid "Stop scan in progress"
+msgstr "Interrompe a digitalização em andamento"
+
+#: src/help-overlay.ui:46
+msgctxt "shortcut window"
+msgid "Document Modification"
+msgstr "Modificação de documento"
+
+#: src/help-overlay.ui:51
+msgctxt "shortcut window"
+msgid "Move page left"
+msgstr "Move a página para a esquerda"
+
+#: src/help-overlay.ui:58
+msgctxt "shortcut window"
+msgid "Move page right"
+msgstr "Move a página para a direita"
+
+#: src/help-overlay.ui:65
+msgctxt "shortcut window"
+msgid "Rotate page to the left (anti-clockwise)"
+msgstr "Gira a página à esquerda (sentido anti-horário)"
+
+#: src/help-overlay.ui:72
+msgctxt "shortcut window"
+msgid "Rotate page to the right (clockwise)"
+msgstr "Gira a página à direita (sentido horário)"
+
+#: src/help-overlay.ui:79
+msgctxt "shortcut window"
+msgid "Delete page"
+msgstr "Exclui a página"
+
+#: src/help-overlay.ui:87
+msgctxt "shortcut window"
+msgid "Document Management"
+msgstr "Gerenciamento de documento"
+
+#: src/help-overlay.ui:92
+msgctxt "shortcut window"
+msgid "Start new document"
+msgstr "Inicia um novo documento"
+
+#: src/help-overlay.ui:99
+msgctxt "shortcut window"
+msgid "Save scanned document"
+msgstr "Salva o documento digitalizado"
+
+#: src/help-overlay.ui:106
+msgctxt "shortcut window"
+msgid "Email scanned document"
+msgstr "Envia o documento digitalizado por e-mail"
+
+#: src/help-overlay.ui:113
+msgctxt "shortcut window"
+msgid "Print scanned document"
+msgstr "Imprime o documento digitalizado"
+
+#: src/help-overlay.ui:120
+msgctxt "shortcut window"
+msgid "Copy current page to clipboard"
+msgstr "Copia a página atual para a área de transferência"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:113
+msgid "_Scanner"
+msgstr "_Scanner"
+
+#. Label beside scan side combo box
+#: src/preferences-dialog.ui:143
+msgid "Scan Sides"
+msgstr "Lados a digitalizar"
+
+#. Label beside page size combo box
+#: src/preferences-dialog.ui:160
+msgid "Page Size"
+msgstr "Tamanho da página"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:191
+msgid "Front"
+msgstr "Frente"
+
+#. Preferences Dialog: Toggle button to select scanning on the back side of a page
+#: src/preferences-dialog.ui:206
+msgid "Back"
+msgstr "Verso"
+
+# Ambos lados, e não ambas páginas
+#. Preferences Dialog: Toggle button to select scanning on both sides of a page
+#: src/preferences-dialog.ui:221
+msgid "Both"
+msgstr "Ambos"
+
+#. Label beside page delay scale
+#: src/preferences-dialog.ui:260
+msgid "Delay"
+msgstr "Atraso"
+
+#. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
+#: src/preferences-dialog.ui:276
+msgid "Multiple pages from flatbed"
+msgstr "Múltiplas páginas a partir do vidro do scanner"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:295
+msgid "3"
+msgstr "3"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:310
+msgid "5"
+msgstr "5"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:326
+msgid "7"
+msgstr "7"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:342
+msgid "10"
+msgstr "10"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:358
+msgid "15"
+msgstr "15"
+
+#. Label after page delay radio buttons
+#: src/preferences-dialog.ui:385
+msgid "Seconds"
+msgstr "Segundos"
+
+#. Preferences Dialog: Tab label for scanning settings
+#: src/preferences-dialog.ui:413
+msgid "Scanning"
+msgstr "Digitalização"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:436
+msgid "_Text Resolution"
+msgstr "Resolução do _texto"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:452
+msgid "_Photo Resolution"
+msgstr "Resolução da _foto"
+
+#. Label beside brightness scale
+#: src/preferences-dialog.ui:505
+msgid "Brightness"
+msgstr "Brilho"
+
+#. Label beside contrast scale
+#: src/preferences-dialog.ui:521
+msgid "Contrast"
+msgstr "Contraste"
+
+#. Preferences Dialog: Tab for quality settings
+#: src/preferences-dialog.ui:576
+msgid "Quality"
+msgstr "Qualidade"
+
+#. Combo box value for automatic paper size
+#: src/preferences-dialog.vala:77
+msgid "Automatic"
+msgstr "Automático"
+
+#: src/preferences-dialog.vala:116
+msgid "Darker"
+msgstr "Mais escuro"
+
+#: src/preferences-dialog.vala:118
+msgid "Lighter"
+msgstr "Mais claro"
+
+#: src/preferences-dialog.vala:126
+msgid "Less"
+msgstr "Menos"
+
+#: src/preferences-dialog.vala:128
+msgid "More"
+msgstr "Mais"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/preferences-dialog.vala:440
 #, 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/preferences-dialog.vala:443
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (rascunho)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/preferences-dialog.vala:446
 #, 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/preferences-dialog.vala:449
 #, c-format
 msgid "%d dpi"
-msgstr "%d ppp"
+msgstr "%d dpi"
 
-#: ../src/ui.vala:1835
-msgid "New Document"
-msgstr "Novo documento"
+#. Error displayed when no scanners to scan with
+#: src/scanner.vala:844
+msgid "No scanners available.  Please connect a scanner."
+msgstr ""
+"Nenhum scanner disponível. Por favor, conecte um scanner."
 
-#: ../src/ui.vala:1840
-msgid "Document"
-msgstr "Documentos"
+#. Error displayed when cannot connect to scanner
+#: src/scanner.vala:874
+msgid "Unable to connect to scanner"
+msgstr "Não foi possível conectar ao scanner"
 
-#: ../src/ui.vala:1844
-msgid "Email..."
-msgstr "E-mail..."
+#. Error display when unable to start scan
+#: src/scanner.vala:1227
+msgid "Unable to start scan"
+msgstr "Não foi possível iniciar a digitalização"
 
-#: ../src/ui.vala:1845
-msgid "Print..."
-msgstr "Imprimir..."
+#. Error displayed when communication with scanner broken
+#: src/scanner.vala:1240 src/scanner.vala:1340
+msgid "Error communicating with scanner"
+msgstr "Erro na comunicação com o scanner"
 
-#: ../src/ui.vala:1853
-msgid "Help"
-msgstr "Ajuda"
+#. Help string for command line --version flag
+#: src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "Mostra a versão de lançamento"
 
-#: ../src/ui.vala:1854
-msgid "About"
-msgstr "Sobre"
+#. Help string for command line --debug flag
+#: src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Imprime mensagens de depuração"
 
-#: ../src/ui.vala:1855
-msgid "Quit"
-msgstr "Sair"
+#: src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+msgstr ""
+"Corrige arquivos PDF gerados em versões anteriores do Digitalização simples"
+
+#. Title of error dialog when scan failed
+#: src/simple-scan.vala:392
+msgid "Failed to scan"
+msgstr "Falha ao digitalizar"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
-msgid "Change _Scanner"
-msgstr "Alterar _digitalizador"
+#. Attempt to inhibit the screensaver when scanning
+#: src/simple-scan.vala:407
+msgid "Scan in progress"
+msgstr "Digitalização em andamento"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
-msgid "_Install Drivers"
+#. Arguments and description for --help text
+#: src/simple-scan.vala:584
+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:595
+#, 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."
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
-msgid "Automatic"
-msgstr "Automático"
+#~ msgid "Front and Back"
+#~ msgstr "Frente e verso"
 
-#: ../src/ui.vala:1947
-msgid "Darker"
-msgstr "Mais escuro"
+#~ msgid "New"
+#~ msgstr "Novo"
 
-#: ../src/ui.vala:1949
-msgid "Lighter"
-msgstr "Mais claro"
+#~ msgid "Rotate Left"
+#~ msgstr "Girar à esquerda"
 
-#: ../src/ui.vala:1957
-msgid "Less"
-msgstr "Menos"
+#~ msgid "Rotate Right"
+#~ msgstr "Girar à direita"
 
-#: ../src/ui.vala:1959
-msgid "More"
-msgstr "Mais"
+#~ msgid "Crop"
+#~ msgstr "Recortar"
 
-#: ../src/ui.vala:1967
-msgid "Minimum"
-msgstr "Mínima"
+#~ msgid "Scan S_ource:"
+#~ msgstr "Origem da digitalizaçã_o:"
 
-#: ../src/ui.vala:1969
-msgid "Maximum"
-msgstr "Máxima"
+#~ msgid "New Document"
+#~ msgstr "Novo documento"
 
-#: ../src/ui.vala:2008
-msgid "Saving document..."
-msgstr "Salvando documento..."
+#~ msgid "Document"
+#~ msgstr "Documentos"
 
-#: ../src/ui.vala:2173
-#, c-format
-msgid "Saving page %d out of %d"
-msgstr "Salvando página %d de %d"
+#~ msgid "Email…"
+#~ msgstr "E-mail…"
+
+#~ msgid "Print…"
+#~ msgstr "Imprimir…"
+
+#~ msgid "_Install Drivers"
+#~ msgstr "_Instalar drivers"
+
+#~ msgid "Minimum"
+#~ msgstr "Mínima"
+
+#~ msgid "Maximum"
+#~ msgstr "Máxima"
+
+#~ msgid "Saving document…"
+#~ msgstr "Salvando documento…"
+
+#~ msgid "Saving page %d out of %d"
+#~ msgstr "Salvando página %d de %d"
+
+#~ msgid "Email..."
+#~ msgstr "E-mail..."
 
 #~ msgid "4&#xD7;6"
 #~ msgstr "4&#xD7;6"
@@ -770,7 +1122,6 @@ msgstr "Salvando página %d de %d"
 #~ msgid "Please check your installation"
 #~ msgstr "Por favor verifique a sua instalação"
 
-#, c-format
 #~ msgid ""
 #~ "GTK+ Options:\n"
 #~ "  --class=CLASS                   Program class as used by the window "
@@ -795,7 +1146,6 @@ msgstr "Salvando página %d de %d"
 #~ msgid "Files missing"
 #~ msgstr "Arquivos faltando"
 
-#, c-format
 #~ msgid ""
 #~ "Usage:\n"
 #~ "  %s [DEVICE...] - Scanning utility"
@@ -806,9 +1156,6 @@ msgstr "Salvando página %d de %d"
 #~ msgid "Height of scanned image in pixels"
 #~ msgstr "Altura da imagem digitalizada em pixels"
 
-#~ msgid "Resolution for photo scans"
-#~ msgstr "Resolução para digitalização de fotos"
-
 #~ msgid "Window height in pixels"
 #~ msgstr "Altura da janela em pixels"
 
@@ -818,9 +1165,6 @@ msgstr "Salvando página %d de %d"
 #~ msgid "Width of scanned image in pixels"
 #~ msgstr "Largura da imagem digitalizada em pixels"
 
-#~ msgid "Resolution for text scans"
-#~ msgstr "Resolução para digitalização de textos"
-
 #~ msgid "The resolution in dots-per-inch of the previously scanned image."
 #~ msgstr ""
 #~ "A resolução em pontos por polegada da imagem previamente digitalizada."
@@ -835,19 +1179,17 @@ msgstr "Salvando página %d de %d"
 #~ "A altura da imagem digitalizada em pixels. Este valor é atualizado com o "
 #~ "valor da última página digitalizada."
 
-#~ msgid "Device to scan from"
-#~ msgstr "Dispositivo de onde digitalizar"
-
 #~ msgid "Direction of scan"
 #~ msgstr "Direção da digitalização"
 
 #~ msgid ""
-#~ "The direction of the scanner across the scanned page. It can be one of the "
-#~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+#~ "The direction of the scanner across the scanned page. It can be one of "
+#~ "the following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-"
+#~ "left'"
 #~ msgstr ""
-#~ "A direção do digitalizador através da página digitalizada pode ser uma das "
-#~ "seguintes: 'de cima para baixo' 'de baixo para cima' 'esquerda para direita' "
-#~ "'direita para esquerda'"
+#~ "A direção do digitalizador através da página digitalizada pode ser uma "
+#~ "das seguintes: 'de cima para baixo' 'de baixo para cima' 'esquerda para "
+#~ "direita' 'direita para esquerda'"
 
 #~ msgid ""
 #~ "Type of document being scanned. 'text' for text documents, 'photo' for "
@@ -855,10 +1197,9 @@ msgstr "Salvando página %d de %d"
 #~ "processing."
 #~ msgstr ""
 #~ "Tipo de documento sendo digitalizado. 'texto' para documentos de texto, "
-#~ "'foto' para fotos. Este ajuste define a resolução de digitalização, cores e "
-#~ "pós-processamento."
+#~ "'foto' para fotos. Este ajuste define a resolução de digitalização, cores "
+#~ "e pós-processamento."
 
-#, c-format
 #~ msgid ""
 #~ "Help Options:\n"
 #~ "  -d, --debug                     Print debugging messages\n"
@@ -877,97 +1218,22 @@ msgstr "Salvando página %d de %d"
 #~ msgid "Select File _Type"
 #~ msgstr "Selecionar _tipo de arquivo"
 
-#~ msgid "Scanned Document"
-#~ msgstr "Documento digitalizado"
-
-#~ msgid "Directory to save files to"
-#~ msgstr "Diretório para salvar arquivos"
-
-#~ msgid "Height of paper in tenths of a mm"
-#~ msgstr "Altura do papel em décimos de milímetro"
-
 #~ msgid ""
-#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
-#~ msgstr ""
-#~ "A largura do papel em décimos de mm (ou 0 para detecção automática de papel)."
-
-#~ msgid ""
-#~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+#~ "The page side to scan. It can be one of the following: 'both' 'front' "
+#~ "'back'"
 #~ msgstr ""
 #~ "O lado da página para digitalizar. Pode ser uma das seguintes: 'ambas' "
 #~ "'frente' 'verso'"
 
 #~ msgid ""
-#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
-#~ msgstr ""
-#~ "A altura do papel em décimos de milímetro (ou 0 para detecção automática de "
-#~ "papel)."
-
-#~ msgid "Width of paper in tenths of a mm"
-#~ msgstr "Largura do papel em décimos de milímetro"
-
-#~ msgid ""
-#~ "The width of scanned image in pixels. This value is updated to what the last "
-#~ "scanned page was."
+#~ "The width of scanned image in pixels. This value is updated to what the "
+#~ "last scanned page was."
 #~ msgstr ""
 #~ "A largura da imagem digitalizada em pixels. Este valor é atualizado com o "
 #~ "valor da última imagem que foi digitalizada."
 
-#~ msgid ""
-#~ "Type of document being scanned. This setting decides on the scan resolution, "
-#~ "colors and post-processing."
-#~ msgstr ""
-#~ "Tipo de documento a ser digitalizado. Esta configuração define a resolução "
-#~ "da digitalização, cores e pós-processamento."
-
-#~ msgid "Type of document being scanned"
-#~ msgstr "Tipo do documento a ser digitalizado"
-
 #~ msgid "TRUE if the application window is maximized"
 #~ msgstr "VERDADEIRO se a janela do aplicativo estiver maximizada"
 
-#~ msgid "SANE device to acquire images from."
-#~ msgstr "Dispositivo de onde o SANE adquirire imagens."
-
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "A direção em que o digitalizador percorre a página digitalizada."
-
-#~ msgid "The page side to scan."
-#~ msgstr "O lado da página a ser digitalizado."
-
-#~ msgid "Page side to scan"
-#~ msgstr "Lado da página a ser digitalizado"
-
-#~ msgid "The resolution in dots-per-inch to use when scanning text."
-#~ msgstr ""
-#~ "A resolução em pontos por polegada a ser usada na digitalização e textos."
-
-#~ msgid "The resolution in dots-per-inch to use when scanning photos."
-#~ msgstr ""
-#~ "A resolução em pontos por polegadas a ser usada na digitalização de fotos."
-
-#~ msgid ""
-#~ "The directory to save files to. Defaults to the documents directory if unset."
-#~ msgstr ""
-#~ "O diretório no qual salvar os arquivos. Se não configurado, o diretório "
-#~ "Documentos é usado como padrão."
-
-#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
-#~ msgstr "O ajuste do contraste de -100 para 100 (0 sendo nenhum)"
-
-#~ msgid "Contrast of scan"
-#~ msgstr "Contraste do digitalizador"
-
-#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
-#~ msgstr "O ajuste de luminosidade de -100 para 100 (0 sendo nenhum)"
-
-#~ msgid "Brightness of scan"
-#~ msgstr "Luminosidade do digitalizador"
-
-#~ msgid "Quality value to use for JPEG compression."
-#~ msgstr "Qualidade para usar na compressão JPEG."
-
-#~ msgid "Quality value to use for JPEG compression"
-#~ msgstr "Qualidade para usar na compressão JPEG"
diff --git a/po/quot.sed b/po/quot.sed
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..6c9bcec 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -7,297 +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-09-11 18:43+0000\n"
-"Last-Translator: Lucian Adrian Grijincu <lucian.grijincu@gmail.com>\n"
+"POT-Creation-Date: 2017-04-16 08:54-0400\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-25 06:10+0000\n"
+"X-Generator: Launchpad (build 18361)\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:231 src/simple-scan.ui:815 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:247
 msgid "_Document"
 msgstr "_Document"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/simple-scan.ui:266
 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:279 src/simple-scan.ui:1343 src/simple-scan.ui:1402
 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:289 src/simple-scan.ui:1352 src/simple-scan.ui:1411
 msgid "All Pages From _Feeder"
 msgstr "Toate paginile de la tava cu _foi de hârtie"
 
+#. 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 "Oprește _scanarea"
 
-#: 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 "Text"
 
-#: 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 "Foto"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/simple-scan.ui:352 src/ui.vala:1247 src/ui.vala:1891
 msgid "Reorder Pages"
-msgstr ""
+msgstr "Reordonare pagini"
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/simple-scan.ui:371
 msgid "_Email"
 msgstr "_Email"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:436
 msgid "_Page"
 msgstr "_Pagină"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:446
 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:456
 msgid "Rotate _Right"
 msgstr "Rotește la _dreapta"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:466
 msgid "_Crop"
 msgstr "De_cupează"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:476
 msgid "_None"
 msgstr "_Niciunul"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:487
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:498
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:509
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:520
 msgid "_Letter"
 msgstr "_Scrisoare"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:531
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:542
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:553
 msgid "_Custom"
 msgstr "_Personalizat"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:571
 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:584
 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:593
 msgid "Move Right"
 msgstr "Mută la dreapta"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:630
 msgid "_Help"
 msgstr "_Ajutor"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:638
 msgid "_Contents"
 msgstr "_Cuprins"
 
 #. 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 "Începeți un document nou"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:681
 msgid "New"
 msgstr "Nou"
 
 #. 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 "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:697 src/simple-scan.ui:843
 msgid "Scan"
 msgstr "Scanează"
 
 #. 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 "Salvează documentul ca fișier"
 
-#: ../src/ui.vala:1842
+#: src/simple-scan.ui:715 src/ui.vala:1892
 msgid "Save"
 msgstr "Salvează"
 
 #. 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 "Oprește scanarea curentă"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:731 src/simple-scan.ui:831
 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:755 src/simple-scan.ui:942
 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:756
 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:770 src/simple-scan.ui:920
 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:771
 msgid "Rotate Right"
 msgstr "Rotește la dreapta"
 
-#: 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 "Decupează pagina selectată"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:787
 msgid "Crop"
 msgstr "Decupează"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:1003 src/ui.vala:1898
 msgid "Preferences"
 msgstr "Preferințe"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1054
 msgid "Scan S_ource:"
 msgstr "S_ursă scanare:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1085
 msgid "_Text Resolution:"
 msgstr "Rezoluție _text:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1101
 msgid "_Photo Resolution:"
 msgstr "Rezoluție _foto :"
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1145
 msgid "Scan Side:"
 msgstr "Partea scanată:"
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1175
 msgid "Page Size:"
 msgstr "Dimensiunea paginii:"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1205
 msgid "Brightness:"
 msgstr "Luminozitate:"
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1235
 msgid "Contrast:"
 msgstr "Contrast:"
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1266
 msgid "Quality:"
 msgstr "Calitate:"
 
+#. 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 "Scanează documente"
 
@@ -309,7 +322,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 +330,211 @@ 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:844
 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:874
 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:1227
 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:1240 src/scanner.vala:1340
 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:332 src/ui.vala:1655 src/ui.vala:1935
 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:341
 #, 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:389
 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:391
 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:396
 msgid "Additional software needed"
 msgstr ""
 
 #. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:398
 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:510
 msgid "Save As..."
 msgstr "Salvează ca..."
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:513 src/ui.vala:648 src/ui.vala:723
 msgid "_Cancel"
 msgstr "_Anulare"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:514 src/ui.vala:724
 msgid "_Save"
 msgstr "_Salvează"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:522
 msgid "Scanned Document.pdf"
 msgstr "Document scanat.pdf"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:528
 msgid "Image Files"
 msgstr "Fișiere imagine"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:534
 msgid "All Files"
 msgstr "Toate fișierele"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:543
 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:549
 msgid "JPEG (compressed)"
 msgstr "JPEG (comprimat)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:555
 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: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:650
+#: src/ui.vala:698
 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:721
 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:763
 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:765
 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:1056
 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:1068
 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:1270
 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:1280
 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:1290
 msgid "Reverse"
-msgstr ""
+msgstr "Invers"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1300
 msgid "Keep unchanged"
-msgstr ""
+msgstr "Păstrează nemodificat"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1504
 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: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"
@@ -542,16 +566,16 @@ msgstr ""
 "<http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1528
 msgid "About Simple Scan"
 msgstr "Despre „Scanare simplă”"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1531
 msgid "Simple document scanning tool"
 msgstr "Utilitar pentru scanarea simplă a documentelor"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1540
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -565,189 +589,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:1562
 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:1564
 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:1632
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1634
 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:1638
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1640
 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:1644
 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:1649
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1651
 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:1655
 msgid "Install drivers"
 msgstr ""
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1686
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1698
 msgid "Installing drivers..."
 msgstr ""
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1706
 msgid "Drivers installed successfully!"
 msgstr ""
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1716
 #, 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:1722
 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:1729
 #, 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:1833
 #, 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:1836
 #, 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:1839
 #, 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:1842
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1885
 msgid "New Document"
-msgstr ""
+msgstr "Document nou"
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1890
 msgid "Document"
-msgstr ""
+msgstr "Document"
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1893
 msgid "Email..."
-msgstr ""
+msgstr "Email..."
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1894
 msgid "Print..."
-msgstr ""
+msgstr "Tipărire..."
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1902
 msgid "Help"
-msgstr ""
+msgstr "Ajutor"
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1903
 msgid "About"
-msgstr ""
+msgstr "Despre"
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1904
 msgid "Quit"
-msgstr ""
+msgstr "Închide"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1937
 msgid "Change _Scanner"
 msgstr "Schimbă _scanerul"
 
 #. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1939
 msgid "_Install Drivers"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1945
 msgid "Automatic"
 msgstr "Automată"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1995
 msgid "Darker"
 msgstr "Mai întunecat"
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1997
 msgid "Lighter"
 msgstr "Mai luminos"
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:2005
 msgid "Less"
 msgstr "Mai puțin"
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:2007
 msgid "More"
 msgstr "Mai mult"
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:2015
 msgid "Minimum"
 msgstr "Minim"
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:2017
 msgid "Maximum"
 msgstr "Maxim"
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2068
 msgid "Saving document..."
 msgstr "Se salvează documentul..."
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2242
 #, 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..336c225 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -2,516 +2,525 @@
 # Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
 # This file is distributed under the same license as the simple-scan package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
+# Stas Solovey <whats_up@tut.by>, 2017.
+# Роман Верменко <dargodet@gmail.com>, 2017.
 #
 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-11-01 17:49+0000\n"
-"Last-Translator: Sandro <Unknown>\n"
-"Language-Team: Russian <ru@li.org>\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
+"product=simple-scan&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-08-19 11:56+0000\n"
+"PO-Revision-Date: 2017-08-20 21:07+0400\n"
+"Last-Translator: Yuri Myasoedov <ymyasoedov@yandex.ru>\n"
+"Language-Team: русский <>\n"
+"Language: ru\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-Generator: Poedit 2.0.2\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#. Button to submit authorization dialog
-#: data/simple-scan.ui:24
-msgid "_Authorize"
-msgstr "Р_азрешить"
+#: data/org.gnome.SimpleScan.gschema.xml:11
+msgid "Device to scan from"
+msgstr "Устройство сканирования"
 
-#. Label beside username entry
-#: data/simple-scan.ui:102
-msgid "_Username for resource:"
-msgstr "Имя поль_зователя для ресурса:"
+#: data/org.gnome.SimpleScan.gschema.xml:12
+msgid "SANE device to acquire images from."
+msgstr "Устройство SANE для получения изображений."
 
-#. Label beside password entry
-#: data/simple-scan.ui:117
-msgid "_Password:"
-msgstr "_Пароль:"
+#: data/org.gnome.SimpleScan.gschema.xml:20
+msgid "Type of document being scanned"
+msgstr "Тип сканируемого документа"
 
-#. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
-msgid "Front and Back"
-msgstr "Обе стороны"
+#: data/org.gnome.SimpleScan.gschema.xml:21
+msgid ""
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+msgstr ""
+"Тип сканируемого документа. Эта настройка отвечает за разрешение, глубину "
+"цвета и пост-обработку."
 
-#. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
-msgid "Front"
-msgstr "Лицевая сторона"
+#: data/org.gnome.SimpleScan.gschema.xml:25
+msgid "Width of paper in tenths of a mm"
+msgstr "Ширина бумаги  в сантиметрах"
 
-#. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
-msgid "Back"
-msgstr "Обратная сторона"
+#: data/org.gnome.SimpleScan.gschema.xml:26
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr "Ширина бумаги в десятках мм (или 0 для автоматического определения)"
+
+#: data/org.gnome.SimpleScan.gschema.xml:30
+msgid "Height of paper in tenths of a mm"
+msgstr "Высота бумаги в сантиметрах"
+
+#: data/org.gnome.SimpleScan.gschema.xml:31
+msgid ""
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr "Высота бумаги в десятках мм (или 0 для автоматического определения)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:35
+msgid "Brightness of scan"
+msgstr "Яркость изображения"
+
+#: data/org.gnome.SimpleScan.gschema.xml:36
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr "Значение яркости от -100 до 100 (0 — без изменений)."
 
+#: data/org.gnome.SimpleScan.gschema.xml:40
+msgid "Contrast of scan"
+msgstr "Контрастность изображения"
+
+#: data/org.gnome.SimpleScan.gschema.xml:41
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr "Значение контрастности от -100 до 100 (0 — без изменений)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:45
+msgid "Resolution for text scans"
+msgstr "Разрешение при сканировании текста"
+
+#: data/org.gnome.SimpleScan.gschema.xml:46
+msgid "The resolution in dots-per-inch to use when scanning text."
+msgstr "Разрешение в точках на дюйм при сканировании текста."
+
+#: data/org.gnome.SimpleScan.gschema.xml:50
+msgid "Resolution for photo scans"
+msgstr "Разрешение при сканировании фотографий"
+
+#: data/org.gnome.SimpleScan.gschema.xml:51
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr "Разрешение в точках на дюйм при сканировании фотографий."
+
+#: data/org.gnome.SimpleScan.gschema.xml:55
+msgid "Page side to scan"
+msgstr "Сторона страницы для сканирования"
+
+#: data/org.gnome.SimpleScan.gschema.xml:56
+msgid "The page side to scan."
+msgstr "Сторона страницы для сканирования."
+
+#: data/org.gnome.SimpleScan.gschema.xml:60
+msgid "Directory to save files to"
+msgstr "Папка для сохранения файлов"
+
+#: data/org.gnome.SimpleScan.gschema.xml:61
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+"Папка для сохранения файлов. По умолчанию используется папка с документами."
+
+#: data/org.gnome.SimpleScan.gschema.xml:66
+msgid "Quality value to use for JPEG compression"
+msgstr "Значение качества, используемого для сжатия JPEG"
+
+#: data/org.gnome.SimpleScan.gschema.xml:67
+msgid "Quality value to use for JPEG compression."
+msgstr "Значение качества, используемого для сжатия JPEG."
+
+#: data/org.gnome.SimpleScan.gschema.xml:72
+msgid "Delay in millisecond between pages"
+msgstr "Задержка в миллисекундах между страницами"
+
+#: data/org.gnome.SimpleScan.gschema.xml:73
+msgid "Delay in millisecond between pages."
+msgstr "Задержка в миллисекундах между страницами."
+
+#. Title of scan window
+#. Set HeaderBar title here because Glade doesn't keep it translated
+#. https://bugzilla.gnome.org/show_bug.cgi?id=782753
 #. 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
+#: data/simple-scan.appdata.xml.in:6 data/simple-scan.desktop.in:3
+#: src/app-window.ui:76 src/app-window.vala:1560
 msgid "Simple Scan"
 msgstr "Простое сканирование"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
-msgid "_Document"
-msgstr "_Документ"
+#: data/simple-scan.appdata.xml.in:7 data/simple-scan.desktop.in:5
+msgid "Scan Documents"
+msgstr "Сканирование документов"
 
-#. Scan menu item
-#: data/simple-scan.ui:260
-msgid "Sc_an"
-msgstr "_Сканировать"
+#: 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 "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+"Наиболее простой способ сканирования документов и фотографий. Вы можете "
+"обрезать испорченные края снимков и повернуть их, если расположили "
+"неправильно. Вы можете распечатать сканированные материалы, экспортировать "
+"их в PDF или изображения ряда форматов."
+
+#: data/simple-scan.appdata.xml.in:14
+msgid "Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+"Простое сканирование использует фреймворк SANE для поддержки большинства "
+"существующих сканеров."
 
+#: data/simple-scan.desktop.in:4
+msgid "Document Scanner"
+msgstr "Сканер документов"
+
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: data/simple-scan.desktop.in:7
+msgid "scan;scanner;flatbed;adf;"
+msgstr "сканировать;сканер;планшетный;автоподатчик;"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: data/simple-scan.desktop.in:10
+msgid "scanner"
+msgstr "scanner"
+
+#. Toolbar scan menu item to scan a single page from the scanner
 #. 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/app-window.ui:22 src/app-window.ui:123 src/app-window.ui:820
 msgid "Single _Page"
 msgstr "Одна _страница"
 
+#. Toolbar scan menu item to scan all pages from a document feeder
 #. 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/app-window.ui:31 src/app-window.ui:133 src/app-window.ui:829
 msgid "All Pages From _Feeder"
 msgstr "Все страницы из _автоподатчика"
 
-#. Menu entry to stop current scan
-#: data/simple-scan.ui:294
-msgid "_Stop Scan"
-msgstr "_Остановить сканирование"
+#. Toolbar scan menu item to scan continuously from the flatbed
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/app-window.ui:40 src/app-window.ui:143 src/app-window.ui:838
+msgid "_Multiple Pages From Flatbed"
+msgstr "_Несколько страниц с планшета"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:853
 msgid "Text"
 msgstr "Текст"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:863
 msgid "Photo"
 msgstr "Фотография"
 
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: src/app-window.ui:91
+msgid "_Document"
+msgstr "_Документ"
+
+#. Scan menu item
+#: src/app-window.ui:110
+msgid "Sc_an"
+msgstr "_Сканировать"
+
+#. Menu entry to stop current scan
+#: src/app-window.ui:154
+msgid "_Stop Scan"
+msgstr "_Остановить сканирование"
+
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/app-window.ui:196 src/app-window.vala:967 src/app-window.vala:1590
 msgid "Reorder Pages"
 msgstr "Организация страниц"
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/app-window.ui:215
 msgid "_Email"
 msgstr "Отправить _почтой"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/app-window.ui:280
 msgid "_Page"
 msgstr "_Страница"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/app-window.ui:290
 msgid "Rotate _Left"
 msgstr "Повернуть в_лево"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/app-window.ui:300
 msgid "Rotate _Right"
 msgstr "Повернуть в_право"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/app-window.ui:310
 msgid "_Crop"
 msgstr "_Обрезать"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/app-window.ui:320
 msgid "_None"
 msgstr "_Нет"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/app-window.ui:331
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/app-window.ui:342
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/app-window.ui:353
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/app-window.ui:364
 msgid "_Letter"
 msgstr "US _Letter"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/app-window.ui:375
 msgid "Le_gal"
 msgstr "US Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/app-window.ui:386
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/app-window.ui:397
 msgid "_Custom"
-msgstr "_Другое..."
+msgstr "_Другое"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/app-window.ui:415
 msgid "_Rotate Crop"
 msgstr "_Повернуть выбранное"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/app-window.ui:428
 msgid "Move Left"
 msgstr "Переместить влево"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/app-window.ui:437
 msgid "Move Right"
 msgstr "Переместить вправо"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/app-window.ui:474
 msgid "_Help"
 msgstr "_Справка"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/app-window.ui:482
 msgid "_Contents"
 msgstr "_Содержание"
 
-#. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
-msgid "Start a new document"
-msgstr "Создать новый документ"
-
-#: data/simple-scan.ui:675
-msgid "New"
-msgstr "Создать"
-
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/app-window.ui:520 src/app-window.ui:720
 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/app-window.ui:522 src/app-window.ui:716
 msgid "Scan"
 msgstr "Сканировать"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/app-window.ui:538 src/app-window.ui:787
 msgid "Save document to a file"
 msgstr "Сохранить документ в файл"
 
-#: ../src/ui.vala:1842
+#: src/app-window.ui:540
 msgid "Save"
 msgstr "Сохранить"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/app-window.ui:555 src/app-window.ui:700
 msgid "Stop the current scan"
 msgstr "Прервать выполняемое сканирование"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/app-window.ui:556 src/app-window.ui:697
 msgid "Stop"
-msgstr "Завершить"
-
-#. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "Повернуть страницу влево (против часовой стрелки)"
-
-#. Label on rotate page left (anti-clockwise) item
-#: data/simple-scan.ui:750
-msgid "Rotate Left"
-msgstr "Повернуть влево"
-
-#. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
-msgid "Rotate the page to the right (clockwise)"
-msgstr "Повернуть страницу вправо (по часовой стрелке)"
-
-#. Label on rotate page right (clockwise) item
-#: data/simple-scan.ui:765
-msgid "Rotate Right"
-msgstr "Повернуть вправо"
-
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
-msgid "Crop the selected page"
-msgstr "Обрезать выбранную страницу"
+msgstr "Остановить"
 
-#: data/simple-scan.ui:781
-msgid "Crop"
-msgstr "Обрезать"
+#. Label shown when searching for scanners
+#: src/app-window.ui:611
+msgid "Searching for Scanners…"
+msgstr "Поиск сканеров…"
 
-#: ../src/ui.vala:1849
-msgid "Preferences"
-msgstr "Параметры"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1048
-msgid "Scan S_ource:"
-msgstr "Ист_очник сканирования:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1079
-msgid "_Text Resolution:"
-msgstr "Р_азрешение текста:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1095
-msgid "_Photo Resolution:"
-msgstr "_Разрешение фотографии:"
-
-#. Label beside scan side combo box
-#: data/simple-scan.ui:1139
-msgid "Scan Side:"
-msgstr "Сканируемая сторона:"
-
-#. Label beside page size combo box
-#: data/simple-scan.ui:1169
-msgid "Page Size:"
-msgstr "Размер листа:"
-
-#. Label beside brightness scale
-#: data/simple-scan.ui:1199
-msgid "Brightness:"
-msgstr "Яркость:"
-
-#. Label beside contrast scale
-#: data/simple-scan.ui:1229
-msgid "Contrast:"
-msgstr "Контрастность:"
-
-#. Label beside quality scale
-#: data/simple-scan.ui:1260
-msgid "Quality:"
-msgstr "Качество:"
-
-#: data/simple-scan.desktop.in:4
-msgid "Document Scanner"
-msgstr "Сканер документов"
-
-#: data/simple-scan.desktop.in:5
-msgid "Scan Documents"
-msgstr "Сканирование документов"
+#: src/app-window.vala:237 src/app-window.vala:1380
+msgid "_Close"
+msgstr "_Закрыть"
 
-#: data/simple-scan.desktop.in:6
-msgid "scan;scanner;flatbed;adf;"
-msgstr "сканировать;сканер;планшетный;автоподатчик;"
+#. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
+#: src/app-window.vala:246
+#, c-format
+msgid "Username and password required to access “%s”"
+msgstr "Требуется имя пользователя и пароль для доступа к «%s»"
 
-#: data/simple-scan.desktop.in:8
-msgid "scanner"
-msgstr ""
+#. Label shown when detected a scanner
+#: src/app-window.vala:266 src/app-window.vala:584
+msgid "Ready to Scan"
+msgstr "Готово к сканированию"
 
-#: data/simple-scan.appdata.xml.in:8
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-"Наиболее простой способ сканирования документов и фотографий. Вы можете "
-"обрезать испорченные края снимков и повернуть их, если расположили "
-"неправильно. Вы можете распечатать сканированные материалы, экспортировать "
-"их в PDF или изображения ряда форматов."
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: src/app-window.vala:273
+msgid "Additional software needed"
+msgstr "Необходимо дополнительное программное обеспечение"
 
-#: data/simple-scan.appdata.xml.in:13
+#. Instructions to install driver software
+#: src/app-window.vala:275
 msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
+"You need to <a href=\"install-firmware\">install driver software</a> for "
+"your scanner."
 msgstr ""
-"Простое сканирование использует фреймворк SANE для поддержки большинства "
-"существующих сканеров."
-
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
-msgid "No scanners available.  Please connect a scanner."
-msgstr "Нет доступного сканера. Подключите его."
-
-#. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
-msgid "Unable to connect to scanner"
-msgstr "Не могу подключиться к сканеру"
-
-#. Error display when unable to start scan
-#: ../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
-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 "Показать сообщения отладки"
-
-#: ../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
-msgid "Failed to scan"
-msgstr "Сканирование не удалось"
-
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
-msgid "[DEVICE...] - Scanning utility"
-msgstr "[DEVICE...] — Устройство сканирования"
-
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
-#, c-format
-msgid "Run '%s --help' to see a full list of available command line options."
-msgstr "Выполните '%s --help', чтобы вывести полный список доступных опций."
-
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
-msgid "_Close"
-msgstr "_Закрыть"
-
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
-#, c-format
-msgid "Username and password required to access '%s'"
-msgstr "Для доступа к '%s' нужны имя пользователя и пароль"
+"Необходимо <a href=\"install-firmware\">установить драйвер</a> для вашего "
+"сканера."
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/app-window.vala:281
 msgid "No scanners detected"
 msgstr "Сканеры не обнаружены"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/app-window.vala:283
 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
-msgid "Additional software needed"
-msgstr "Необходимо дополнительно программное обеспечение"
-
-#. Instructions to install driver software
-#: ../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
-msgid "Save As..."
-msgstr "Сохранить как..."
+#: src/app-window.vala:298
+msgid "Save As…"
+msgstr "Сохранить как…"
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/app-window.vala:301 src/app-window.vala:471 src/app-window.vala:552
 msgid "_Cancel"
 msgstr "_Отменить"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/app-window.vala:302 src/app-window.vala:553
 msgid "_Save"
 msgstr "Со_хранить"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/app-window.vala:310
 msgid "Scanned Document.pdf"
 msgstr "Сканированный документ.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#. Save dialog: Filter name to show only supported image files
+#: src/app-window.vala:316
 msgid "Image Files"
 msgstr "Файлы изображений"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/app-window.vala:326
 msgid "All Files"
 msgstr "Все файлы"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/app-window.vala:335
 msgid "PDF (multi-page document)"
 msgstr "PDF (многостраничный документ)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/app-window.vala:341
 msgid "JPEG (compressed)"
 msgstr "JPEG (сжатый)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/app-window.vala:347
 msgid "PNG (lossless)"
 msgstr "PNG (без потерь в качестве)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#. Save dialog: Label for sabing in WEBP format
+#: src/app-window.vala:354
+msgid "WebP (compressed)"
+msgstr "WebP (сжатый)"
+
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
+#: src/app-window.vala:364
 msgid "File format:"
 msgstr "Формат файла:"
 
+#. Label in save dialog beside compression slider
+#: src/app-window.vala:376
+msgid "Compression:"
+msgstr "Сжатие:"
+
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/app-window.vala:470
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr "Файл с именем «%s» уже существует. Заменить его?"
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/app-window.vala:473
+msgid "_Replace"
+msgstr "_Заменить"
+
+#: src/app-window.vala:512
+msgid "Saving"
+msgstr "Сохранение"
+
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/app-window.vala:527
 msgid "Failed to save file"
 msgstr "Не удалось сохранить файл"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
-msgid "If you don't save, changes will be permanently lost."
+#: src/app-window.vala:550
+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/app-window.vala:591
 msgid "Save current document?"
 msgstr "Сохранить текущий документ?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/app-window.vala:593
 msgid "Discard Changes"
 msgstr "Отменить изменения"
 
+#. Label shown when scan started
+#: src/app-window.vala:692
+msgid "Contacting scanner…"
+msgstr "Соединение со сканером…"
+
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/app-window.vala:800
 msgid "Unable to save image for preview"
 msgstr "Не удалось сохранить изображение для предварительного просмотра"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/app-window.vala:812
 msgid "Unable to open image preview application"
-msgstr "Невозможно открыть программу для просмотра изображений"
+msgstr "Не удалось открыть программу для просмотра изображений"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/app-window.vala:990
 msgid "Combine sides"
 msgstr "Объединить стороны"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/app-window.vala:1000
 msgid "Combine sides (reverse)"
 msgstr "Объединить стороны (в обратном порядке)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/app-window.vala:1010
 msgid "Reverse"
 msgstr "В обратном порядке"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/app-window.vala:1020
 msgid "Keep unchanged"
 msgstr "Оставить без изменений"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/app-window.vala:1250
 msgid "Unable to open help file"
 msgstr "Не удалось открыть файл справки"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/app-window.vala:1271
 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,442 +549,477 @@ msgstr ""
 "пройдите по ссылке: <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/app-window.vala:1274
 msgid "About Simple Scan"
-msgstr "О программе"
+msgstr "О приложении"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/app-window.vala:1277
 msgid "Simple document scanning tool"
 msgstr "Простой инструмент для сканирования документов"
 
-#: ../src/ui.vala:1487
+#: src/app-window.vala:1286
 msgid "translator-credits"
 msgstr ""
-"Launchpad Contributions:\n"
-"  Aleksey Kabanov https://launchpad.net/~ak099\n"
-"  Alexander Telenga https://launchpad.net/~telenga\n"
-"  Alexandre Prokoudine https://launchpad.net/~alexandre-prokoudine\n"
-"  Alexey Kotlyarov https://launchpad.net/~koterpillar\n"
-"  Andrew Sudarikov https://launchpad.net/~andrey-interra\n"
-"  Andrew Yakush https://launchpad.net/~andyak77\n"
-"  Artem Popov https://launchpad.net/~artfwo\n"
-"  AsstZD https://launchpad.net/~eskaer-spamsink\n"
-"  Dmitry Shachnev https://launchpad.net/~mitya57\n"
-"  Dr Gregory House https://launchpad.net/~greghouse\n"
-"  Eugene Marshal https://launchpad.net/~lowrider\n"
-"  Evgeny https://launchpad.net/~evgeny-ig\n"
-"  Igor Zubarev https://launchpad.net/~igor.zubarev\n"
-"  Int https://launchpad.net/~howrudoin\n"
-"  KEIII https://launchpad.net/~cashagent\n"
-"  ManDrive https://launchpad.net/~roman-romul\n"
-"  Net4Hack https://launchpad.net/~networkforhackers\n"
-"  Novichkov Alexander https://launchpad.net/~berkut\n"
-"  Oleg https://launchpad.net/~oleg-devyatilov\n"
-"  Oleg Koptev https://launchpad.net/~koptev-oleg\n"
-"  Pavel Nazarov https://launchpad.net/~alsvartr\n"
-"  Sandro https://launchpad.net/~regipool\n"
-"  Sergey Loshakov https://launchpad.net/~sergeylo\n"
-"  Sergey Sedov https://launchpad.net/~serg-sedov\n"
-"  Simplehuman https://launchpad.net/~simplehuman\n"
-"  Stas Solovey https://launchpad.net/~whats-up\n"
-"  Victor Mireyev https://launchpad.net/~victor-mireyev\n"
-"  Vitaly Zawullon Katraev https://launchpad.net/~zawullon\n"
-"  evilzipik https://launchpad.net/~evilzipik\n"
-"  ned https://launchpad.net/~ru100\n"
-"  vasilisc https://launchpad.net/~vasilisc\n"
-"  Илья Калитко https://launchpad.net/~kalitko-ilya007\n"
-"  ☠Jay ZDLin☠ https://launchpad.net/~black-buddha666"
+"Stas Solovey <whats_up@tut.by>, 2015-2017\n"
+"Роман Верменко <dargodet@gmail.com>, 2017"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/app-window.vala:1308
 msgid "Save document before quitting?"
 msgstr "Сохранить документ перед выходом?"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:1310
 msgid "Quit without Saving"
 msgstr "Выйти без сохранения"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/app-window.vala:1357
 msgid "You appear to have a Brother scanner."
 msgstr "Похоже, у вас сканер компании Brother."
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/app-window.vala:1359
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.brother.com\">Brother website</a>."
+"Drivers for this are available on the <a href=\"http://support.brother.com"
+"\">Brother website</a>."
 msgstr ""
-"Драйверы для этих сканеров доступны на <a "
-"href=\"http://support.brother.com\">веб-сайте Brother</a>."
+"Драйверы для этих сканеров доступны на <a href=\"http://support.brother.com"
+"\">веб-сайте Brother</a>."
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/app-window.vala:1363
 msgid "You appear to have a Samsung scanner."
 msgstr "Похоже, у вас сканер компании Samsung."
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/app-window.vala:1365
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://samsung.com/support\">Samsung website</a>."
+"Drivers for this are available on the <a href=\"http://samsung.com/support"
+"\">Samsung website</a>."
 msgstr ""
-"Драйверы для этих сканеров доступны на <a "
-"href=\"http://samsung.com/support\">веб-сайте Samsung</a>."
+"Драйверы для этих сканеров доступны на <a href=\"http://samsung.com/support"
+"\">веб-сайте Samsung</a>."
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/app-window.vala:1369
 msgid "You appear to have an HP scanner."
 msgstr "Похоже, у вас сканер компании HP."
 
 #. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/app-window.vala:1374
 msgid "You appear to have an Epson scanner."
 msgstr "Похоже, у вас сканер компании Epson."
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/app-window.vala:1376
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.epson.com\">Epson website</a>."
+"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>."
+"Драйверы для этих сканеров доступны на <a href=\"http://support.epson.com"
+"\">веб-сайте Epson</a>."
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/app-window.vala:1380
 msgid "Install drivers"
 msgstr "Установка драйверов"
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/app-window.vala:1411
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "После установки необходимо перезапустить Simple Scan."
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
-msgid "Installing drivers..."
+#: src/app-window.vala:1423
+msgid "Installing drivers…"
 msgstr "Установка драйверов…"
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/app-window.vala:1431
 msgid "Drivers installed successfully!"
 msgstr "Драйверы успешно установлены!"
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/app-window.vala:1441
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Не удалось установить драйверы (код ошибки %d)."
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/app-window.vala:1447
 msgid "Failed to install drivers."
 msgstr "Не удалось установить драйверы."
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/app-window.vala:1454
 #, c-format
-msgid "You need to install the %s package(s)."
-msgstr "Необходимо установить пакет(-ы) %s."
+msgid "You need to install the %s package."
+msgid_plural "You need to install the %s packages."
+msgstr[0] "Необходимо установить %s пакет"
+msgstr[1] "Необходимо установить %s пакета"
+msgstr[2] "Необходимо установить %s пакетов"
+
+#. Title of preferences dialog
+#: src/app-window.vala:1568 src/app-window.vala:1591
+#: src/preferences-dialog.ui:53
+msgid "Preferences"
+msgstr "Параметры"
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
-#, c-format
-msgid "%d dpi (default)"
-msgstr "%d dpi (по умолчанию)"
+#: src/app-window.vala:1572
+msgid "Keyboard Shortcuts"
+msgstr "Комбинации клавиш"
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
-#, c-format
-msgid "%d dpi (draft)"
-msgstr "%d dpi (черновик)"
+#: src/app-window.vala:1573
+msgid "Help"
+msgstr "Справка"
 
-#. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
-#, c-format
-msgid "%d dpi (high resolution)"
-msgstr "%d dpi (высокое разрешение)"
+#: src/app-window.vala:1574
+msgid "About"
+msgstr "О программе"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1793
+#: src/app-window.vala:1575
+msgid "Quit"
+msgstr "Завершить"
+
+#: src/app-window.vala:1589
+msgid "Email"
+msgstr "Эл. почта"
+
+#. Populate ActionBar (not supported in Glade)
+#. https://bugzilla.gnome.org/show_bug.cgi?id=769966
+#. Label on new document button
+#: src/app-window.vala:1599
+msgid "Start Again…"
+msgstr "Начать заново…"
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: src/app-window.vala:1616
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Повернуть страницу влево (против часовой стрелки)"
+
+#. Tooltip for rotate right (clockwise) button
+#: src/app-window.vala:1623
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Повернуть страницу вправо (по часовой стрелке)"
+
+#. Tooltip for crop button
+#: src/app-window.vala:1633
+msgid "Crop the selected page"
+msgstr "Обрезать выбранную страницу"
+
+#. Tooltip for delete button
+#: src/app-window.vala:1649
+msgid "Delete the selected page"
+msgstr "Удалить выбранную страницу"
+
+#. Text of button for cancelling save
+#: src/app-window.vala:1814
+msgid "Cancel"
+msgstr "Отменить"
+
+#. Button to submit authorization dialog
+#: src/authorize-dialog.ui:25
+msgid "_Authorize"
+msgstr "Р_азрешить"
+
+#. Label beside username entry
+#: src/authorize-dialog.ui:99
+msgid "_Username for resource:"
+msgstr "Имя поль_зователя для ресурса:"
+
+#. Label beside password entry
+#: src/authorize-dialog.ui:112
+msgid "_Password:"
+msgstr "_Пароль:"
+
+#: src/book.vala:331 src/book.vala:337
 #, c-format
-msgid "%d dpi"
-msgstr "%d dpi"
+msgid "Unable to encode page %i"
+msgstr "Не удалось преобразовать страницу %i"
+
+#: src/help-overlay.ui:12
+msgctxt "shortcut window"
+msgid "Scanning"
+msgstr "Сканирование"
+
+#: src/help-overlay.ui:17
+msgctxt "shortcut window"
+msgid "Scan a single page"
+msgstr "Сканировать одну страницу"
+
+#: src/help-overlay.ui:24
+msgctxt "shortcut window"
+msgid "Scan all pages from document feeder"
+msgstr "Сканировать все страницы с устройства подачи документа"
+
+#: src/help-overlay.ui:31
+msgctxt "shortcut window"
+msgid "Scan continuously from a flatbed scanner"
+msgstr "Непрерывное сканирование с планшетного сканера"
+
+#: src/help-overlay.ui:38
+msgctxt "shortcut window"
+msgid "Stop scan in progress"
+msgstr "Выполняется остановка сканирования"
+
+#: src/help-overlay.ui:46
+msgctxt "shortcut window"
+msgid "Document Modification"
+msgstr "Изменение документа"
+
+#: src/help-overlay.ui:51
+msgctxt "shortcut window"
+msgid "Move page left"
+msgstr "Переместить страницу влево"
+
+#: src/help-overlay.ui:58
+msgctxt "shortcut window"
+msgid "Move page right"
+msgstr "Переместить страницу вправо"
+
+#: src/help-overlay.ui:65
+msgctxt "shortcut window"
+msgid "Rotate page to the left (anti-clockwise)"
+msgstr "Повернуть страницу влево (против часовой стрелки)"
 
-#: ../src/ui.vala:1835
-msgid "New Document"
-msgstr "Новый документ"
+#: src/help-overlay.ui:72
+msgctxt "shortcut window"
+msgid "Rotate page to the right (clockwise)"
+msgstr "Повернуть страницу вправо (по часовой стрелке)"
 
-#: ../src/ui.vala:1840
-msgid "Document"
-msgstr "Документ"
+#: src/help-overlay.ui:79
+msgctxt "shortcut window"
+msgid "Delete page"
+msgstr "Удалить страницу"
 
-#: ../src/ui.vala:1844
-msgid "Email..."
-msgstr "Отправить..."
+#: src/help-overlay.ui:87
+msgctxt "shortcut window"
+msgid "Document Management"
+msgstr "Управление документами"
 
-#: ../src/ui.vala:1845
-msgid "Print..."
-msgstr "Печать..."
+#: src/help-overlay.ui:92
+msgctxt "shortcut window"
+msgid "Start new document"
+msgstr "Создать новый документ"
 
-#: ../src/ui.vala:1853
-msgid "Help"
-msgstr "Справка"
+#: src/help-overlay.ui:99
+msgctxt "shortcut window"
+msgid "Save scanned document"
+msgstr "Сохранить отсканированный документ"
 
-#: ../src/ui.vala:1854
-msgid "About"
-msgstr "О программе"
+#: src/help-overlay.ui:106
+msgctxt "shortcut window"
+msgid "Email scanned document"
+msgstr "Отправить отсканированный документ по электронной почте"
 
-#: ../src/ui.vala:1855
-msgid "Quit"
-msgstr "Завершить"
+#: src/help-overlay.ui:113
+msgctxt "shortcut window"
+msgid "Print scanned document"
+msgstr "Напечатать отсканированный документ"
+
+#: src/help-overlay.ui:120
+msgctxt "shortcut window"
+msgid "Copy current page to clipboard"
+msgstr "Копировать текущую страницу в буфер обмена"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
-msgid "Change _Scanner"
-msgstr "Сменить _сканер"
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:113
+msgid "_Scanner"
+msgstr "_Сканер"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
-msgid "_Install Drivers"
-msgstr "_Установить драйверы"
+#. Label beside scan side combo box
+#: src/preferences-dialog.ui:143
+msgid "Scan Sides"
+msgstr "Сканируемые стороны"
+
+#. Label beside page size combo box
+#: src/preferences-dialog.ui:160
+msgid "Page Size"
+msgstr "Размер листа"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:191
+msgid "Front"
+msgstr "Лицевая сторона"
+
+#. Preferences Dialog: Toggle button to select scanning on the back side of a page
+#: src/preferences-dialog.ui:206
+msgid "Back"
+msgstr "Обратная сторона"
+
+#. Preferences Dialog: Toggle button to select scanning on both sides of a page
+#: src/preferences-dialog.ui:221
+msgid "Both"
+msgstr "Обе"
+
+#. Label beside page delay scale
+#: src/preferences-dialog.ui:260
+msgid "Delay"
+msgstr "Задержка"
+
+#. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
+#: src/preferences-dialog.ui:276
+msgid "Multiple pages from flatbed"
+msgstr "Несколько страниц с планшета"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:295
+msgid "3"
+msgstr "3"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:310
+msgid "5"
+msgstr "5"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:326
+msgid "7"
+msgstr "7"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:342
+msgid "10"
+msgstr "10"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:358
+msgid "15"
+msgstr "15"
+
+#. Label after page delay radio buttons
+#: src/preferences-dialog.ui:385
+msgid "Seconds"
+msgstr "Секунд"
+
+#. Preferences Dialog: Tab label for scanning settings
+#: src/preferences-dialog.ui:413
+msgid "Scanning"
+msgstr "Сканирование"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:436
+msgid "_Text Resolution"
+msgstr "Р_азрешение текста"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:452
+msgid "_Photo Resolution"
+msgstr "_Разрешение фотографии"
+
+#. Label beside brightness scale
+#: src/preferences-dialog.ui:505
+msgid "Brightness"
+msgstr "Яркость"
+
+#. Label beside contrast scale
+#: src/preferences-dialog.ui:521
+msgid "Contrast"
+msgstr "Контрастность"
+
+#. Preferences Dialog: Tab for quality settings
+#: src/preferences-dialog.ui:576
+msgid "Quality"
+msgstr "Качество"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/preferences-dialog.vala:77
 msgid "Automatic"
-msgstr "Выбрать автоматически"
+msgstr "Автоматический"
 
-#: ../src/ui.vala:1947
+#: src/preferences-dialog.vala:116
 msgid "Darker"
 msgstr "Темнее"
 
-#: ../src/ui.vala:1949
+#: src/preferences-dialog.vala:118
 msgid "Lighter"
 msgstr "Светлее"
 
-#: ../src/ui.vala:1957
+#: src/preferences-dialog.vala:126
 msgid "Less"
 msgstr "Меньше"
 
-#: ../src/ui.vala:1959
+#: src/preferences-dialog.vala:128
 msgid "More"
 msgstr "Больше"
 
-#: ../src/ui.vala:1967
-msgid "Minimum"
-msgstr "Мин."
+#. Preferences dialog: Label for default resolution in resolution list
+#: src/preferences-dialog.vala:440
+#, c-format
+msgid "%d dpi (default)"
+msgstr "%d dpi (по умолчанию)"
 
-#: ../src/ui.vala:1969
-msgid "Maximum"
-msgstr "Макс."
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: src/preferences-dialog.vala:443
+#, c-format
+msgid "%d dpi (draft)"
+msgstr "%d dpi (черновик)"
 
-#: ../src/ui.vala:2008
-msgid "Saving document..."
-msgstr "Сохранение документа..."
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: src/preferences-dialog.vala:446
+#, c-format
+msgid "%d dpi (high resolution)"
+msgstr "%d dpi (высокое разрешение)"
 
-#: ../src/ui.vala:2173
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: src/preferences-dialog.vala:449
 #, c-format
-msgid "Saving page %d out of %d"
-msgstr "Сохранение страницы %d из %d"
+msgid "%d dpi"
+msgstr "%d dpi"
 
-#~ msgid "4&#xD7;6"
-#~ msgstr "4&#xD7;6"
+#. Error displayed when no scanners to scan with
+#: src/scanner.vala:844
+msgid "No scanners available.  Please connect a scanner."
+msgstr "Нет доступных сканеров. Подключите сканер."
 
-#, c-format
-#~ msgid ""
-#~ "Usage:\n"
-#~ "  %s [DEVICE...] - Scanning utility"
-#~ msgstr ""
-#~ "Использование:\n"
-#~ "  %s [УСТРОЙСТВО...] - Инструмент для сканирования"
+#. Error displayed when cannot connect to scanner
+#: src/scanner.vala:874
+msgid "Unable to connect to scanner"
+msgstr "Не удалось подключиться к сканеру"
 
-#, c-format
-#~ msgid ""
-#~ "GTK+ Options:\n"
-#~ "  --class=CLASS                   Program class as used by the window "
-#~ "manager\n"
-#~ "  --name=NAME                     Program name as used by the window "
-#~ "manager\n"
-#~ "  --screen=SCREEN                 X screen to use\n"
-#~ "  --sync                          Make X calls synchronous\n"
-#~ "  --gtk-module=MODULES            Load additional GTK+ modules\n"
-#~ "  --g-fatal-warnings              Make all warnings fatal"
-#~ msgstr ""
-#~ "Параметры GTK+:\n"
-#~ "  --class=КЛАСС                   Класс программы в оконном менеджере\n"
-#~ "  --name=НАЗВАНИЕ                 Название программы в оконном менеджере\n"
-#~ "  --screen=ЭКРАН                  Используемый экран X\n"
-#~ "  --sync                          Сделать вызовы X синхронными\n"
-#~ "  --gtk-module=МОДУЛИ             Загрузить дополнительные модули GTK+\n"
-#~ "  --g-fatal-warnings              Сделать все предупреждения фатальными"
-
-#~ msgid "Files missing"
-#~ msgstr "Файлы отсутствуют"
-
-#~ msgid "Please check your installation"
-#~ msgstr "Пожалуйста, проверьте правильность установки программы"
-
-#~ msgid "Height of scanned image in pixels"
-#~ msgstr "Высота отсканированного изображения в пикселах"
-
-#~ msgid "Device to scan from"
-#~ msgstr "Устройство сканирования"
-
-#~ msgid "Directory to save files to"
-#~ msgstr "Папка для сохранения файлов"
-
-#~ msgid "Direction of scan"
-#~ msgstr "Направление сканирования"
-
-#~ msgid ""
-#~ "The height of scanned image in pixels. This value is updated to what the "
-#~ "last scanned page was."
-#~ msgstr ""
-#~ "Высота отсканированного изображения в пикселах. Это значение обновляется при "
-#~ "каждом новом сканировании."
-
-#~ msgid ""
-#~ "The direction of the scanner across the scanned page. It can be one of the "
-#~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
-#~ msgstr ""
-#~ "Направление сканирования. Возможны следующие варианты: 'top-to-bottom' "
-#~ "'bottom-to-top' 'left-to-right' 'right-to-left'"
-
-#~ msgid "TRUE if the application window is maximized"
-#~ msgstr "TRUE, если окно приложения развёрнуто на весь экран"
-
-#~ msgid "SANE device to acquire images from."
-#~ msgstr "Устройство SANE для получения изображений."
-
-#~ msgid "Resolution for text scans"
-#~ msgstr "Разрешение для сканирования текста"
-
-#~ msgid "Resolution for photo scans"
-#~ msgstr "Разрешение для сканирования фотографий"
-
-#~ msgid "The resolution in dots-per-inch of the previously scanned image."
-#~ msgstr ""
-#~ "Разрешение в точках на дюйм предыдущего отсканированного изображения."
-
-#~ msgid "Resolution of last scanned image"
-#~ msgstr "Разрешение последнего отсканированного изображения"
-
-#~ msgid "The resolution in dots-per-inch to use when scanning photos."
-#~ msgstr "Разрешение в точках на дюйм при сканировании фотографий."
-
-#~ msgid ""
-#~ "The directory to save files to. Defaults to the documents directory if unset."
-#~ msgstr ""
-#~ "Папка для сохранения файлов. По умолчанию используется папка с документами."
-
-#~ msgid "Type of document being scanned"
-#~ msgstr "Тип сканируемого документа"
-
-#~ msgid "Window height in pixels"
-#~ msgstr "Высота окна в пикселах"
-
-#~ msgid "Window width in pixels"
-#~ msgstr "Ширина окна в пикселах"
+#. Error display when unable to start scan
+#: src/scanner.vala:1227
+msgid "Unable to start scan"
+msgstr "Не удалось начать сканирование"
+
+#. 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 "Показать сообщения отладки"
+
+#: 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:392
+msgid "Failed to scan"
+msgstr "Сканирование не удалось"
+
+#. Attempt to inhibit the screensaver when scanning
+#: src/simple-scan.vala:407
+msgid "Scan in progress"
+msgstr "Выполняется сканирование"
 
+#. Arguments and description for --help text
+#: src/simple-scan.vala:584
+msgid "[DEVICE…] — Scanning utility"
+msgstr "[DEVICE…] — Устройство сканирования"
+
+#. Text printed out when an unknown command-line argument provided
+#: src/simple-scan.vala:595
 #, c-format
-#~ msgid ""
-#~ "Help Options:\n"
-#~ "  -d, --debug                     Print debugging messages\n"
-#~ "  -v, --version                   Show release version\n"
-#~ "  -h, --help                      Show help options\n"
-#~ "  --help-all                      Show all help options\n"
-#~ "  --help-gtk                      Show GTK+ options"
-#~ msgstr ""
-#~ "Использование:\n"
-#~ "  -d, --debug выводить отладочные сообщения\n"
-#~ "  -v, --version показать информацию о версии\n"
-#~ "  -h, --help показать эту справку\n"
-#~ "  --help-all показать все ключи справки\n"
-#~ "  --help-gtk показать ключи GTK+"
-
-#~ msgid ""
-#~ "The width of scanned image in pixels. This value is updated to what the last "
-#~ "scanned page was."
-#~ msgstr ""
-#~ "Ширина отсканированного изображения в пикселах. Это значение обновляется при "
-#~ "каждом новом сканировании."
-
-#~ msgid "The resolution in dots-per-inch to use when scanning text."
-#~ msgstr "Разрешение в точках на дюйм при сканировании текста."
-
-#~ msgid "Width of scanned image in pixels"
-#~ msgstr "Ширина отсканированного изображения в пикселах"
-
-#~ msgid "Scanned Document"
-#~ msgstr "Отсканированный документ"
-
-#~ msgid "Select File _Type"
-#~ msgstr "Выберите _тип файла"
-
-#~ msgid ""
-#~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
-#~ msgstr ""
-#~ "Сторона страницы для сканирования. Может быть: 'с обоих сторон', 'лицевая', "
-#~ "'обратная'"
-
-#~ msgid "Page side to scan"
-#~ msgstr "Сторона страницы для сканирования"
-
-#~ msgid ""
-#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
-#~ msgstr "Ширина бумаги в десятках мм (или 0 для автоматического определения)"
-
-#~ msgid "Height of paper in tenths of a mm"
-#~ msgstr "Высота бумаги в десятых долях мм"
-
-#~ msgid "Width of paper in tenths of a mm"
-#~ msgstr "Ширина бумаги, см"
-
-#~ msgid "The page side to scan."
-#~ msgstr "Сторона страницы для сканирования."
-
-#~ msgid "The direction of the scanner across the scanned page."
-#~ msgstr "Направление сканирования страницы."
-
-#~ msgid ""
-#~ "Type of document being scanned. This setting decides on the scan resolution, "
-#~ "colors and post-processing."
-#~ msgstr ""
-#~ "Тип сканируемого документа. Эта настройка отвечает за разрешение, глубину "
-#~ "цвета и пост-обработку."
-
-#~ msgid ""
-#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
-#~ msgstr "Высота бумаги в десятках мм (или 0 для автоматического определения)."
-
-#~ msgid ""
-#~ "Type of document being scanned. 'text' for text documents, 'photo' for "
-#~ "photos. This setting decides on the scan resolution, colors and post-"
-#~ "processing."
-#~ msgstr ""
-#~ "Тип сканируемого документа. 'Текст' для текстовых документов, 'Фотография' "
-#~ "для фотографий. Выбор типа определяет разрешение, цвета и пост-обработку при "
-#~ "сканировании."
-
-#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
-#~ msgstr "Значение яркости от -100 до 100 (0 — без изменений)."
-
-#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
-#~ msgstr "Значение контрастности от -100 до 100 (0 — без изменений)."
-
-#~ msgid "Contrast of scan"
-#~ msgstr "Контрастность изображения"
-
-#~ msgid "Brightness of scan"
-#~ msgstr "Яркость изображения"
-
-#~ msgid "Quality value to use for JPEG compression."
-#~ msgstr "Значение качества, используемого для сжатия JPEG."
-
-#~ msgid "Quality value to use for JPEG compression"
-#~ msgstr "Значение качества, используемого для сжатия JPEG"
+msgid "Run “%s --help” to see a full list of available command line options."
+msgstr "Выполните «%s --help», чтобы вывести полный список доступных опций."
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..f6154b4 100644
--- a/po/sd.po
+++ b/po/sd.po
@@ -7,296 +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"
+"POT-Creation-Date: 2017-04-16 08:54-0400\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"
+"Language: sd\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-25 06:10+0000\n"
+"X-Generator: Launchpad (build 18361)\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
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: 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 "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:498
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:509
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:520
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:531
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. 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 "دستاويز کي فائل ۾ سانڍيو"
 
-#: ../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 "ڪاٽيو"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: 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 "دستاويزات اسڪين ڪريو"
 
@@ -308,7 +322,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 +330,207 @@ 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:844
 msgid "No scanners available.  Please connect a scanner."
 msgstr ""
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:874
 msgid "Unable to connect to scanner"
 msgstr ""
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1227
 msgid "Unable to start scan"
 msgstr ""
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: 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
+#: 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:332 src/ui.vala:1655 src/ui.vala:1935
 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:341
 #, 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:389
 msgid "No scanners detected"
 msgstr ""
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:391
 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:396
 msgid "Additional software needed"
 msgstr ""
 
 #. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:398
 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: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 ""
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:522
 msgid "Scanned Document.pdf"
 msgstr "اسڪين دستاويز.pdf"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:528
 msgid "Image Files"
 msgstr "شڪل فائلون"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:534
 msgid "All Files"
 msgstr "تمام فائلون"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:543
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:549
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:555
 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: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:650
+#: src/ui.vala:698
 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:721
 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:763
 msgid "Save current document?"
 msgstr "هاڻوڪو دستاويز سانڍيو؟"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:765
 msgid "Discard Changes"
 msgstr "تبديليون منسوخ ڪريو"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:1056
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1068
 msgid "Unable to open image preview application"
 msgstr ""
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1270
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1280
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1290
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1300
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1504
 msgid "Unable to open help file"
 msgstr "سهڪاري فائل ڀرڻ ۾ ناڪام"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: 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"
@@ -522,205 +547,205 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1528
 msgid "About Simple Scan"
 msgstr "سادي اسڪين بابت"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1531
 msgid "Simple document scanning tool"
 msgstr "سادو دستاويز اسڪين ڪندڙ اوزار"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1540
 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:1562
 msgid "Save document before quitting?"
 msgstr "نڪرڻ کان پهرين دستاويز سانڍيو؟"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1564
 msgid "Quit without Saving"
 msgstr "سانڍڻ بغير نڪرو"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1632
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1634
 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:1638
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1640
 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:1644
 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:1649
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1651
 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:1655
 msgid "Install drivers"
 msgstr ""
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1686
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1698
 msgid "Installing drivers..."
 msgstr ""
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1706
 msgid "Drivers installed successfully!"
 msgstr ""
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1716
 #, 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:1722
 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:1729
 #, 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:1833
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1836
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1839
 #, 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: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 ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1937
 msgid "Change _Scanner"
 msgstr "اسڪينر _تبديل ڪريو"
 
 #. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1939
 msgid "_Install Drivers"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: 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/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..a83f747 100644
--- a/po/se.po
+++ b/po/se.po
@@ -7,296 +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"
+"POT-Creation-Date: 2017-04-16 08:54-0400\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"
+"Language: se\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-25 06:10+0000\n"
+"X-Generator: Launchpad (build 18361)\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:231 src/simple-scan.ui:815 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:247
 msgid "_Document"
 msgstr "_Dokumeanta"
 
 #. 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 "Teaksta"
 
-#: 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 "Fotografiija"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: 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 "_E-boasta"
 
 #. 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 "_Čuohpa"
 
 #. 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 "Sirdde olgešguvlui"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:630
 msgid "_Help"
 msgstr "_Veahkki"
 
 #. 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 "Ođđa"
 
 #. 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 "Oza"
 
 #. 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 ""
 
-#: ../src/ui.vala:1842
+#: src/simple-scan.ui:715 src/ui.vala:1892
 msgid "Save"
 msgstr "Vurke"
 
 #. 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 "Bisset"
 
 #. 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 "Jorat olgešguvlui"
 
-#: 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 ""
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:1003 src/ui.vala:1898
 msgid "Preferences"
 msgstr "Oidimat"
 
 #. 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 ""
 
@@ -308,7 +322,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 +330,207 @@ 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:844
 msgid "No scanners available.  Please connect a scanner."
 msgstr ""
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:874
 msgid "Unable to connect to scanner"
 msgstr ""
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1227
 msgid "Unable to start scan"
 msgstr ""
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: 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
+#: 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:332 src/ui.vala:1655 src/ui.vala:1935
 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:341
 #, 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:389
 msgid "No scanners detected"
 msgstr ""
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:391
 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:396
 msgid "Additional software needed"
 msgstr ""
 
 #. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:398
 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:510
 msgid "Save As..."
 msgstr "Vurke nugo …"
 
-#: ../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 ""
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:522
 msgid "Scanned Document.pdf"
 msgstr ""
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:528
 msgid "Image Files"
 msgstr ""
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:534
 msgid "All Files"
 msgstr "Buot fiillat"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:543
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:549
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:555
 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: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:650
+#: src/ui.vala:698
 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:721
 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:763
 msgid "Save current document?"
 msgstr ""
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:765
 msgid "Discard Changes"
 msgstr ""
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:1056
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1068
 msgid "Unable to open image preview application"
 msgstr ""
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1270
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1280
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1290
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1300
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1504
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: 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"
@@ -522,205 +547,205 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1528
 msgid "About Simple Scan"
 msgstr "Simple Scan-dieđut"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1531
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1540
 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:1562
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1564
 msgid "Quit without Saving"
 msgstr ""
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1632
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1634
 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:1638
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1640
 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:1644
 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:1649
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1651
 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:1655
 msgid "Install drivers"
 msgstr ""
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1686
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1698
 msgid "Installing drivers..."
 msgstr ""
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1706
 msgid "Drivers installed successfully!"
 msgstr ""
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1716
 #, 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:1722
 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:1729
 #, 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:1833
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1836
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1839
 #, 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: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 ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1937
 msgid "Change _Scanner"
 msgstr ""
 
 #. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1939
 msgid "_Install Drivers"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1945
 msgid "Automatic"
 msgstr "Automáhtalaš"
 
-#: ../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/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..5601070 100644
--- a/po/shn.po
+++ b/po/shn.po
@@ -7,296 +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"
+"POT-Creation-Date: 2017-04-16 08:54-0400\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"
+"Language: shn\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-25 06:10+0000\n"
+"X-Generator: Launchpad (build 18361)\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
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: 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 ""
 
-#: ../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 ""
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: 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 ""
 
@@ -308,7 +322,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 +330,207 @@ 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:844
 msgid "No scanners available.  Please connect a scanner."
 msgstr ""
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:874
 msgid "Unable to connect to scanner"
 msgstr ""
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1227
 msgid "Unable to start scan"
 msgstr ""
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: 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
+#: 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:332 src/ui.vala:1655 src/ui.vala:1935
 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:341
 #, 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:389
 msgid "No scanners detected"
 msgstr ""
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:391
 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:396
 msgid "Additional software needed"
 msgstr ""
 
 #. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:398
 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: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 ""
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:522
 msgid "Scanned Document.pdf"
 msgstr ""
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:528
 msgid "Image Files"
 msgstr ""
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:534
 msgid "All Files"
 msgstr ""
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:543
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:549
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:555
 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: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:650
+#: src/ui.vala:698
 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:721
 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:763
 msgid "Save current document?"
 msgstr ""
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:765
 msgid "Discard Changes"
 msgstr ""
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:1056
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1068
 msgid "Unable to open image preview application"
 msgstr ""
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1270
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1280
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1290
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1300
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1504
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: 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"
@@ -522,205 +547,205 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1528
 msgid "About Simple Scan"
 msgstr ""
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1531
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1540
 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:1562
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1564
 msgid "Quit without Saving"
 msgstr ""
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1632
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1634
 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:1638
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1640
 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:1644
 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:1649
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1651
 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:1655
 msgid "Install drivers"
 msgstr ""
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1686
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1698
 msgid "Installing drivers..."
 msgstr ""
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1706
 msgid "Drivers installed successfully!"
 msgstr ""
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1716
 #, 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:1722
 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:1729
 #, 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:1833
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1836
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1839
 #, 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: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 ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1937
 msgid "Change _Scanner"
 msgstr ""
 
 #. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1939
 msgid "_Install Drivers"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: 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/simple-scan.pot b/po/simple-scan.pot
deleted file mode 100644
index a6f23dc..0000000
--- a/po/simple-scan.pot
+++ /dev/null
@@ -1,665 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Robert Ancell <robert.ancell@canonical.com>
-# This file is distributed under the same license as the simple-scan package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: simple-scan 3.21.1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-29 12:47+1200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Button to submit authorization dialog
-#: data/simple-scan.ui:24
-msgid "_Authorize"
-msgstr ""
-
-#. Label beside username entry
-#: data/simple-scan.ui:102
-msgid "_Username for resource:"
-msgstr ""
-
-#. Label beside password entry
-#: data/simple-scan.ui:117
-msgid "_Password:"
-msgstr ""
-
-#. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
-msgid "Front and Back"
-msgstr ""
-
-#. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
-msgid "Front"
-msgstr ""
-
-#. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
-msgid "Back"
-msgstr ""
-
-#. Title of scan window
-#: data/simple-scan.ui:225 data/simple-scan.ui:809
-#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
-msgid "Simple Scan"
-msgstr ""
-
-#. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
-msgid "_Document"
-msgstr ""
-
-#. Scan menu item
-#: data/simple-scan.ui:260
-msgid "Sc_an"
-msgstr ""
-
-#. Scan menu item to scan a single page from the scanner
-#. Toolbar scan menu item to scan a single page from the scanner
-#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
-msgid "Single _Page"
-msgstr ""
-
-#. Scan menu item to scan all pages from a document feeder
-#. Toolbar scan menu item to scan all pages from a document feeder
-#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
-msgid "All Pages From _Feeder"
-msgstr ""
-
-#. Menu entry to stop current scan
-#: data/simple-scan.ui:294
-msgid "_Stop Scan"
-msgstr ""
-
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
-msgid "Text"
-msgstr ""
-
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
-msgid "Photo"
-msgstr ""
-
-#. Menu item to reorder pages
-#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
-msgid "Reorder Pages"
-msgstr ""
-
-#. Label on email menu item
-#: data/simple-scan.ui:367
-msgid "_Email"
-msgstr ""
-
-#. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
-msgid "_Page"
-msgstr ""
-
-#. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
-msgid "Rotate _Left"
-msgstr ""
-
-#. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
-msgid "Rotate _Right"
-msgstr ""
-
-#. Label for page crop submenu
-#: data/simple-scan.ui:460
-msgid "_Crop"
-msgstr ""
-
-#. Radio button for no crop
-#: data/simple-scan.ui:470
-msgid "_None"
-msgstr ""
-
-#. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
-msgid "A_4"
-msgstr ""
-
-#. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
-msgid "A_5"
-msgstr ""
-
-#. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
-msgid "A_6"
-msgstr ""
-
-#. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
-msgid "_Letter"
-msgstr ""
-
-#. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
-msgid "Le_gal"
-msgstr ""
-
-#. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
-msgid "4×6"
-msgstr ""
-
-#. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
-msgid "_Custom"
-msgstr ""
-
-#. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
-msgid "_Rotate Crop"
-msgstr ""
-
-#. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
-msgid "Move Left"
-msgstr ""
-
-#. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
-msgid "Move Right"
-msgstr ""
-
-#. Label on help menu
-#: data/simple-scan.ui:624
-msgid "_Help"
-msgstr ""
-
-#. Help|Contents menu
-#: data/simple-scan.ui:632
-msgid "_Contents"
-msgstr ""
-
-#. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
-msgid "Start a new document"
-msgstr ""
-
-#: data/simple-scan.ui:675
-msgid "New"
-msgstr ""
-
-#. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
-msgid "Scan a single page from the scanner"
-msgstr ""
-
-#. Label on scan toolbar item
-#: data/simple-scan.ui:691 data/simple-scan.ui:837
-msgid "Scan"
-msgstr ""
-
-#. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
-msgid "Save document to a file"
-msgstr ""
-
-#: data/simple-scan.ui:709 src/ui.vala:1842
-msgid "Save"
-msgstr ""
-
-#. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
-msgid "Stop the current scan"
-msgstr ""
-
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
-msgid "Stop"
-msgstr ""
-
-#. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr ""
-
-#. Label on rotate page left (anti-clockwise) item
-#: data/simple-scan.ui:750
-msgid "Rotate Left"
-msgstr ""
-
-#. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
-msgid "Rotate the page to the right (clockwise)"
-msgstr ""
-
-#. Label on rotate page right (clockwise) item
-#: data/simple-scan.ui:765
-msgid "Rotate Right"
-msgstr ""
-
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
-msgid "Crop the selected page"
-msgstr ""
-
-#: data/simple-scan.ui:781
-msgid "Crop"
-msgstr ""
-
-#. Title of preferences dialog
-#: data/simple-scan.ui:997 src/ui.vala:1849
-msgid "Preferences"
-msgstr ""
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1048
-msgid "Scan S_ource:"
-msgstr ""
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1079
-msgid "_Text Resolution:"
-msgstr ""
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1095
-msgid "_Photo Resolution:"
-msgstr ""
-
-#. Label beside scan side combo box
-#: data/simple-scan.ui:1139
-msgid "Scan Side:"
-msgstr ""
-
-#. Label beside page size combo box
-#: data/simple-scan.ui:1169
-msgid "Page Size:"
-msgstr ""
-
-#. Label beside brightness scale
-#: data/simple-scan.ui:1199
-msgid "Brightness:"
-msgstr ""
-
-#. Label beside contrast scale
-#: data/simple-scan.ui:1229
-msgid "Contrast:"
-msgstr ""
-
-#. Label beside quality scale
-#: data/simple-scan.ui:1260
-msgid "Quality:"
-msgstr ""
-
-#: data/simple-scan.desktop.in:4
-msgid "Document Scanner"
-msgstr ""
-
-#: data/simple-scan.desktop.in:5
-msgid "Scan Documents"
-msgstr ""
-
-#: data/simple-scan.desktop.in:6
-msgid "scan;scanner;flatbed;adf;"
-msgstr ""
-
-#: data/simple-scan.desktop.in:8
-msgid "scanner"
-msgstr ""
-
-#: data/simple-scan.appdata.xml.in:8
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-
-#: data/simple-scan.appdata.xml.in:13
-msgid "Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
-
-#: src/scanner.vala:841
-msgid "No scanners available.  Please connect a scanner."
-msgstr ""
-
-#: src/scanner.vala:871
-msgid "Unable to connect to scanner"
-msgstr ""
-
-#: src/scanner.vala:1223
-msgid "Unable to start scan"
-msgstr ""
-
-#: src/scanner.vala:1236 src/scanner.vala:1333
-msgid "Error communicating with scanner"
-msgstr ""
-
-#: src/simple-scan.vala:21
-msgid "Show release version"
-msgstr ""
-
-#: src/simple-scan.vala:24
-msgid "Print debugging messages"
-msgstr ""
-
-#: src/simple-scan.vala:26
-msgid "Fix PDF files generated with older versions of Simple Scan"
-msgstr ""
-
-#: src/simple-scan.vala:391
-msgid "Failed to scan"
-msgstr ""
-
-#: src/simple-scan.vala:621
-msgid "[DEVICE...] - Scanning utility"
-msgstr ""
-
-#: src/simple-scan.vala:632
-#, c-format
-msgid "Run '%s --help' to see a full list of available command line options."
-msgstr ""
-
-#: src/ui.vala:318 src/ui.vala:1602 src/ui.vala:1887
-msgid "_Close"
-msgstr ""
-
-#: src/ui.vala:327
-#, c-format
-msgid "Username and password required to access '%s'"
-msgstr ""
-
-#: src/ui.vala:375
-msgid "No scanners detected"
-msgstr ""
-
-#: src/ui.vala:377
-msgid "Please check your scanner is connected and powered on"
-msgstr ""
-
-#: src/ui.vala:382
-msgid "Additional software needed"
-msgstr ""
-
-#: src/ui.vala:384
-msgid "You need to install driver software for your scanner."
-msgstr ""
-
-#: src/ui.vala:506 src/ui.vala:1843
-msgid "Save As..."
-msgstr ""
-
-#: src/ui.vala:509 src/ui.vala:675
-msgid "_Cancel"
-msgstr ""
-
-#: src/ui.vala:510 src/ui.vala:676
-msgid "_Save"
-msgstr ""
-
-#: src/ui.vala:516
-msgid "Scanned Document.pdf"
-msgstr ""
-
-#: src/ui.vala:521
-msgid "Image Files"
-msgstr ""
-
-#: src/ui.vala:527
-msgid "All Files"
-msgstr ""
-
-#: src/ui.vala:536
-msgid "PDF (multi-page document)"
-msgstr ""
-
-#: src/ui.vala:542
-msgid "JPEG (compressed)"
-msgstr ""
-
-#: src/ui.vala:548
-msgid "PNG (lossless)"
-msgstr ""
-
-#: src/ui.vala:557
-msgid "File format:"
-msgstr ""
-
-#: src/ui.vala:650
-msgid "Failed to save file"
-msgstr ""
-
-#: src/ui.vala:673
-msgid "If you don't save, changes will be permanently lost."
-msgstr ""
-
-#: src/ui.vala:708
-msgid "Save current document?"
-msgstr ""
-
-#: src/ui.vala:710
-msgid "Discard Changes"
-msgstr ""
-
-#: src/ui.vala:992
-msgid "Unable to save image for preview"
-msgstr ""
-
-#: src/ui.vala:1004
-msgid "Unable to open image preview application"
-msgstr ""
-
-#: src/ui.vala:1206
-msgid "Combine sides"
-msgstr ""
-
-#: src/ui.vala:1216
-msgid "Combine sides (reverse)"
-msgstr ""
-
-#: src/ui.vala:1226
-msgid "Reverse"
-msgstr ""
-
-#: src/ui.vala:1236
-msgid "Keep unchanged"
-msgstr ""
-
-#: src/ui.vala:1451
-msgid "Unable to open help file"
-msgstr ""
-
-#: src/ui.vala:1472
-msgid ""
-"This program is free software: you can redistribute it and/or modify\n"
-"it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation, either version 3 of the License, or\n"
-"(at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful,\n"
-"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program.  If not, see <http://www.gnu.org/licenses/>."
-msgstr ""
-
-#: src/ui.vala:1475
-msgid "About Simple Scan"
-msgstr ""
-
-#: src/ui.vala:1478
-msgid "Simple document scanning tool"
-msgstr ""
-
-#: src/ui.vala:1487
-msgid "translator-credits"
-msgstr ""
-
-#: src/ui.vala:1509
-msgid "Save document before quitting?"
-msgstr ""
-
-#: src/ui.vala:1511
-msgid "Quit without Saving"
-msgstr ""
-
-#: src/ui.vala:1579
-msgid "You appear to have a Brother scanner."
-msgstr ""
-
-#: src/ui.vala:1581
-msgid ""
-"Drivers for this are available on the <a href=\"http://support.brother.com"
-"\">Brother website</a>."
-msgstr ""
-
-#: src/ui.vala:1585
-msgid "You appear to have a Samsung scanner."
-msgstr ""
-
-#: src/ui.vala:1587
-msgid ""
-"Drivers for this are available on the <a href=\"http://samsung.com/support"
-"\">Samsung website</a>."
-msgstr ""
-
-#: src/ui.vala:1591
-msgid "You appear to have an HP scanner."
-msgstr ""
-
-#: src/ui.vala:1596
-msgid "You appear to have an Epson scanner."
-msgstr ""
-
-#: src/ui.vala:1598
-msgid ""
-"Drivers for this are available on the <a href=\"http://support.epson.com"
-"\">Epson website</a>."
-msgstr ""
-
-#: src/ui.vala:1602
-msgid "Install drivers"
-msgstr ""
-
-#: src/ui.vala:1633
-msgid "Once installed you will need to restart Simple Scan."
-msgstr ""
-
-#: src/ui.vala:1645
-msgid "Installing drivers..."
-msgstr ""
-
-#: src/ui.vala:1653
-msgid "Drivers installed successfully!"
-msgstr ""
-
-#: src/ui.vala:1663
-#, c-format
-msgid "Failed to install drivers (error code %d)."
-msgstr ""
-
-#: src/ui.vala:1669
-msgid "Failed to install drivers."
-msgstr ""
-
-#: src/ui.vala:1676
-#, c-format
-msgid "You need to install the %s package(s)."
-msgstr ""
-
-#: src/ui.vala:1784
-#, c-format
-msgid "%d dpi (default)"
-msgstr ""
-
-#: src/ui.vala:1787
-#, c-format
-msgid "%d dpi (draft)"
-msgstr ""
-
-#: src/ui.vala:1790
-#, c-format
-msgid "%d dpi (high resolution)"
-msgstr ""
-
-#: src/ui.vala:1793
-#, c-format
-msgid "%d dpi"
-msgstr ""
-
-#: src/ui.vala:1835
-msgid "New Document"
-msgstr ""
-
-#: src/ui.vala:1840
-msgid "Document"
-msgstr ""
-
-#: src/ui.vala:1844
-msgid "Email..."
-msgstr ""
-
-#: src/ui.vala:1845
-msgid "Print..."
-msgstr ""
-
-#: src/ui.vala:1853
-msgid "Help"
-msgstr ""
-
-#: src/ui.vala:1854
-msgid "About"
-msgstr ""
-
-#: src/ui.vala:1855
-msgid "Quit"
-msgstr ""
-
-#: src/ui.vala:1889
-msgid "Change _Scanner"
-msgstr ""
-
-#: src/ui.vala:1891
-msgid "_Install Drivers"
-msgstr ""
-
-#: src/ui.vala:1897
-msgid "Automatic"
-msgstr ""
-
-#: src/ui.vala:1947
-msgid "Darker"
-msgstr ""
-
-#: src/ui.vala:1949
-msgid "Lighter"
-msgstr ""
-
-#: src/ui.vala:1957
-msgid "Less"
-msgstr ""
-
-#: src/ui.vala:1959
-msgid "More"
-msgstr ""
-
-#: src/ui.vala:1967
-msgid "Minimum"
-msgstr ""
-
-#: src/ui.vala:1969
-msgid "Maximum"
-msgstr ""
-
-#: src/ui.vala:2008
-msgid "Saving document..."
-msgstr ""
-
-#: src/ui.vala:2173
-#, c-format
-msgid "Saving page %d out of %d"
-msgstr ""
diff --git a/po/sk.gmo b/po/sk.gmo
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..74b6601 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,518 +7,526 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-07-29 12:47+1200\n"
-"PO-Revision-Date: 2016-07-29 05:59+0000\n"
-"Last-Translator: Dusan Kazik <prescott66@gmail.com>\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
+"product=simple-scan&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-08-13 21:51+0000\n"
+"PO-Revision-Date: 2017-08-18 18:03+0200\n"
+"Last-Translator: Dušan Kazik <prescott66@gmail.com>\n"
 "Language-Team: slovenčina <>\n"
+"Language: sk\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"
-"Language: sk\n"
+"X-Launchpad-Export-Date: 2017-04-25 06:10+0000\n"
+"X-Generator: Poedit 2.0.3\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#. Button to submit authorization dialog
-#: data/simple-scan.ui:24
-msgid "_Authorize"
-msgstr "Ove_riť"
+#: data/org.gnome.SimpleScan.gschema.xml:11
+msgid "Device to scan from"
+msgstr "Zariadenie z ktorého skenovať"
 
-#. Label beside username entry
-#: data/simple-scan.ui:102
-msgid "_Username for resource:"
-msgstr "_Užívateľské meno pre zdroj:"
+#: data/org.gnome.SimpleScan.gschema.xml:12
+msgid "SANE device to acquire images from."
+msgstr "Zariadenie SANE z ktorého získať obrázky."
 
-#. Label beside password entry
-#: data/simple-scan.ui:117
-msgid "_Password:"
-msgstr "_Heslo:"
+#: data/org.gnome.SimpleScan.gschema.xml:20
+msgid "Type of document being scanned"
+msgstr "Druh dokumentu ktorý sa skenuje"
 
-#. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
-msgid "Front and Back"
-msgstr "Predná a zadná strana"
+#: data/org.gnome.SimpleScan.gschema.xml:21
+msgid ""
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+msgstr ""
+"Typ dokumentu ktorý sa skenuje. Toto nastavenie určuje rozlíšenie, farby a "
+"spracovanie tohto skenu."
 
-#. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
-msgid "Front"
-msgstr "Predná strana"
+#: data/org.gnome.SimpleScan.gschema.xml:25
+msgid "Width of paper in tenths of a mm"
+msgstr "Šírka papiera v desatinách mm"
 
-#. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
-msgid "Back"
-msgstr "Zadná strana"
+#: data/org.gnome.SimpleScan.gschema.xml:26
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"Šírka papiera v desatinách mm (alebo hodnota 0 pre automatické rozpoznanie "
+"papiera)"
+
+#: data/org.gnome.SimpleScan.gschema.xml:30
+msgid "Height of paper in tenths of a mm"
+msgstr "Výška papiera v desatinách mm"
+
+#: data/org.gnome.SimpleScan.gschema.xml:31
+msgid ""
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"Výška papiera v desatinách mm (alebo hodnota 0 pre automatické rozpoznanie "
+"papiera)"
+
+#: data/org.gnome.SimpleScan.gschema.xml:35
+msgid "Brightness of scan"
+msgstr "Jas skenu"
+
+#: data/org.gnome.SimpleScan.gschema.xml:36
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr "Úprava jasu od -100 do 100 (0 znamená bez úpravy)"
+
+#: data/org.gnome.SimpleScan.gschema.xml:40
+msgid "Contrast of scan"
+msgstr "Kontrast skenu"
+
+#: data/org.gnome.SimpleScan.gschema.xml:41
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr "Úprava kontrastu od -100 do 100 (0 znamená bez úpravy)"
+
+#: data/org.gnome.SimpleScan.gschema.xml:45
+msgid "Resolution for text scans"
+msgstr "Rozlíšenie pre skenovanie textu"
+
+#: data/org.gnome.SimpleScan.gschema.xml:46
+msgid "The resolution in dots-per-inch to use when scanning text."
+msgstr ""
+"Rozlíšenie v bodoch na palec (DPI), ktoré sa má použiť pri skenovaní textu."
+
+#: data/org.gnome.SimpleScan.gschema.xml:50
+msgid "Resolution for photo scans"
+msgstr "Rozlíšenie pre skenovanie fotografií"
+
+#: data/org.gnome.SimpleScan.gschema.xml:51
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr ""
+"Rozlíšenie v bodoch na palec (DPI), ktoré sa má použiť pri skenovaní "
+"fotografií."
+
+#: data/org.gnome.SimpleScan.gschema.xml:55
+msgid "Page side to scan"
+msgstr "Strana stránky na skenovanie"
+
+#: data/org.gnome.SimpleScan.gschema.xml:56
+msgid "The page side to scan."
+msgstr "Strana stránky, ktorá sa má naskenovať."
+
+#: data/org.gnome.SimpleScan.gschema.xml:60
+msgid "Directory to save files to"
+msgstr "Adresár na ukladanie súborov"
+
+#: data/org.gnome.SimpleScan.gschema.xml:61
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+"Adresár, do ktorého sa majú ukladať súbory. Ak je nenastavený, použije sa "
+"predvolený adresár dokumentov."
+
+#: data/org.gnome.SimpleScan.gschema.xml:66
+msgid "Quality value to use for JPEG compression"
+msgstr "Hodnota kvality komprimácie obrázkov JPEG"
+
+#: data/org.gnome.SimpleScan.gschema.xml:67
+msgid "Quality value to use for JPEG compression."
+msgstr "Hodnota kvality, ktorá sa má použiť pre komprimáciu obrázkov JPEG."
+
+#: data/org.gnome.SimpleScan.gschema.xml:72
+msgid "Delay in millisecond between pages"
+msgstr "Oneskorenie medzi stránkami v milisekundách"
+
+#: data/org.gnome.SimpleScan.gschema.xml:73
+msgid "Delay in millisecond between pages."
+msgstr "Oneskorenie medzi stránkami v milisekundách."
 
 #. 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
+#. Set HeaderBar title here because Glade doesn't keep it translated
+#. https://bugzilla.gnome.org/show_bug.cgi?id=782753
+#. Title of scan window
+#: data/simple-scan.appdata.xml.in:6 data/simple-scan.desktop.in:3
+#: src/app-window.ui:76 src/app-window.vala:1560
 msgid "Simple Scan"
 msgstr "Jednoduché skenovanie"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
-msgid "_Document"
-msgstr "_Dokument"
+#: data/simple-scan.appdata.xml.in:7 data/simple-scan.desktop.in:5
+msgid "Scan Documents"
+msgstr "Skenuje dokumenty"
 
-#. Scan menu item
-#: data/simple-scan.ui:260
-msgid "Sc_an"
-msgstr "_Skenovať"
+#: 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 "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+"Skutočne jednoduchý spôsob ako naskenovať dokumenty aj fotografie. Môžete "
+"orezať nevhodné časti fotografie a otočiť ich podľa potreby. Vaše oskenované "
+"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:14
+msgid "Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+"Aplikácia Jednoduché skenovanie využíva rozhranie SANE, kvôli podpore "
+"väčšiny existujúcich skenerov."
+
+#: data/simple-scan.desktop.in:4
+msgid "Document Scanner"
+msgstr "Skener dokumentov"
+
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: data/simple-scan.desktop.in:7
+msgid "scan;scanner;flatbed;adf;"
+msgstr "skenovanie;skenovať;skener;plochý;adf;"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: data/simple-scan.desktop.in:10
+msgid "scanner"
+msgstr "scanner"
 
+#. Toolbar scan menu item to scan a single page from the scanner
 #. 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/app-window.ui:22 src/app-window.ui:123 src/app-window.ui:820
 msgid "Single _Page"
 msgstr "_Jedna stránka"
 
+#. Toolbar scan menu item to scan all pages from a document feeder
 #. 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/app-window.ui:31 src/app-window.ui:133 src/app-window.ui:829
 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
-msgid "_Stop Scan"
-msgstr "_Zastaviť skenovanie"
+#. Toolbar scan menu item to scan continuously from the flatbed
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/app-window.ui:40 src/app-window.ui:143 src/app-window.ui:838
+msgid "_Multiple Pages From Flatbed"
+msgstr "_Viacero stránok z plochého skenera"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:853
 msgid "Text"
 msgstr "Text"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:863
 msgid "Photo"
 msgstr "Fotografia"
 
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: src/app-window.ui:91
+msgid "_Document"
+msgstr "_Dokument"
+
+#. Scan menu item
+#: src/app-window.ui:110
+msgid "Sc_an"
+msgstr "_Skenovať"
+
+#. Menu entry to stop current scan
+#: src/app-window.ui:154
+msgid "_Stop Scan"
+msgstr "_Zastaviť skenovanie"
+
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/app-window.ui:196 src/app-window.vala:967 src/app-window.vala:1590
 msgid "Reorder Pages"
 msgstr "Zmeniť poradie stránok"
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/app-window.ui:215
 msgid "_Email"
 msgstr "_Email"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/app-window.ui:280
 msgid "_Page"
 msgstr "_Stránka"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/app-window.ui:290
 msgid "Rotate _Left"
 msgstr "Otočiť _doľava"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/app-window.ui:300
 msgid "Rotate _Right"
 msgstr "Otočiť do_prava"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/app-window.ui:310
 msgid "_Crop"
 msgstr "_Orezanie"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/app-window.ui:320
 msgid "_None"
 msgstr "Žia_dne"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/app-window.ui:331
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/app-window.ui:342
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/app-window.ui:353
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/app-window.ui:364
 msgid "_Letter"
 msgstr "US _List"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/app-window.ui:375
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/app-window.ui:386
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/app-window.ui:397
 msgid "_Custom"
 msgstr "_Vlastné"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/app-window.ui:415
 msgid "_Rotate Crop"
 msgstr "_Otočiť výrez"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/app-window.ui:428
 msgid "Move Left"
 msgstr "Presunúť doľava"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/app-window.ui:437
 msgid "Move Right"
 msgstr "Presunúť doprava"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/app-window.ui:474
 msgid "_Help"
 msgstr "_Pomocník"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/app-window.ui:482
 msgid "_Contents"
 msgstr "_Obsah"
 
-#. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
-msgid "Start a new document"
-msgstr "Vytvorí nový dokument"
-
-#: data/simple-scan.ui:675
-msgid "New"
-msgstr "Nový"
-
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/app-window.ui:520 src/app-window.ui:720
 msgid "Scan a single page from the scanner"
-msgstr "Oskenuje jednu stránku zo skeneru"
+msgstr "Naskenuje jednu stránku zo skeneru"
 
 #. Label on scan toolbar item
-#: data/simple-scan.ui:691 data/simple-scan.ui:837
+#: src/app-window.ui:522 src/app-window.ui:716
 msgid "Scan"
 msgstr "Skenovať"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/app-window.ui:538 src/app-window.ui:787
 msgid "Save document to a file"
 msgstr "Uloží dokument do súboru"
 
-#: ../src/ui.vala:1842
+#: src/app-window.ui:540
 msgid "Save"
 msgstr "Uložiť"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/app-window.ui:555 src/app-window.ui:700
 msgid "Stop the current scan"
 msgstr "Zastaví aktuálne skenovanie"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/app-window.ui:556 src/app-window.ui:697
 msgid "Stop"
 msgstr "Zastaviť"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "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
-msgid "Rotate Left"
-msgstr "Otočiť doľava"
+#. Label shown when searching for scanners
+#: src/app-window.ui:611
+msgid "Searching for Scanners…"
+msgstr "Vyhľadávajú sa skenery…"
 
-#. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
-msgid "Rotate the page to the right (clockwise)"
-msgstr "Otočí stránku doprava (v smere hodinových ručičiek)"
-
-#. Label on rotate page right (clockwise) item
-#: data/simple-scan.ui:765
-msgid "Rotate Right"
-msgstr "Otočiť doprava"
-
-# tooltip
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
-msgid "Crop the selected page"
-msgstr "Oreže vybratú stránku"
-
-#: data/simple-scan.ui:781
-msgid "Crop"
-msgstr "Orezanie"
-
-#: ../src/ui.vala:1849
-msgid "Preferences"
-msgstr "Nastavenia"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1048
-msgid "Scan S_ource:"
-msgstr "Zdroj s_kenovania:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1079
-msgid "_Text Resolution:"
-msgstr "Rozlíšenie _textu:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1095
-msgid "_Photo Resolution:"
-msgstr "Rozlíšenie _fotografií:"
-
-#. Label beside scan side combo box
-#: data/simple-scan.ui:1139
-msgid "Scan Side:"
-msgstr "Skenovaná strana:"
-
-#. Label beside page size combo box
-#: data/simple-scan.ui:1169
-msgid "Page Size:"
-msgstr "Veľkosť stránky:"
-
-#. Label beside brightness scale
-#: data/simple-scan.ui:1199
-msgid "Brightness:"
-msgstr "Jas:"
-
-#. Label beside contrast scale
-#: data/simple-scan.ui:1229
-msgid "Contrast:"
-msgstr "Kontrast:"
-
-#. Label beside quality scale
-#: data/simple-scan.ui:1260
-msgid "Quality:"
-msgstr "Kvalita:"
-
-#: data/simple-scan.desktop.in:4
-msgid "Document Scanner"
-msgstr "Skener dokumentov"
-
-#: data/simple-scan.desktop.in:5
-msgid "Scan Documents"
-msgstr "Skenuje dokumenty"
+#: src/app-window.vala:237 src/app-window.vala:1380
+msgid "_Close"
+msgstr "_Zavrieť"
 
-#: data/simple-scan.desktop.in:6
-msgid "scan;scanner;flatbed;adf;"
-msgstr "skenovanie;skenovať;skener;plochý;adf;"
+#. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
+#: src/app-window.vala:246
+#, 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“"
 
-#: data/simple-scan.desktop.in:8
-msgid "scanner"
-msgstr "skener"
+#. Label shown when detected a scanner
+#: src/app-window.vala:266 src/app-window.vala:584
+msgid "Ready to Scan"
+msgstr "Skenovanie pripravené"
 
-#: data/simple-scan.appdata.xml.in:8
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-"Skutočne jednoduchý spôsob ako oskenovať dokumenty aj fotografie. Môžete "
-"orezať nevhodné časti fotografie a otočiť ich podľa potreby. Vaše oskenované "
-"dokumenty môžete vytlačiť, exportovať ich do pdf, alebo ich uložiť v rôznych "
-"formátoch obrázkov."
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: src/app-window.vala:273
+msgid "Additional software needed"
+msgstr "Vyžaduje sa dodatočný softvér"
 
-#: data/simple-scan.appdata.xml.in:13
+#. Instructions to install driver software
+#: src/app-window.vala:275
 msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
-"Aplikácia Jednoduché skenovanie využíva rozhranie SANE, kvôli podpore "
-"väčšiny existujúcich skenerov."
-
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
-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
-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
-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
-msgid "Error communicating with scanner"
-msgstr "Chyba v komunikácii so skenerom"
-
-#. Help string for command line --version flag
-#: ../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
-msgid "Print debugging messages"
-msgstr "Vypíše správy ladenia"
-
-#: ../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
-msgid "Failed to scan"
-msgstr "Skenovanie zlyhalo"
-
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
-msgid "[DEVICE...] - Scanning utility"
-msgstr "[ZARIADENIE…] - Nástroj na skenovanie"
-
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
-#, c-format
-msgid "Run '%s --help' to see a full list of available command line options."
+"You need to <a href=\"install-firmware\">install driver software</a> for "
+"your scanner."
 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
-msgid "_Close"
-msgstr "_Zavrieť"
-
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../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'"
+"Musíte <a href=\"install-firmware\">nainštalovať softvér ovládača</a> pre "
+"váš skener."
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/app-window.vala:281
 msgid "No scanners detected"
 msgstr "Nezistili sa žiadne skenery"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/app-window.vala:283
 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
-msgid "Additional software needed"
-msgstr "Vyžaduje sa dodatočný softvér"
-
-#. Instructions to install driver software
-#: ../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
-msgid "Save As..."
-msgstr "Uložiť ako..."
+#: src/app-window.vala:298
+msgid "Save As…"
+msgstr "Uloženie ako…"
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/app-window.vala:301 src/app-window.vala:471 src/app-window.vala:552
 msgid "_Cancel"
 msgstr "Z_rušiť"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/app-window.vala:302 src/app-window.vala:553
 msgid "_Save"
 msgstr "_Uložiť"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/app-window.vala:310
 msgid "Scanned Document.pdf"
 msgstr "Naskenovaný dokument.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#. Save dialog: Filter name to show only supported image files
+#: src/app-window.vala:316
 msgid "Image Files"
 msgstr "Súbory obrázkov"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/app-window.vala:326
 msgid "All Files"
 msgstr "Všetky súbory"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/app-window.vala:335
 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/app-window.vala:341
 msgid "JPEG (compressed)"
 msgstr "JPEG (komprimovaný)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/app-window.vala:347
 msgid "PNG (lossless)"
 msgstr "PNG (bezstratový)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#. Save dialog: Label for sabing in WEBP format
+#: src/app-window.vala:354
+msgid "WebP (compressed)"
+msgstr "WebP (komprimovaný)"
+
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
+#: src/app-window.vala:364
 msgid "File format:"
 msgstr "Formát súboru:"
 
+#. Label in save dialog beside compression slider
+#: src/app-window.vala:376
+msgid "Compression:"
+msgstr "Komprimácia:"
+
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/app-window.vala:470
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr "Súbor s názvom „%s“ už existuje. Chcete ho nahradiť?"
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/app-window.vala:473
+msgid "_Replace"
+msgstr "_Nahradiť"
+
+#: src/app-window.vala:512
+msgid "Saving"
+msgstr "Ukladá sa"
+
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/app-window.vala:527
 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
-msgid "If you don't save, changes will be permanently lost."
+#: src/app-window.vala:550
+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/app-window.vala:591
 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/app-window.vala:593
 msgid "Discard Changes"
 msgstr "Zahodiť zmeny"
 
+#. Label shown when scan started
+#: src/app-window.vala:692
+msgid "Contacting scanner…"
+msgstr "Kontaktuje sa skener…"
+
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/app-window.vala:800
 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/app-window.vala:812
 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/app-window.vala:990
 msgid "Combine sides"
 msgstr "Kombinovať strany"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/app-window.vala:1000
 msgid "Combine sides (reverse)"
 msgstr "Kombinovať strany (obrátene)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/app-window.vala:1010
 msgid "Reverse"
 msgstr "Obrátiť"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/app-window.vala:1020
 msgid "Keep unchanged"
 msgstr "Ponechať nezmenené"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/app-window.vala:1250
 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/app-window.vala:1271
 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,19 +556,19 @@ msgstr ""
 "licencie GNU. Ak sa tak nestalo, navštívte <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/app-window.vala:1274
 msgid "About Simple Scan"
 msgstr "O programe Jednoduché skenovanie"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/app-window.vala:1277
 msgid "Simple document scanning tool"
 msgstr "Nástroj na jednoduché skenovanie dokumentov"
 
-#: ../src/ui.vala:1487
+#: src/app-window.vala:1286
 msgid "translator-credits"
 msgstr ""
-"Launchpad Contributions:\n"
+"Prispievatelia zo služby Launchpad:\n"
 "  6205 https://launchpad.net/~6205-reactivated-deactivatedaccount\n"
 "  Alessio Treglia https://launchpad.net/~quadrispro\n"
 "  Dusan Kazik https://launchpad.net/~prescott66\n"
@@ -570,201 +578,517 @@ 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/app-window.vala:1308
 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
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:1310
 msgid "Quit without Saving"
 msgstr "Ukončiť bez uloženia"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/app-window.vala:1357
 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/app-window.vala:1359
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.brother.com\">Brother website</a>."
+"Drivers for this are available on the <a href=\"http://support.brother.com"
+"\">Brother website</a>."
 msgstr ""
-"Drivers for this are available on the <a "
-"href=\"http://support.brother.com/g/b/countrytop.aspx?c=cz&lang=cs\">Brother "
-"website</a>."
+"Drivers for this are available on the <a href=\"http://support.brother.com/g/"
+"b/countrytop.aspx?c=cz&lang=cs\">Brother website</a>."
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/app-window.vala:1363
 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/app-window.vala:1365
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://samsung.com/support\">Samsung website</a>."
+"Drivers for this are available on the <a href=\"http://samsung.com/support"
+"\">Samsung website</a>."
 msgstr ""
-"Drivers for this are available on the <a "
-"href=\"http://samsung.com/sk/support\">Samsung website</a>."
+"Drivers for this are available on the <a href=\"http://samsung.com/sk/support"
+"\">Samsung website</a>."
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/app-window.vala:1369
 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/app-window.vala:1374
 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/app-window.vala:1376
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.epson.com\">Epson website</a>."
+"Drivers for this are available on the <a href=\"http://support.epson.com"
+"\">Epson website</a>."
 msgstr ""
-"Ovládače pre tento skener sú dostupné na <a "
-"href=\"http://www.epson.sk/sk/sk/viewcon/corporatesite/support\">webovej "
-"stránke výrobcu Epson</a>."
+"Ovládače pre tento skener sú dostupné na <a href=\"http://www.epson.sk/sk/sk/"
+"viewcon/corporatesite/support\">webovej stránke výrobcu Epson</a>."
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/app-window.vala:1380
 msgid "Install drivers"
 msgstr "Inštalácia ovládačov"
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/app-window.vala:1411
 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
-msgid "Installing drivers..."
-msgstr "Inštalujú sa ovládače..."
+#: src/app-window.vala:1423
+msgid "Installing drivers…"
+msgstr "Inštalujú sa ovládače…"
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/app-window.vala:1431
 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/app-window.vala:1441
 #, 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/app-window.vala:1447
 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/app-window.vala:1454
 #, c-format
-msgid "You need to install the %s package(s)."
-msgstr "Musíte nainštalovať balík(y) %s."
+msgid "You need to install the %s package."
+msgid_plural "You need to install the %s packages."
+msgstr[0] "Musíte nainštalovať balík %s."
+msgstr[1] "Musíte nainštalovať balíky %s."
+msgstr[2] "Musíte nainštalovať balíky %s."
+
+#. Title of preferences dialog
+#: src/app-window.vala:1568 src/app-window.vala:1591
+#: src/preferences-dialog.ui:53
+msgid "Preferences"
+msgstr "Nastavenia"
+
+#: src/app-window.vala:1572
+msgid "Keyboard Shortcuts"
+msgstr "Klávesové skratky"
+
+#: src/app-window.vala:1573
+msgid "Help"
+msgstr "Pomocník"
+
+#: src/app-window.vala:1574
+msgid "About"
+msgstr "O programe"
+
+#: src/app-window.vala:1575
+msgid "Quit"
+msgstr "Ukončiť"
+
+#: src/app-window.vala:1589
+msgid "Email"
+msgstr "Email"
+
+#. Populate ActionBar (not supported in Glade)
+#. https://bugzilla.gnome.org/show_bug.cgi?id=769966
+#. Label on new document button
+#: src/app-window.vala:1599
+msgid "Start Again…"
+msgstr "Začať odznovu…"
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: src/app-window.vala:1616
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Otočí stránku doľava (v protismere hodinových ručičiek)"
+
+#. Tooltip for rotate right (clockwise) button
+#: src/app-window.vala:1623
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Otočí stránku doprava (v smere hodinových ručičiek)"
+
+# tooltip
+#. Tooltip for crop button
+#: src/app-window.vala:1633
+msgid "Crop the selected page"
+msgstr "Oreže vybranú stránku"
+
+# tooltip
+#. Tooltip for delete button
+#: src/app-window.vala:1649
+msgid "Delete the selected page"
+msgstr "Odstráni vybranú stránku"
+
+#. Text of button for cancelling save
+#: src/app-window.vala:1814
+msgid "Cancel"
+msgstr "Zrušiť"
+
+#. Button to submit authorization dialog
+#: src/authorize-dialog.ui:25
+msgid "_Authorize"
+msgstr "Ove_riť"
+
+#. Label beside username entry
+#: src/authorize-dialog.ui:99
+msgid "_Username for resource:"
+msgstr "_Užívateľské meno pre zdroj:"
+
+#. Label beside password entry
+#: src/authorize-dialog.ui:112
+msgid "_Password:"
+msgstr "_Heslo:"
+
+#: src/book.vala:331 src/book.vala:337
+#, c-format
+msgid "Unable to encode page %i"
+msgstr "Nie je možné dekódovať stránku č. %i"
+
+#: src/help-overlay.ui:12
+msgctxt "shortcut window"
+msgid "Scanning"
+msgstr "Skenovanie"
+
+#: src/help-overlay.ui:17
+msgctxt "shortcut window"
+msgid "Scan a single page"
+msgstr "Naskenovanie jednej stránky"
+
+#: src/help-overlay.ui:24
+msgctxt "shortcut window"
+msgid "Scan all pages from document feeder"
+msgstr "Naskenovanie všetkých stránok z podávača dokumentov"
+
+#: src/help-overlay.ui:31
+msgctxt "shortcut window"
+msgid "Scan continuously from a flatbed scanner"
+msgstr "Priebežné skenovanie z plochého skeneru"
+
+#: src/help-overlay.ui:38
+msgctxt "shortcut window"
+msgid "Stop scan in progress"
+msgstr "Zastavenie prebiehajúceho skenovania"
+
+#: src/help-overlay.ui:46
+msgctxt "shortcut window"
+msgid "Document Modification"
+msgstr "Úprava dokumentov"
+
+#: src/help-overlay.ui:51
+msgctxt "shortcut window"
+msgid "Move page left"
+msgstr "Presun stránky doľava"
+
+#: src/help-overlay.ui:58
+msgctxt "shortcut window"
+msgid "Move page right"
+msgstr "Presun stránky doprava"
+
+#: src/help-overlay.ui:65
+msgctxt "shortcut window"
+msgid "Rotate page to the left (anti-clockwise)"
+msgstr "Otočenie stránky doľava (v protismere hodinových ručičiek)"
+
+#: src/help-overlay.ui:72
+msgctxt "shortcut window"
+msgid "Rotate page to the right (clockwise)"
+msgstr "Otočenie stránky doprava (v smere hodinových ručičiek)"
+
+# tooltip
+#: src/help-overlay.ui:79
+msgctxt "shortcut window"
+msgid "Delete page"
+msgstr "Odstránenie stránky"
+
+#: src/help-overlay.ui:87
+msgctxt "shortcut window"
+msgid "Document Management"
+msgstr "Správa dokumentov"
+
+#: src/help-overlay.ui:92
+msgctxt "shortcut window"
+msgid "Start new document"
+msgstr "Zahájenie nového dokumentu"
+
+#: src/help-overlay.ui:99
+msgctxt "shortcut window"
+msgid "Save scanned document"
+msgstr "Uloženie naskenovaného dokumentu"
+
+#: src/help-overlay.ui:106
+msgctxt "shortcut window"
+msgid "Email scanned document"
+msgstr "Odoslanie naskenovaného dokumentu emailom"
+
+#: src/help-overlay.ui:113
+msgctxt "shortcut window"
+msgid "Print scanned document"
+msgstr "Tlač naskenovaného dokumentu"
+
+#: src/help-overlay.ui:120
+msgctxt "shortcut window"
+msgid "Copy current page to clipboard"
+msgstr "Skopírovanie aktuálne stránky do schránky"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:113
+msgid "_Scanner"
+msgstr "_Skener"
+
+#. Label beside scan side combo box
+#: src/preferences-dialog.ui:143
+msgid "Scan Sides"
+msgstr "Skenované strany"
+
+#. Label beside page size combo box
+#: src/preferences-dialog.ui:160
+msgid "Page Size"
+msgstr "Veľkosť stránky"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:191
+msgid "Front"
+msgstr "Predná strana"
+
+#. Preferences Dialog: Toggle button to select scanning on the back side of a page
+#: src/preferences-dialog.ui:206
+msgid "Back"
+msgstr "Zadná strana"
+
+#. Preferences Dialog: Toggle button to select scanning on both sides of a page
+#: src/preferences-dialog.ui:221
+msgid "Both"
+msgstr "Obe"
+
+#. Label beside page delay scale
+#: src/preferences-dialog.ui:260
+msgid "Delay"
+msgstr "Oneskorenie"
+
+#. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
+#: src/preferences-dialog.ui:276
+msgid "Multiple pages from flatbed"
+msgstr "Viacero stránok z plochého skenera"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:295
+msgid "3"
+msgstr "3"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:310
+msgid "5"
+msgstr "5"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:326
+msgid "7"
+msgstr "7"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:342
+msgid "10"
+msgstr "10"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:358
+msgid "15"
+msgstr "15"
+
+#. Label after page delay radio buttons
+#: src/preferences-dialog.ui:385
+msgid "Seconds"
+msgstr "sekúnd"
+
+#. Preferences Dialog: Tab label for scanning settings
+#: src/preferences-dialog.ui:413
+msgid "Scanning"
+msgstr "Skenovanie"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:436
+msgid "_Text Resolution"
+msgstr "Rozlíšenie _textu"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:452
+msgid "_Photo Resolution"
+msgstr "Rozlíšenie _fotografií"
+
+#. Label beside brightness scale
+#: src/preferences-dialog.ui:505
+msgid "Brightness"
+msgstr "Jas"
+
+#. Label beside contrast scale
+#: src/preferences-dialog.ui:521
+msgid "Contrast"
+msgstr "Kontrast"
+
+#. Preferences Dialog: Tab for quality settings
+#: src/preferences-dialog.ui:576
+msgid "Quality"
+msgstr "Kvalita"
+
+#. Combo box value for automatic paper size
+#: src/preferences-dialog.vala:77
+msgid "Automatic"
+msgstr "Automatická"
+
+#: src/preferences-dialog.vala:116
+msgid "Darker"
+msgstr "Tmavší"
+
+#: src/preferences-dialog.vala:118
+msgid "Lighter"
+msgstr "Svetlejší"
+
+#: src/preferences-dialog.vala:126
+msgid "Less"
+msgstr "Menší"
+
+#: src/preferences-dialog.vala:128
+msgid "More"
+msgstr "Väčší"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/preferences-dialog.vala:440
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (predvolené)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/preferences-dialog.vala:443
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (koncept)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/preferences-dialog.vala:446
 #, 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/preferences-dialog.vala:449
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1835
-msgid "New Document"
-msgstr "Nový dokument"
+#. Error displayed when no scanners to scan with
+#: src/scanner.vala:844
+msgid "No scanners available.  Please connect a scanner."
+msgstr "Nie sú dostupné žiadne skenery. Prosím, pripojte skener."
 
-#: ../src/ui.vala:1840
-msgid "Document"
-msgstr "Dokument"
+#. Error displayed when cannot connect to scanner
+#: src/scanner.vala:874
+msgid "Unable to connect to scanner"
+msgstr "Nie je možné pripojiť sa ku skeneru"
 
-#: ../src/ui.vala:1844
-msgid "Email..."
-msgstr "Email..."
+#. Error display when unable to start scan
+#: src/scanner.vala:1227
+msgid "Unable to start scan"
+msgstr "Nie je možné začať skenovať"
 
-#: ../src/ui.vala:1845
-msgid "Print..."
-msgstr "Tlačiť..."
+#. Error displayed when communication with scanner broken
+#: src/scanner.vala:1240 src/scanner.vala:1340
+msgid "Error communicating with scanner"
+msgstr "Chyba v komunikácii so skenerom"
 
-#: ../src/ui.vala:1853
-msgid "Help"
-msgstr "Pomocník"
+#. Help string for command line --version flag
+#: src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "Zobrazí verziu vydania"
 
-#: ../src/ui.vala:1854
-msgid "About"
-msgstr "O programe"
+#. Help string for command line --debug flag
+#: src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Vypíše správy ladenia"
 
-#: ../src/ui.vala:1855
-msgid "Quit"
-msgstr "Ukončiť"
+#: 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"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
-msgid "Change _Scanner"
-msgstr "Zmeniť _skener"
+#. Title of error dialog when scan failed
+#: src/simple-scan.vala:392
+msgid "Failed to scan"
+msgstr "Skenovanie zlyhalo"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
-msgid "_Install Drivers"
-msgstr "Na_inštalovať ovládače"
+#. Attempt to inhibit the screensaver when scanning
+#: src/simple-scan.vala:407
+msgid "Scan in progress"
+msgstr "Prebieha skenovanie"
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
-msgid "Automatic"
-msgstr "Automatická"
+#. Arguments and description for --help text
+#: src/simple-scan.vala:584
+msgid "[DEVICE…] — Scanning utility"
+msgstr "[ZARIADENIE…] — Nástroj na skenovanie"
 
-#: ../src/ui.vala:1947
-msgid "Darker"
-msgstr "Tmavší"
+#. Text printed out when an unknown command-line argument provided
+#: src/simple-scan.vala:595
+#, 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:1949
-msgid "Lighter"
-msgstr "Svetlejší"
+#~ msgid "Front and Back"
+#~ msgstr "Predná a zadná strana"
 
-#: ../src/ui.vala:1957
-msgid "Less"
-msgstr "Menší"
+#~ msgid "New"
+#~ msgstr "Nový"
 
-#: ../src/ui.vala:1959
-msgid "More"
-msgstr "Väčší"
+#~ msgid "Rotate Left"
+#~ msgstr "Otočiť doľava"
 
-#: ../src/ui.vala:1967
-msgid "Minimum"
-msgstr "Minimálna"
+#~ msgid "Rotate Right"
+#~ msgstr "Otočiť doprava"
 
-#: ../src/ui.vala:1969
-msgid "Maximum"
-msgstr "Maximálna"
+#~ msgid "Crop"
+#~ msgstr "Orezanie"
 
-#: ../src/ui.vala:2008
-msgid "Saving document..."
-msgstr "Ukladá sa dokument…"
+#~ msgid "Scan S_ource:"
+#~ msgstr "Zdroj s_kenovania:"
 
-#: ../src/ui.vala:2173
-#, c-format
-msgid "Saving page %d out of %d"
-msgstr "Ukladá sa %d. stránka z %d"
+#~ msgid "New Document"
+#~ msgstr "Nový dokument"
+
+#~ msgid "Document"
+#~ msgstr "Dokument"
+
+#~ msgid "Email..."
+#~ msgstr "Email..."
+
+#~ msgid "Print..."
+#~ msgstr "Tlačiť..."
+
+#~ msgid "_Install Drivers"
+#~ msgstr "Na_inštalovať ovládače"
+
+#~ msgid "Minimum"
+#~ msgstr "Minimálna"
+
+#~ msgid "Maximum"
+#~ msgstr "Maximálna"
+
+#~ msgid "Saving document..."
+#~ msgstr "Ukladá sa dokument…"
+
+#~ msgid "Saving page %d out of %d"
+#~ msgstr "Ukladá sa %d. stránka z %d"
 
 #~ msgid "4&#xD7;6"
 #~ msgstr "4&#xD7;6"
@@ -776,24 +1100,17 @@ msgstr "Ukladá sa %d. stránka z %d"
 #~ msgstr "Chýbajúce súbory"
 
 #~ msgid ""
-#~ "The direction of the scanner across the scanned page. It can be one of the "
-#~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+#~ "The direction of the scanner across the scanned page. It can be one of "
+#~ "the following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-"
+#~ "left'"
 #~ msgstr ""
-#~ "Smer skeneru naprieč skenovanou stránkou. Môže to byť jedno z následujúcich: "
-#~ "'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
-
-#~ msgid "Type of document being scanned"
-#~ msgstr "Druh dokumentu ktorý sa skenuje"
+#~ "Smer skeneru naprieč skenovanou stránkou. Môže to byť jedno z "
+#~ "následujúcich: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-"
+#~ "left'"
 
 #~ msgid "TRUE if the application window is maximized"
 #~ msgstr "TRUE pokiaľ je aplikačné okno v maximálnej veľkosti"
 
-#~ msgid "Device to scan from"
-#~ msgstr "Zariadenie z ktorého skenovať"
-
-#~ msgid "SANE device to acquire images from."
-#~ msgstr "Zariadenie SANE z ktorého získať obrázky."
-
 #~ msgid "Direction of scan"
 #~ msgstr "Smer skenovania"
 
@@ -802,9 +1119,9 @@ msgstr "Ukladá sa %d. stránka z %d"
 #~ "photos. This setting decides on the scan resolution, colors and post-"
 #~ "processing."
 #~ msgstr ""
-#~ "Druh dokumentu ktorý sa skenuje. 'text' pre textové dokumenty, 'photo' pre "
-#~ "fotografie. Táto hodnota určuje rozlíšenie skenovania, farby a koncové "
-#~ "spracovanie."
+#~ "Druh dokumentu ktorý sa skenuje. 'text' pre textové dokumenty, 'photo' "
+#~ "pre fotografie. Táto hodnota určuje rozlíšenie skenovania, farby a "
+#~ "koncové spracovanie."
 
 #~ msgid "Window height in pixels"
 #~ msgstr "Výška okna v pixeloch"
@@ -813,8 +1130,8 @@ msgstr "Ukladá sa %d. stránka z %d"
 #~ msgstr "Šírka okna v pixeloch"
 
 #~ msgid ""
-#~ "The width of scanned image in pixels. This value is updated to what the last "
-#~ "scanned page was."
+#~ "The width of scanned image in pixels. This value is updated to what the "
+#~ "last scanned page was."
 #~ msgstr ""
 #~ "Šírka skenovaného obrázku. Táto hodnota sa aktualizuje podľa poslednej "
 #~ "skenovanej stránky."
@@ -826,7 +1143,6 @@ msgstr "Ukladá sa %d. stránka z %d"
 #~ "Výška skenovaného obrázku. Táto hodnota sa aktualizuje podľa poslednej "
 #~ "skenovanej stránky."
 
-#, c-format
 #~ msgid ""
 #~ "Help Options:\n"
 #~ "  -d, --debug                     Print debugging messages\n"
@@ -842,7 +1158,6 @@ msgstr "Ukladá sa %d. stránka z %d"
 #~ "  --help-all Zobraziť všetky možnosti pomocníka\n"
 #~ "  --help-gtk Zobraziť GTK+ možnosti"
 
-#, c-format
 #~ msgid ""
 #~ "Usage:\n"
 #~ "  %s [DEVICE...] - Scanning utility"
@@ -850,7 +1165,6 @@ msgstr "Ukladá sa %d. stránka z %d"
 #~ "Použitie:\n"
 #~ "  %s [ZARIADENIE...] - Skenovacia pomôcka"
 
-#, c-format
 #~ msgid ""
 #~ "GTK+ Options:\n"
 #~ "  --class=CLASS                   Program class as used by the window "
@@ -876,83 +1190,5 @@ msgstr "Ukladá sa %d. stránka z %d"
 #~ msgid "Width of scanned image in pixels"
 #~ msgstr "Šírka skenovaného obrázku v pixeloch"
 
-#~ msgid "Resolution for photo scans"
-#~ msgstr "Rozlíšenie pre skenovanie fotografií"
-
-#~ msgid "Resolution for text scans"
-#~ msgstr "Rozlíšenie pre skenovanie textu"
-
-#~ msgid ""
-#~ "Type of document being scanned. This setting decides on the scan resolution, "
-#~ "colors and post-processing."
-#~ msgstr ""
-#~ "Typ dokumentu ktorý sa skenuje. Toto nastavenie určuje rozlíšenie, farby a "
-#~ "spracovanie tohto skenu."
-
-#~ msgid "Contrast of scan"
-#~ msgstr "Kontrast skenu"
-
-#~ msgid "Brightness of scan"
-#~ msgstr "Jas skenu"
-
-#~ msgid "Width of paper in tenths of a mm"
-#~ msgstr "Šírka papiera v desatinách mm"
-
-#~ msgid ""
-#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
-#~ msgstr ""
-#~ "Šírka papiera v desatinách mm (alebo hodnota 0 pre automatické rozpoznanie "
-#~ "papiera)"
-
-#~ msgid "Height of paper in tenths of a mm"
-#~ msgstr "Výška papiera v desatinách mm"
-
-#~ msgid ""
-#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
-#~ msgstr ""
-#~ "Výška papiera v desatinách mm (alebo hodnota 0 pre automatické rozpoznanie "
-#~ "papiera)"
-
-#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
-#~ msgstr "Úprava jasu od -100 do 100 (0 znamená bez úpravy)"
-
-#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
-#~ msgstr "Úprava kontrastu od -100 do 100 (0 znamená bez úpravy)"
-
-#~ msgid "The resolution in dots-per-inch to use when scanning text."
-#~ msgstr ""
-#~ "Rozlíšenie v bodoch na palec (DPI), ktoré sa má použiť pri skenovaní textu."
-
-#~ msgid "The resolution in dots-per-inch to use when scanning photos."
-#~ msgstr ""
-#~ "Rozlíšenie v bodoch na palec (DPI), ktoré sa má použiť pri skenovaní "
-#~ "fotografií."
-
-#~ msgid "Page side to scan"
-#~ msgstr "Strana stránky na skenovanie"
-
-#~ msgid "The page side to scan."
-#~ msgstr "Strana stránky, ktorá sa má oskenovať."
-
-#~ msgid "Directory to save files to"
-#~ msgstr "Adresár na ukladanie súborov"
-
-#~ msgid ""
-#~ "The directory to save files to. Defaults to the documents directory if unset."
-#~ msgstr ""
-#~ "Adresár, do ktorého sa majú ukladať súbory. Ak je nenastavený, použije sa "
-#~ "predvolený adresár dokumentov."
-
-#~ msgid "Quality value to use for JPEG compression"
-#~ msgstr "Hodnota kvality kompresie obrázkov JPEG"
-
-#~ msgid "Quality value to use for JPEG compression."
-#~ msgstr "Hodnota kvality, ktorá sa má použiť pre kompresiu obrázkov JPEG."
-
-#~ msgid "Scanned Document"
-#~ msgstr "Oskenovaný dokument"
-
 #~ msgid "Select File _Type"
 #~ msgstr "Vybrať _typ súboru"
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..84e9f97 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,518 +1,528 @@
 # Slovenian translation for simple-scan
 # Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
 # This file is distributed under the same license as the simple-scan package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
+#
+# Matej Urbančič <mateju@svn.gnome.org>, 2017.
 #
 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"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
+"product=simple-scan&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-08-28 19:45+0200\n"
+"PO-Revision-Date: 2017-08-28 20:14+0200\n"
+"Last-Translator: Matej Urbančič <mateju@svn.gnome.org>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
+"Language: sl\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-Generator: Poedit 2.0.1\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
+"%100==4 ? 3 : 0);\n"
 
-#. Button to submit authorization dialog
-#: data/simple-scan.ui:24
-msgid "_Authorize"
-msgstr "_Pooblasti"
+#: data/org.gnome.SimpleScan.gschema.xml:11
+msgid "Device to scan from"
+msgstr "Naprava za optično branje"
 
-#. Label beside username entry
-#: data/simple-scan.ui:102
-msgid "_Username for resource:"
-msgstr "_Uporabniško ime za vir:"
+#: data/org.gnome.SimpleScan.gschema.xml:12
+msgid "SANE device to acquire images from."
+msgstr "Naprava SANE za pridobivanje slik."
 
-#. Label beside password entry
-#: data/simple-scan.ui:117
-msgid "_Password:"
-msgstr "_Geslo:"
+#: data/org.gnome.SimpleScan.gschema.xml:20
+msgid "Type of document being scanned"
+msgstr "Vrsta optično branega dokumenta"
+
+#: data/org.gnome.SimpleScan.gschema.xml:21
+msgid ""
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+msgstr ""
+"Vrsta dokumenta za optično branje. Ta nastavitev določi ločljivost tiskanja, "
+"barve in poobdelovo."
 
-#. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
-msgid "Front and Back"
-msgstr "Prednja in hrbtna stran"
+#: data/org.gnome.SimpleScan.gschema.xml:25
+msgid "Width of paper in tenths of a mm"
+msgstr "Širina papirja v desetinkah milimetra"
 
-#. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
-msgid "Front"
-msgstr "Prednja stran"
+#: data/org.gnome.SimpleScan.gschema.xml:26
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr "Širina papirja v desetinkah milimetra (ali 0 za samodejno zaznavanje)."
 
-#. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
-msgid "Back"
-msgstr "Hrbtna stran"
+#: data/org.gnome.SimpleScan.gschema.xml:30
+msgid "Height of paper in tenths of a mm"
+msgstr "Višina papirja v desetinkah milimetra"
+
+#: data/org.gnome.SimpleScan.gschema.xml:31
+msgid ""
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"Višina papirja v desetinkah milimetra (ali 0 za samodejno zaznavanje "
+"papirja)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:35
+msgid "Brightness of scan"
+msgstr "Svetlost optičnega branja"
+
+#: data/org.gnome.SimpleScan.gschema.xml:36
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr "Prilagoditev svetlosti od -100 do 100 (0 kot brez)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:40
+msgid "Contrast of scan"
+msgstr "Kontrast optičnega branja"
+
+#: data/org.gnome.SimpleScan.gschema.xml:41
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr "Prilagoditev kontrasta od -100 do 100 (0 kot brez)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:45
+msgid "Resolution for text scans"
+msgstr "Ločljivost za optično branje besedil"
+
+#: data/org.gnome.SimpleScan.gschema.xml:46
+msgid "The resolution in dots-per-inch to use when scanning text."
+msgstr "Ločljivost optičnega branja besedil v točkah na palec (dpi)"
+
+#: data/org.gnome.SimpleScan.gschema.xml:50
+msgid "Resolution for photo scans"
+msgstr "Ločljivost za optično branje fotografij"
+
+#: data/org.gnome.SimpleScan.gschema.xml:51
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr "Ločljivost optičnega branja fotografij v točkah na palec (dpi)"
+
+#: data/org.gnome.SimpleScan.gschema.xml:55
+msgid "Page side to scan"
+msgstr "Stran strani za optično branje"
+
+#: data/org.gnome.SimpleScan.gschema.xml:56
+msgid "The page side to scan."
+msgstr "Stran strani za optično branje."
+
+#: data/org.gnome.SimpleScan.gschema.xml:60
+msgid "Directory to save files to"
+msgstr "Mapa za shranjevanje datotek"
+
+#: data/org.gnome.SimpleScan.gschema.xml:61
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+"Mapa za shranjevanje datotek. Privzeto mapa dokumentov, če ni nastavljena."
+
+#: data/org.gnome.SimpleScan.gschema.xml:66
+msgid "Quality value to use for JPEG compression"
+msgstr "Vrednost kakovosti za stiskanje JPEG"
+
+#: data/org.gnome.SimpleScan.gschema.xml:67
+msgid "Quality value to use for JPEG compression."
+msgstr "Vrednost kakovosti za stiskanje JPEG."
+
+#: data/org.gnome.SimpleScan.gschema.xml:72
+msgid "Delay in millisecond between pages"
+msgstr "Zakasnitev med branjem strani v milisekundah"
+
+#: data/org.gnome.SimpleScan.gschema.xml:73
+msgid "Delay in millisecond between pages."
+msgstr "Zakasnitev med branjem strani v milisekundah."
 
 #. 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
+#. Set HeaderBar title here because Glade doesn't keep it translated
+#. https://bugzilla.gnome.org/show_bug.cgi?id=782753
+#. Title of scan window
+#: data/simple-scan.appdata.xml.in:6 data/simple-scan.desktop.in:3
+#: src/app-window.ui:76 src/app-window.vala:1560
 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
-msgid "_Document"
-msgstr "_Dokument"
+#: data/simple-scan.appdata.xml.in:7 data/simple-scan.desktop.in:5
+msgid "Scan Documents"
+msgstr "Optično preberi dokumente"
 
-#. Scan menu item
-#: data/simple-scan.ui:260
-msgid "Sc_an"
-msgstr "Op_tično branje"
+#: 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 "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+"Zelo enostaven način za optično branje tako dokumentov kot fotografij. "
+"Posamezne dele fotografije je mogoče obrezati in fotografijo zavrteti, če je "
+"napačno obrnjena. Prebrane dokumente je nato mogoče natisniti, izvoziti v "
+"datoteke PDF ali shraniti v enega od podprtih zapisov."
+
+#: data/simple-scan.appdata.xml.in:14
+msgid "Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+"Enostavno optično branje zahteva ogrodje SANE, s katerim bo omogočena "
+"podpora večine optičnih bralnikov."
+
+#: data/simple-scan.desktop.in:4
+msgid "Document Scanner"
+msgstr "Optični bralnik dokumentov"
 
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: data/simple-scan.desktop.in:7
+msgid "scan;scanner;flatbed;adf;"
+msgstr "optični bralnik;adf;podajalnik;skener;"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: data/simple-scan.desktop.in:10
+msgid "scanner"
+msgstr "scanner"
+
+#. Toolbar scan menu item to scan a single page from the scanner
 #. 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/app-window.ui:22 src/app-window.ui:123 src/app-window.ui:820
 msgid "Single _Page"
 msgstr "Ena _stran"
 
+#. Toolbar scan menu item to scan all pages from a document feeder
 #. 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/app-window.ui:31 src/app-window.ui:133 src/app-window.ui:829
 msgid "All Pages From _Feeder"
 msgstr "Vse strani iz _podajalnika"
 
-#. Menu entry to stop current scan
-#: data/simple-scan.ui:294
-msgid "_Stop Scan"
-msgstr "_Zaustavi optično branje"
+#. Toolbar scan menu item to scan continuously from the flatbed
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/app-window.ui:40 src/app-window.ui:143 src/app-window.ui:838
+msgid "_Multiple Pages From Flatbed"
+msgstr "_Več strani z namiznim optičnim bralnikom"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:853
 msgid "Text"
 msgstr "Besedilo"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:863
 msgid "Photo"
 msgstr "Fotografija"
 
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: src/app-window.ui:91
+msgid "_Document"
+msgstr "_Dokument"
+
+#. Scan menu item
+#: src/app-window.ui:110
+msgid "Sc_an"
+msgstr "Op_tično branje"
+
+#. Menu entry to stop current scan
+#: src/app-window.ui:154
+msgid "_Stop Scan"
+msgstr "_Zaustavi optično branje"
+
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/app-window.ui:196 src/app-window.vala:967 src/app-window.vala:1590
 msgid "Reorder Pages"
 msgstr "Prerazporeditev strani"
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/app-window.ui:215
 msgid "_Email"
-msgstr "_Elektronska pošta"
+msgstr "_Elektronski naslov"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/app-window.ui:280
 msgid "_Page"
 msgstr "_Stran"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/app-window.ui:290
 msgid "Rotate _Left"
 msgstr "Zavrti _levo"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/app-window.ui:300
 msgid "Rotate _Right"
 msgstr "Zavrti _desno"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/app-window.ui:310
 msgid "_Crop"
 msgstr "_Obreži"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/app-window.ui:320
 msgid "_None"
 msgstr "_Brez"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/app-window.ui:331
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/app-window.ui:342
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/app-window.ui:353
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/app-window.ui:364
 msgid "_Letter"
 msgstr "_Pismo"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/app-window.ui:375
 msgid "Le_gal"
-msgstr "Velikost ZDA Le_gal"
+msgstr "Podaljšana stran"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/app-window.ui:386
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/app-window.ui:397
 msgid "_Custom"
 msgstr "_Po meri"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/app-window.ui:415
 msgid "_Rotate Crop"
-msgstr "_Zavrti obrezovano območje"
+msgstr "_Zavrti obrezano polje"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/app-window.ui:428
 msgid "Move Left"
 msgstr "Premakni levo"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/app-window.ui:437
 msgid "Move Right"
 msgstr "Premakni desno"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/app-window.ui:474
 msgid "_Help"
 msgstr "Pomo_č"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/app-window.ui:482
 msgid "_Contents"
 msgstr "_Vsebina"
 
-#. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
-msgid "Start a new document"
-msgstr "Začni nov dokument"
-
-#: data/simple-scan.ui:675
-msgid "New"
-msgstr "Novo"
-
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/app-window.ui:520 src/app-window.ui:720
 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/app-window.ui:522 src/app-window.ui:716
 msgid "Scan"
 msgstr "Optično branje"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/app-window.ui:538 src/app-window.ui:787
 msgid "Save document to a file"
 msgstr "Shrani dokument v datoteko"
 
-#: ../src/ui.vala:1842
+#: src/app-window.ui:540
 msgid "Save"
 msgstr "Shrani"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/app-window.ui:555 src/app-window.ui:700
 msgid "Stop the current scan"
 msgstr "Zaustavi trenutno optično branje"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/app-window.ui:556 src/app-window.ui:697
 msgid "Stop"
 msgstr "Zaustavi"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "Obrni stran v levo (nasprotna smer urinega kazalca)"
-
-#. Label on rotate page left (anti-clockwise) item
-#: data/simple-scan.ui:750
-msgid "Rotate Left"
-msgstr "Zavrti levo"
+#. Label shown when searching for scanners
+#: src/app-window.ui:611
+msgid "Searching for Scanners…"
+msgstr "Poteka iskanje optičnega bralnika ..."
 
-#. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
-msgid "Rotate the page to the right (clockwise)"
-msgstr "Obrni stran v desno (smer urinega kazalca)"
-
-#. Label on rotate page right (clockwise) item
-#: data/simple-scan.ui:765
-msgid "Rotate Right"
-msgstr "Zavrti desno"
-
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
-msgid "Crop the selected page"
-msgstr "Obreži izbrano stran"
-
-#: data/simple-scan.ui:781
-msgid "Crop"
-msgstr "Obreži"
-
-#: ../src/ui.vala:1849
-msgid "Preferences"
-msgstr "Možnosti"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1048
-msgid "Scan S_ource:"
-msgstr "_Vir optičnega branja:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1079
-msgid "_Text Resolution:"
-msgstr "_Ločljivost besedila:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1095
-msgid "_Photo Resolution:"
-msgstr "_Ločljivost fotografij:"
-
-#. Label beside scan side combo box
-#: data/simple-scan.ui:1139
-msgid "Scan Side:"
-msgstr "Stran optičnega branja:"
-
-#. Label beside page size combo box
-#: data/simple-scan.ui:1169
-msgid "Page Size:"
-msgstr "Velikost strani:"
-
-#. Label beside brightness scale
-#: data/simple-scan.ui:1199
-msgid "Brightness:"
-msgstr "Svetlost:"
-
-#. Label beside contrast scale
-#: data/simple-scan.ui:1229
-msgid "Contrast:"
-msgstr "Kontrast:"
-
-#. Label beside quality scale
-#: data/simple-scan.ui:1260
-msgid "Quality:"
-msgstr "Kakovost:"
-
-#: data/simple-scan.desktop.in:4
-msgid "Document Scanner"
-msgstr "Optični bralnik dokumentov"
-
-#: data/simple-scan.desktop.in:5
-msgid "Scan Documents"
-msgstr "Optično preberite dokumente"
+#: src/app-window.vala:237 src/app-window.vala:1380
+msgid "_Close"
+msgstr "_Zapri"
 
-#: data/simple-scan.desktop.in:6
-msgid "scan;scanner;flatbed;adf;"
-msgstr "optični bralnik;adf;"
+#. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
+#: src/app-window.vala:246
+#, c-format
+msgid "Username and password required to access “%s”"
+msgstr "Za dostop do »%s« sta zahtevana uporabniško ime in geslo"
 
-#: data/simple-scan.desktop.in:8
-msgid "scanner"
-msgstr ""
+#. Label shown when detected a scanner
+#: src/app-window.vala:266 src/app-window.vala:584
+msgid "Ready to Scan"
+msgstr "Naprava je pripravljena za optično branje"
 
-#: data/simple-scan.appdata.xml.in:8
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-"Zelo enostaven način za optično branje tako dokumentov kot fotografij. Slabe "
-"dele fotografije lahko obrežete in fotografijo zavrtite, če je obrnjena. "
-"Prebrane dokumente lahko natisnete, izvozite v pdf ali shranite v eno od "
-"mnogih oblik."
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: src/app-window.vala:273
+msgid "Additional software needed"
+msgstr "Zahtevana je dodatna programska oprema"
 
-#: data/simple-scan.appdata.xml.in:13
+#. Instructions to install driver software
+#: src/app-window.vala:275
+#| msgid "You need to install driver software for your scanner."
 msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
-"Enostavno optično branje zahteva ogrodje SANE, da lahko podpira večino "
-"obstoječih optičnih bralnikov."
-
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
-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
-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
-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
-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
-msgid "Show release version"
-msgstr "Pokaži podrobnosti različice"
-
-#. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
-msgid "Print debugging messages"
-msgstr "Izpiši razhroščevalna sporočila"
-
-#: ../src/simple-scan.vala:26
-msgid "Fix PDF files generated with older versions of Simple Scan"
+"You need to <a href=\"install-firmware\">install driver software</a> for "
+"your scanner."
 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
-msgid "Failed to scan"
-msgstr "Optično branje je spodletelo"
-
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
-msgid "[DEVICE...] - Scanning utility"
-msgstr "[NAPRAVA ...] - pripomoček optičnega branja"
-
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
-#, 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
-msgid "_Close"
-msgstr "_Zapri"
-
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../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"
+"Za optični bralnik je treba <a href=\"install-firmware\">namestiti "
+"programski gonilnik</a>."
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/app-window.vala:281
 msgid "No scanners detected"
-msgstr "Optičnega bralnika ni mogoče zaznati"
+msgstr "Ni zaznanega optičnega bralnika"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/app-window.vala:283
 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
-msgid "Additional software needed"
-msgstr "Potrebna je dodatna programska oprema"
-
-#. Instructions to install driver software
-#: ../src/ui.vala:384
-msgid "You need to install driver software for your scanner."
-msgstr "Za svoj optični bralnik morate namestiti gonilnik."
+msgstr "Preverite, ali je optični bralnik priklopljen in vklopljen"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
-msgid "Save As..."
+#: src/app-window.vala:298
+msgid "Save As…"
 msgstr "Shrani kot ..."
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/app-window.vala:301 src/app-window.vala:471 src/app-window.vala:552
 msgid "_Cancel"
 msgstr "_Prekliči"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/app-window.vala:302 src/app-window.vala:553
 msgid "_Save"
 msgstr "_Shrani"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/app-window.vala:310
 msgid "Scanned Document.pdf"
-msgstr "Optično bran dokument.pdf"
+msgstr "Optično prebran dokument.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#. Save dialog: Filter name to show only supported image files
+#: src/app-window.vala:316
 msgid "Image Files"
 msgstr "Slikovne datoteke"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/app-window.vala:326
 msgid "All Files"
 msgstr "Vse datoteke"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/app-window.vala:335
 msgid "PDF (multi-page document)"
 msgstr "PDF (večstranski dokument)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/app-window.vala:341
 msgid "JPEG (compressed)"
 msgstr "JPEG (stisnjen)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/app-window.vala:347
 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
+#. Save dialog: Label for sabing in WEBP format
+#: src/app-window.vala:354
+msgid "WebP (compressed)"
+msgstr "WebP (stisnjen)"
+
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
+#: src/app-window.vala:364
 msgid "File format:"
 msgstr "Vrsta datoteke:"
 
+#. Label in save dialog beside compression slider
+#: src/app-window.vala:376
+msgid "Compression:"
+msgstr "Stiskanje:"
+
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/app-window.vala:470
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr "Datoteka z imenom »%s« že obstaja. Ali jo želite zamenjati?"
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/app-window.vala:473
+msgid "_Replace"
+msgstr "_Zamenjaj"
+
+#: src/app-window.vala:512
+msgid "Saving"
+msgstr "Poteka shranjevanje"
+
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/app-window.vala:527
 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
-msgid "If you don't save, changes will be permanently lost."
-msgstr "V primeru, da sprememb ne shranite, bodo trajno izgubljene."
+#: src/app-window.vala:550
+msgid "If you don’t save, changes will be permanently lost."
+msgstr "V kolikor sprememb ne shranite, bodo te trajno izgubljene."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:708
+#: src/app-window.vala:591
 msgid "Save current document?"
-msgstr "Naj bo trenutni dokument shranjen?"
+msgstr "Ali želite dokument shraniti?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/app-window.vala:593
 msgid "Discard Changes"
-msgstr "Zavrzi vse spremembe"
+msgstr "Zavrzi spremembe"
+
+#. Label shown when scan started
+#: src/app-window.vala:692
+msgid "Contacting scanner…"
+msgstr "Poteka povezovanje optičnega bralnika ..."
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/app-window.vala:800
 msgid "Unable to save image for preview"
-msgstr "Ni bilo mogoče shraniti slike za predogled"
+msgstr "Ni mogoče shraniti slike za predogled"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/app-window.vala:812
 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/app-window.vala:990
 msgid "Combine sides"
 msgstr "Spoji strani"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/app-window.vala:1000
 msgid "Combine sides (reverse)"
 msgstr "Spoji strani (obratno)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/app-window.vala:1010
 msgid "Reverse"
 msgstr "Obrnjeno"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/app-window.vala:1020
 msgid "Keep unchanged"
 msgstr "Ohrani nespremenjeno"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/app-window.vala:1250
 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/app-window.vala:1271
 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,229 +549,541 @@ msgstr ""
 "zagotovila za PRODAJO ali PRIMERNOST ZA DOLOČEN NAMEN. \n"
 "Oglejte si GNU General Public Licence za več podrobnosti.\n"
 "\n"
-"Skupaj s programom bi morali prejeti tudi kopijo splošnega javnega potrdila; "
-"\n"
+"Skupaj s programom bi morali prejeti tudi kopijo splošnega javnega "
+"potrdila; \n"
 "v primeru, da kopije niste prejeli si oglejte <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/app-window.vala:1274
 msgid "About Simple Scan"
 msgstr "O programu"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/app-window.vala:1277
 msgid "Simple document scanning tool"
 msgstr "Preprosto orodje za optično branje dokumentov"
 
-#: ../src/ui.vala:1487
+#: src/app-window.vala:1286
 msgid "translator-credits"
 msgstr ""
+"Matej Urbančič <mateju@svn@gnome.org>\n"
 "Launchpad Contributions:\n"
-"  Andrej Znidarsic https://launchpad.net/~andrej.znidarsic\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"
-"  Martin Srebotnjak https://launchpad.net/~miles\n"
-"  Peter Klofutar https://launchpad.net/~peter-klofutar\n"
-"  Robert Hrovat https://launchpad.net/~robi-hipnos\n"
-"  Sasa Batistic https://launchpad.net/~sasa-batistic\n"
-"  grofaty https://launchpad.net/~grofaty"
+"  Andrej Žnidaršič\n"
+"  Damir Jerovšek\n"
+"  Dražen Matešić\n"
+"  Klemen Košir\n"
+"  Martin Srebotnjak\n"
+"  Peter Klofutar\n"
+"  Robert Hrovat\n"
+"  Saša Batistič\n"
+"  grofaty"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/app-window.vala:1308
 msgid "Save document before quitting?"
-msgstr "Ali naj bo dokument pred končanjem programa shranjen?"
+msgstr "Ali želite dokument končanjem programa shraniti?"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:1310
 msgid "Quit without Saving"
 msgstr "Končaj brez shranjevanja"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/app-window.vala:1357
 msgid "You appear to have a Brother scanner."
-msgstr "Videti je, da imate optični bralnik Brother."
+msgstr "Videti je, da je priklopljen optični bralnik Brother."
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/app-window.vala:1359
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.brother.com\">Brother website</a>."
+"Drivers for this are available on the <a href=\"http://support.brother.com"
+"\">Brother website</a>."
 msgstr ""
-"Za ta optični bralnik so gonilniki na voljo na  <a "
-"href=\"http://support.brother.com\">spletni strani Brother</a>."
+"Gonilniki so na voljo na spletišču podjetja <a href=\"http://support.brother."
+"com\">Brother</a>."
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/app-window.vala:1363
 msgid "You appear to have a Samsung scanner."
-msgstr "Videti je, da imate optični bralnik Samsung."
+msgstr "Videti je, da je priklopljen optični bralnik Samsung."
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/app-window.vala:1365
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://samsung.com/support\">Samsung website</a>."
+"Drivers for this are available on the <a href=\"http://samsung.com/support"
+"\">Samsung website</a>."
 msgstr ""
-"Za ta optični bralnik so gonilniki na voljo na  <a "
-"href=\"http://samsung.com/support\">spletni strani Samsung</a>."
+"Gonilniki so na voljo na spletišču podjetja <a href=\"http://samsung.com/"
+"support\">Samsung</a>."
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/app-window.vala:1369
 msgid "You appear to have an HP scanner."
-msgstr "Videti je, da imate optični bralnik HP."
+msgstr "Videti je, da je priklopljen optični bralnik HP."
 
 #. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/app-window.vala:1374
 msgid "You appear to have an Epson scanner."
-msgstr "Videti je, da imate optični bralnik Epson."
+msgstr "Videti je, da je priklopljen optični bralnik Epson."
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/app-window.vala:1376
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.epson.com\">Epson website</a>."
+"Drivers for this are available on the <a href=\"http://support.epson.com"
+"\">Epson website</a>."
 msgstr ""
-"Gonilniki za to so na voljo na <a "
-"href=\"http://support.epson.com\">spletišču Epson</a>."
+"Gonilniki so na voljo na spletišču podjetja <a href=\"http://support.epson."
+"com\">Epson</a>."
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/app-window.vala:1380
 msgid "Install drivers"
 msgstr "Namesti gonilnike"
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/app-window.vala:1411
 msgid "Once installed you will need to restart Simple Scan."
-msgstr ""
-"Ko se namestijo, boste morali program Enostavno optično branje ponovno "
-"zagnati."
+msgstr "Ko bodo paketi nameščeni, je treba program ponovno zagnati."
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
-msgid "Installing drivers..."
+#: src/app-window.vala:1423
+msgid "Installing drivers…"
 msgstr "Nameščanje gonilnikov ..."
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/app-window.vala:1431
 msgid "Drivers installed successfully!"
-msgstr "Gonilniki uspešno nameščeni!"
+msgstr "Gonilniki so uspešno nameščeni!"
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/app-window.vala:1441
 #, 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/app-window.vala:1447
 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/app-window.vala:1454
+#, c-format
+msgid "You need to install the %s package."
+msgid_plural "You need to install the %s packages."
+msgstr[0] "Namestiti je treba %s paketov."
+msgstr[1] "Namestiti je treba %s paket."
+msgstr[2] "Namestiti je treba %s paketa."
+msgstr[3] "Namestiti je treba %s pakete."
+
+#. Title of preferences dialog
+#: src/app-window.vala:1568 src/app-window.vala:1591
+#: src/preferences-dialog.ui:53
+msgid "Preferences"
+msgstr "Možnosti"
+
+#: src/app-window.vala:1572
+msgid "Keyboard Shortcuts"
+msgstr "Tipkovne bližnjice"
+
+#: src/app-window.vala:1573
+msgid "Help"
+msgstr "Pomoč"
+
+#: src/app-window.vala:1574
+msgid "About"
+msgstr "O programu"
+
+#: src/app-window.vala:1575
+msgid "Quit"
+msgstr "Izhod"
+
+#: src/app-window.vala:1589
+msgid "Email"
+msgstr "Elektronski naslov"
+
+#. Populate ActionBar (not supported in Glade)
+#. https://bugzilla.gnome.org/show_bug.cgi?id=769966
+#. Label on new document button
+#: src/app-window.vala:1599
+msgid "Start Again…"
+msgstr "Začni znova ..."
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: src/app-window.vala:1616
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Obrni stran v levo (nasprotna smer urinega kazalca)"
+
+#. Tooltip for rotate right (clockwise) button
+#: src/app-window.vala:1623
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Obrni stran v desno (smer urinega kazalca)"
+
+#. Tooltip for crop button
+#: src/app-window.vala:1633
+msgid "Crop the selected page"
+msgstr "Obreži izbrano stran"
+
+#. Tooltip for delete button
+#: src/app-window.vala:1649
+msgid "Delete the selected page"
+msgstr "Izbriši izbrano stran"
+
+#. Text of button for cancelling save
+#: src/app-window.vala:1814
+msgid "Cancel"
+msgstr "Prekliči"
+
+#. Button to submit authorization dialog
+#: src/authorize-dialog.ui:25
+msgid "_Authorize"
+msgstr "_Pooblasti"
+
+#. Label beside username entry
+#: src/authorize-dialog.ui:99
+msgid "_Username for resource:"
+msgstr "_Uporabniško ime za vir:"
+
+#. Label beside password entry
+#: src/authorize-dialog.ui:112
+msgid "_Password:"
+msgstr "_Geslo:"
+
+#: src/book.vala:331 src/book.vala:337
 #, c-format
-msgid "You need to install the %s package(s)."
-msgstr "Morate namestiti paket(e) %s."
+msgid "Unable to encode page %i"
+msgstr "Ni mogoče kodirati strani %i"
+
+#: src/help-overlay.ui:12
+msgctxt "shortcut window"
+msgid "Scanning"
+msgstr "Poteka optično branje"
+
+#: src/help-overlay.ui:17
+msgctxt "shortcut window"
+msgid "Scan a single page"
+msgstr "Optično preberi eno stran"
+
+#: src/help-overlay.ui:24
+msgctxt "shortcut window"
+msgid "Scan all pages from document feeder"
+msgstr "Zaporedno optično branje iz podajalnika dokumentov"
+
+#: src/help-overlay.ui:31
+msgctxt "shortcut window"
+msgid "Scan continuously from a flatbed scanner"
+msgstr "Zaporedno optično branje z namiznim bralnikom"
+
+#: src/help-overlay.ui:38
+msgctxt "shortcut window"
+msgid "Stop scan in progress"
+msgstr "Zaustavi trenutno optično branje"
+
+#: src/help-overlay.ui:46
+msgctxt "shortcut window"
+msgid "Document Modification"
+msgstr "Spremembe dokumenta"
+
+#: src/help-overlay.ui:51
+msgctxt "shortcut window"
+msgid "Move page left"
+msgstr "Premakni stran levo"
+
+#: src/help-overlay.ui:58
+msgctxt "shortcut window"
+msgid "Move page right"
+msgstr "Premakni stran desno"
+
+#: src/help-overlay.ui:65
+msgctxt "shortcut window"
+msgid "Rotate page to the left (anti-clockwise)"
+msgstr "Obrni stran v levo (nasprotna smer urinega kazalca)"
+
+#: src/help-overlay.ui:72
+msgctxt "shortcut window"
+msgid "Rotate page to the right (clockwise)"
+msgstr "Obrni stran v desno (smer urinega kazalca)"
+
+#: src/help-overlay.ui:79
+msgctxt "shortcut window"
+msgid "Delete page"
+msgstr "Izbriši stran"
+
+#: src/help-overlay.ui:87
+msgctxt "shortcut window"
+msgid "Document Management"
+msgstr "Upravljanje dokumentov"
+
+#: src/help-overlay.ui:92
+msgctxt "shortcut window"
+msgid "Start new document"
+msgstr "Začni nov dokument"
+
+#: src/help-overlay.ui:99
+msgctxt "shortcut window"
+msgid "Save scanned document"
+msgstr "Shrani optično prebran dokument"
+
+#: src/help-overlay.ui:106
+msgctxt "shortcut window"
+msgid "Email scanned document"
+msgstr "Pošlji optično prebran dokument"
+
+#: src/help-overlay.ui:113
+msgctxt "shortcut window"
+msgid "Print scanned document"
+msgstr "Natisni optično prebran dokument"
+
+#: src/help-overlay.ui:120
+msgctxt "shortcut window"
+msgid "Copy current page to clipboard"
+msgstr "Kopiraj trenutno stran v odložišče"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:113
+msgid "_Scanner"
+msgstr "_Optični bralnik"
+
+#. Label beside scan side combo box
+#: src/preferences-dialog.ui:143
+msgid "Scan Sides"
+msgstr "Branje nasprotnih strani"
+
+#. Label beside page size combo box
+#: src/preferences-dialog.ui:160
+msgid "Page Size"
+msgstr "Velikost strani"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:191
+msgid "Front"
+msgstr "Prednja stran"
+
+#. Preferences Dialog: Toggle button to select scanning on the back side of a page
+#: src/preferences-dialog.ui:206
+msgid "Back"
+msgstr "Hrbtna stran"
+
+#. Preferences Dialog: Toggle button to select scanning on both sides of a page
+#: src/preferences-dialog.ui:221
+msgid "Both"
+msgstr "Obe strani"
+
+#. Label beside page delay scale
+#: src/preferences-dialog.ui:260
+msgid "Delay"
+msgstr "Zakasnitev"
+
+#. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
+#: src/preferences-dialog.ui:276
+msgid "Multiple pages from flatbed"
+msgstr "Več strani z namiznim optičnim bralnikom"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:295
+msgid "3"
+msgstr "3"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:310
+msgid "5"
+msgstr "5"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:326
+msgid "7"
+msgstr "7"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:342
+msgid "10"
+msgstr "10"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:358
+msgid "15"
+msgstr "15"
+
+#. Label after page delay radio buttons
+#: src/preferences-dialog.ui:385
+msgid "Seconds"
+msgstr "Sekunde"
+
+#. Preferences Dialog: Tab label for scanning settings
+#: src/preferences-dialog.ui:413
+msgid "Scanning"
+msgstr "Optično branje"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:436
+msgid "_Text Resolution"
+msgstr "_Ločljivost besedila"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:452
+msgid "_Photo Resolution"
+msgstr "_Ločljivost fotografije"
+
+#. Label beside brightness scale
+#: src/preferences-dialog.ui:505
+msgid "Brightness"
+msgstr "Svetlost"
+
+#. Label beside contrast scale
+#: src/preferences-dialog.ui:521
+msgid "Contrast"
+msgstr "Kontrast"
+
+#. Preferences Dialog: Tab for quality settings
+#: src/preferences-dialog.ui:576
+msgid "Quality"
+msgstr "Kakovost"
+
+#. Combo box value for automatic paper size
+#: src/preferences-dialog.vala:77
+msgid "Automatic"
+msgstr "Samodejno"
+
+#: src/preferences-dialog.vala:116
+msgid "Darker"
+msgstr "Temenjše"
+
+#: src/preferences-dialog.vala:118
+msgid "Lighter"
+msgstr "Svetlejše"
+
+#: src/preferences-dialog.vala:126
+msgid "Less"
+msgstr "Manj"
+
+#: src/preferences-dialog.vala:128
+msgid "More"
+msgstr "Več"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/preferences-dialog.vala:440
 #, 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/preferences-dialog.vala:443
 #, 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/preferences-dialog.vala:446
 #, 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/preferences-dialog.vala:449
 #, c-format
 msgid "%d dpi"
 msgstr "%d točk na palec"
 
-#: ../src/ui.vala:1835
-msgid "New Document"
-msgstr "Nov dokument"
+#. Error displayed when no scanners to scan with
+#: src/scanner.vala:844
+msgid "No scanners available.  Please connect a scanner."
+msgstr "Ni zaznanega optičnega bralnika. Priklopite in vklopite ga."
 
-#: ../src/ui.vala:1840
-msgid "Document"
-msgstr "Dokument"
+#. Error displayed when cannot connect to scanner
+#: src/scanner.vala:874
+msgid "Unable to connect to scanner"
+msgstr "Z optičnim bralnikom se ni mogoče povezati"
 
-#: ../src/ui.vala:1844
-msgid "Email..."
-msgstr "E-pošta ..."
+#. Error display when unable to start scan
+#: src/scanner.vala:1227
+msgid "Unable to start scan"
+msgstr "Optičnega branja ni mogoče začeti"
 
-#: ../src/ui.vala:1845
-msgid "Print..."
-msgstr "Natisni ..."
+#. Error displayed when communication with scanner broken
+#: src/scanner.vala:1240 src/scanner.vala:1340
+msgid "Error communicating with scanner"
+msgstr "Napaka med povezovanjem optičnim bralnikom"
 
-#: ../src/ui.vala:1853
-msgid "Help"
-msgstr "Pomoč"
+#. Help string for command line --version flag
+#: src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "Pokaži podrobnosti različice"
 
-#: ../src/ui.vala:1854
-msgid "About"
-msgstr "O programu"
+#. Help string for command line --debug flag
+#: src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Izpiši sporočila razhroščevanja"
 
-#: ../src/ui.vala:1855
-msgid "Quit"
-msgstr "Izhod"
+#: 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"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
-msgid "Change _Scanner"
-msgstr "Spremeni _optični bralnik"
+#. Title of error dialog when scan failed
+#: src/simple-scan.vala:392
+msgid "Failed to scan"
+msgstr "Optično branje je spodletelo"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
-msgid "_Install Drivers"
-msgstr "_Namesti gonilnike"
+#. Attempt to inhibit the screensaver when scanning
+#: src/simple-scan.vala:407
+msgid "Scan in progress"
+msgstr "Poteka optično branje dokumenta"
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
-msgid "Automatic"
-msgstr "Samodejno"
+#. Arguments and description for --help text
+#: src/simple-scan.vala:584
+msgid "[DEVICE…] — Scanning utility"
+msgstr "[NAPRAVA ...] – orodje za optično branje"
 
-#: ../src/ui.vala:1947
-msgid "Darker"
-msgstr "Temenjše"
+#. Text printed out when an unknown command-line argument provided
+#: src/simple-scan.vala:595
+#, 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:1949
-msgid "Lighter"
-msgstr "Svetlejše"
+#~ msgid "Front and Back"
+#~ msgstr "Prednja in hrbtna stran"
 
-#: ../src/ui.vala:1957
-msgid "Less"
-msgstr "Manj"
+#~ msgid "New"
+#~ msgstr "Novo"
 
-#: ../src/ui.vala:1959
-msgid "More"
-msgstr "Več"
+#~ msgid "Rotate Left"
+#~ msgstr "Zavrti levo"
 
-#: ../src/ui.vala:1967
-msgid "Minimum"
-msgstr "Najmanj"
+#~ msgid "Rotate Right"
+#~ msgstr "Zavrti desno"
 
-#: ../src/ui.vala:1969
-msgid "Maximum"
-msgstr "Največ"
+#~ msgid "Crop"
+#~ msgstr "Obreži"
 
-#: ../src/ui.vala:2008
-msgid "Saving document..."
-msgstr "Shranjevanje dokumenta ..."
+#~ msgid "Scan S_ource:"
+#~ msgstr "_Vir optičnega bralnika:"
 
-#: ../src/ui.vala:2173
-#, c-format
-msgid "Saving page %d out of %d"
-msgstr "Shranjevanje strani %d od %d"
+#~ msgid "New Document"
+#~ msgstr "Nov dokument"
+
+#~ msgid "Document"
+#~ msgstr "Dokument"
+
+#~ msgid "Email..."
+#~ msgstr "Elektronska pošta ..."
+
+#~ msgid "Print..."
+#~ msgstr "Natisni ..."
+
+#~ msgid "_Install Drivers"
+#~ msgstr "_Namesti gonilnike"
+
+#~ msgid "Minimum"
+#~ msgstr "Najmanj"
+
+#~ msgid "Maximum"
+#~ msgstr "Največ"
+
+#~ msgid "Saving document..."
+#~ msgstr "Shranjevanje dokumenta ..."
+
+#~ msgid "Saving page %d out of %d"
+#~ msgstr "Shranjevanje strani %d od %d"
 
 #~ msgid "4&#xD7;6"
 #~ msgstr "4&#xD7;6"
@@ -772,16 +1094,12 @@ msgstr "Shranjevanje strani %d od %d"
 #~ msgid "TRUE if the application window is maximized"
 #~ msgstr "PRAV, če je okno programa razpeto"
 
-#~ msgid "SANE device to acquire images from."
-#~ msgstr "Naprava SANE za pridobivanje slik."
-
 #~ msgid "Window height in pixels"
 #~ msgstr "Višina okna v točkah"
 
 #~ msgid "Window width in pixels"
 #~ msgstr "Širina okna v točkah"
 
-#, c-format
 #~ msgid ""
 #~ "Help Options:\n"
 #~ "  -d, --debug                     Print debugging messages\n"
@@ -801,53 +1119,15 @@ msgstr "Shranjevanje strani %d od %d"
 #~ msgstr "Izberite _vrsto datoteke"
 
 #~ msgid ""
-#~ "The directory to save files to. Defaults to the documents directory if unset."
-#~ msgstr ""
-#~ "Mapa za shranjevanje datotek. Privzeto mapa dokumentov, če ni nastavljena."
-
-#~ msgid "Directory to save files to"
-#~ msgstr "Mapa za shranjevanje datotek"
-
-#~ msgid ""
-#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
-#~ msgstr ""
-#~ "Višina papirja v desetinkah milimetra (ali 0 za samodejno zaznavanje "
-#~ "papirja)."
-
-#~ msgid "Height of paper in tenths of a mm"
-#~ msgstr "Višina papirja v desetinkah milimetra"
-
-#~ msgid "Width of paper in tenths of a mm"
-#~ msgstr "Širina papirja v desetinkah milimetra"
-
-#~ msgid ""
-#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
-#~ msgstr ""
-#~ "Širina papirja v desetinkah milimetra (ali 0 za samodejno zaznavanje)."
-
-#~ msgid ""
-#~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+#~ "The page side to scan. It can be one of the following: 'both' 'front' "
+#~ "'back'"
 #~ msgstr ""
-#~ "Stran strani za optično branje. Lahko je eno od naslednjega: 'obe' 'spredaj' "
-#~ "'zadaj'"
-
-#~ msgid "Page side to scan"
-#~ msgstr "Stran strani za optično branje"
+#~ "Stran strani za optično branje. Lahko je eno od naslednjega: 'obe' "
+#~ "'spredaj' 'zadaj'"
 
 #~ msgid "Height of scanned image in pixels"
 #~ msgstr "Višina optično prebrane slike v točkah"
 
-#~ msgid "Resolution for photo scans"
-#~ msgstr "Ločljivost za optično branje fotografij"
-
-#~ msgid "Resolution for text scans"
-#~ msgstr "Ločljivost za optično branje besedil"
-
-#~ msgid "Device to scan from"
-#~ msgstr "Naprava za optično branje"
-
 #~ msgid "Direction of scan"
 #~ msgstr "Smer optičnega branja"
 
@@ -855,32 +1135,24 @@ msgstr "Shranjevanje strani %d od %d"
 #~ msgstr "Ločljivost zadnjega optičnega branja"
 
 #~ msgid ""
-#~ "The direction of the scanner across the scanned page. It can be one of the "
-#~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+#~ "The direction of the scanner across the scanned page. It can be one of "
+#~ "the following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-"
+#~ "left'"
 #~ msgstr ""
-#~ "Smer optičnega branja čez optično brano stran. Lahko je ena od naslednjih: "
-#~ "'od-zgoraj-navzdol' 'od-spodaj-navzgor' 'od-leve-proti-desni' 'od-desne-"
-#~ "proti-levi'"
+#~ "Smer optičnega branja čez optično brano stran. Lahko je ena od "
+#~ "naslednjih: 'od-zgoraj-navzdol' 'od-spodaj-navzgor' 'od-leve-proti-desni' "
+#~ "'od-desne-proti-levi'"
 
 #~ msgid ""
 #~ "The height of scanned image in pixels. This value is updated to what the "
 #~ "last scanned page was."
 #~ msgstr ""
-#~ "Višina optično brane slike v točkah. Ta vrednost je posodobljena na vrednost "
-#~ "zadnje optično prebrane strani."
+#~ "Višina optično brane slike v točkah. Ta vrednost je posodobljena na "
+#~ "vrednost zadnje optično prebrane strani."
 
 #~ msgid "The resolution in dots-per-inch of the previously scanned image."
 #~ msgstr "Ločljivost zadnjega optičnega branja v točkah na palec (dpi)"
 
-#~ msgid "The resolution in dots-per-inch to use when scanning text."
-#~ msgstr "Ločljivost optičnega branja besedil v točkah na palec (dpi)"
-
-#~ msgid "The resolution in dots-per-inch to use when scanning photos."
-#~ msgstr "Ločljivost optičnega branja fotografij v točkah na palec (dpi)"
-
-#~ msgid "Type of document being scanned"
-#~ msgstr "Vrsta optično branega dokumenta"
-
 #~ msgid ""
 #~ "Type of document being scanned. 'text' for text documents, 'photo' for "
 #~ "photos. This setting decides on the scan resolution, colors and post-"
@@ -891,16 +1163,15 @@ msgstr "Shranjevanje strani %d od %d"
 #~ "branja, barve in nadaljnje obdvelovanje"
 
 #~ msgid ""
-#~ "The width of scanned image in pixels. This value is updated to what the last "
-#~ "scanned page was."
+#~ "The width of scanned image in pixels. This value is updated to what the "
+#~ "last scanned page was."
 #~ msgstr ""
-#~ "Širina optično brane slike v točkah. Ta vrednost je posodobljena na vrednost "
-#~ "zadnje optično brane strani."
+#~ "Širina optično brane slike v točkah. Ta vrednost je posodobljena na "
+#~ "vrednost zadnje optično brane strani."
 
 #~ msgid "Width of scanned image in pixels"
 #~ msgstr "Širina optično brane slike v točkah"
 
-#, c-format
 #~ msgid ""
 #~ "Usage:\n"
 #~ "  %s [DEVICE...] - Scanning utility"
@@ -908,7 +1179,6 @@ msgstr "Shranjevanje strani %d od %d"
 #~ "Uporaba:\n"
 #~ "  %s [NAPRAVA ...] - Pripomoček optičnega branja"
 
-#, c-format
 #~ msgid ""
 #~ "GTK+ Options:\n"
 #~ "  --class=CLASS                   Program class as used by the window "
@@ -928,39 +1198,8 @@ msgstr "Shranjevanje strani %d od %d"
 #~ "  --gtk-module=MODULES Naloži dodatnemodule GTK+\n"
 #~ "  --g-fatal-warnings Naredi vsa opozorila usodna"
 
-#~ msgid "Scanned Document"
-#~ msgstr "Optično bran dokument"
-
 #~ msgid "Please check your installation"
 #~ msgstr "Preverite svojo namestitev"
 
-#~ msgid "The page side to scan."
-#~ msgstr "Stran strani za optično branje."
-
-#~ msgid ""
-#~ "Type of document being scanned. This setting decides on the scan resolution, "
-#~ "colors and post-processing."
-#~ msgstr ""
-#~ "Vrsta dokumenta za optično branje. Ta nastavitev določi ločljivost tiskanja, "
-#~ "barve in poobdelovo."
-
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "Smer optičnega bralnika na optično brani strani."
-
-#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
-#~ msgstr "Prilagoditev kontrasta od -100 do 100 (0 kot brez)."
-
-#~ msgid "Contrast of scan"
-#~ msgstr "Kontrast optičnega branja"
-
-#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
-#~ msgstr "Prilagoditev svetlosti od -100 do 100 (0 kot brez)."
-
-#~ msgid "Brightness of scan"
-#~ msgstr "Svetlost optičnega branja"
-
-#~ msgid "Quality value to use for JPEG compression."
-#~ msgstr "Vrednost kakovosti za stiskanje JPEG."
-
-#~ msgid "Quality value to use for JPEG compression"
-#~ msgstr "Vrednost kakovosti za stiskanje JPEG"
diff --git a/po/sq.gmo b/po/sq.gmo
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..0b7213a 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -7,296 +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"
+"POT-Creation-Date: 2017-04-16 08:54-0400\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"
+"Language: sq\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-25 06:09+0000\n"
+"X-Generator: Launchpad (build 18361)\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:231 src/simple-scan.ui:815 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:247
 msgid "_Document"
 msgstr "_Dokumenti"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/simple-scan.ui:266
 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:279 src/simple-scan.ui:1343 src/simple-scan.ui:1402
 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:289 src/simple-scan.ui:1352 src/simple-scan.ui:1411
 msgid "All Pages From _Feeder"
 msgstr "Të Gjitha Faqet Nga _Ushqyesi"
 
+#. 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 "_Ndalo Skanimin"
 
-#: 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 "Tekst"
 
-#: 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 "Foto"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/simple-scan.ui:352 src/ui.vala:1247 src/ui.vala:1891
 msgid "Reorder Pages"
 msgstr "Riorganizo faqet"
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/simple-scan.ui:371
 msgid "_Email"
 msgstr "_Email"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:436
 msgid "_Page"
 msgstr "_Faqe"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:446
 msgid "Rotate _Left"
 msgstr "Rrotullo _Majtas"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:456
 msgid "Rotate _Right"
 msgstr "Rrotullo _Djathtas"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:466
 msgid "_Crop"
 msgstr "_Prije"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:476
 msgid "_None"
 msgstr "_Asnjë"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:487
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:498
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:509
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:520
 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:531
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:542
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:553
 msgid "_Custom"
 msgstr "_Sipas përdoruesit"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:571
 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:584
 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:593
 msgid "Move Right"
 msgstr "Lëvize Djathtas"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:630
 msgid "_Help"
 msgstr "_Ndihmë"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:638
 msgid "_Contents"
 msgstr "_Përmbajtje"
 
 #. 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 "Filloje një dokument të ri"
 
-#: data/simple-scan.ui:675
+#: src/simple-scan.ui:681
 msgid "New"
 msgstr "I ri"
 
 #. 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 "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:697 src/simple-scan.ui:843
 msgid "Scan"
 msgstr "Skanim"
 
 #. 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 "Ruaje dokumentin tek një fajll"
 
-#: ../src/ui.vala:1842
+#: src/simple-scan.ui:715 src/ui.vala:1892
 msgid "Save"
 msgstr "Ruaj"
 
 #. 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 "Ndaloje skanimin e tanishëm"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:731 src/simple-scan.ui:831
 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:755 src/simple-scan.ui:942
 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:756
 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:770 src/simple-scan.ui:920
 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:771
 msgid "Rotate Right"
 msgstr "Rrotullo Djathtas"
 
-#: 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 "Preje faqen e përzgjedhur"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:787
 msgid "Crop"
 msgstr "Prej"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:1003 src/ui.vala:1898
 msgid "Preferences"
 msgstr "Parapëlqimet"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1054
 msgid "Scan S_ource:"
 msgstr "Skanoje b_urimin"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1085
 msgid "_Text Resolution:"
 msgstr "_Rezolucioni i Tekstit:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1101
 msgid "_Photo Resolution:"
 msgstr "_Rezolucioni i Fotos:"
 
 #. Label beside scan side combo box
-#: data/simple-scan.ui:1139
+#: src/simple-scan.ui:1145
 msgid "Scan Side:"
 msgstr "Skanoje anën"
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1175
 msgid "Page Size:"
 msgstr "Përmasa e Faqes:"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1205
 msgid "Brightness:"
 msgstr "Ndriçimi:"
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1235
 msgid "Contrast:"
 msgstr "Kontrasti:"
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1266
 msgid "Quality:"
 msgstr "Cilësia:"
 
+#. 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 "Skanoj Dokumentet"
 
@@ -308,7 +322,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 +330,212 @@ 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:844
 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:874
 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:1227
 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:1240 src/scanner.vala:1340
 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:332 src/ui.vala:1655 src/ui.vala:1935
 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:341
 #, 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:389
 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:391
 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:396
 msgid "Additional software needed"
-msgstr ""
+msgstr "Kërkohet program shtesë"
 
 #. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:398
 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:510
 msgid "Save As..."
 msgstr "Ruaje Si..."
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:513 src/ui.vala:648 src/ui.vala:723
 msgid "_Cancel"
 msgstr "_Anullo"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:514 src/ui.vala:724
 msgid "_Save"
 msgstr "_Ruaje"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:522
 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:528
 msgid "Image Files"
 msgstr "Kartela Pamje"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:534
 msgid "All Files"
 msgstr "Të Gjithë Skedarët"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:543
 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:549
 msgid "JPEG (compressed)"
 msgstr "JPEG (i ngjeshur)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:555
 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:564
 msgid "File format:"
 msgstr "Formati i skedarit:"
 
+#. 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:650
+#: src/ui.vala:698
 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:721
 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:763
 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:765
 msgid "Discard Changes"
 msgstr "Anullo Ndryshimet"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:1056
 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:1068
 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:1270
 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:1280
 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:1290
 msgid "Reverse"
 msgstr "Mbrapsht"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1300
 msgid "Keep unchanged"
 msgstr "Mbaje të pandryshuar"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1504
 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: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"
@@ -539,16 +564,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:1528
 msgid "About Simple Scan"
 msgstr "Rreth Skanimit të Thjeshtë"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1531
 msgid "Simple document scanning tool"
 msgstr "Mjet i thjeshtë për skanimin e dokumenteve"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1540
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -558,189 +583,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:1562
 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:1564
 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:1632
 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:1634
 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:1638
 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:1640
 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:1644
 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:1649
 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:1651
 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:1655
 msgid "Install drivers"
-msgstr ""
+msgstr "Instalo draiverat"
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1686
 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:1698
 msgid "Installing drivers..."
-msgstr ""
+msgstr "Instalim i draiverave..."
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1706
 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:1716
 #, 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:1722
 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:1729
 #, 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:1833
 #, 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:1836
 #, 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:1839
 #, 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:1842
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1885
 msgid "New Document"
 msgstr "Dokument i ri"
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1890
 msgid "Document"
 msgstr "Dokument"
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1893
 msgid "Email..."
 msgstr "Email..."
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1894
 msgid "Print..."
 msgstr "Printo..."
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1902
 msgid "Help"
 msgstr "Ndihmë"
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1903
 msgid "About"
 msgstr "Rreth"
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1904
 msgid "Quit"
 msgstr "Dil"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1937
 msgid "Change _Scanner"
 msgstr "Ndrysho _Skanerin"
 
 #. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1939
 msgid "_Install Drivers"
 msgstr "_Instalo Draiverat"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1945
 msgid "Automatic"
 msgstr "Automatik"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1995
 msgid "Darker"
 msgstr "Më e Errët"
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1997
 msgid "Lighter"
 msgstr "Më e lehtë"
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:2005
 msgid "Less"
 msgstr "Më Pak"
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:2007
 msgid "More"
 msgstr "Më tepër"
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:2015
 msgid "Minimum"
 msgstr "Minimum"
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:2017
 msgid "Maximum"
 msgstr "Maksimum"
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2068
 msgid "Saving document..."
 msgstr "Ruajtje e dokumentit..."
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2242
 #, 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..2364af0 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -2,517 +2,529 @@
 # Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
 # This file is distributed under the same license as the simple-scan package.
 # Мирослав Николић <miroslavnikolic@rocketmail.com>, 2011—2016.
+# Борисав Живановић <borisavzivanovic@gmail.com>, 2017.
 msgid ""
 msgstr ""
-"Project-Id-Version: simple-scan\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-07-29 12:47+1200\n"
-"PO-Revision-Date: 2016-02-08 06:49+0000\n"
-"Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
-"Language-Team: Serbian <gnom@prevod.org>\n"
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
+"product=simple-scan&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-08-15 20:17+0000\n"
+"PO-Revision-Date: 2017-08-06 13:06+0200\n"
+"Last-Translator: Борисав Живановић <borisavzivanovic@gmail.com>\n"
+"Language-Team: Serbian\n"
+"Language: sr\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"
-"Language: sr\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Poedit 2.0.3\n"
 
-#. Button to submit authorization dialog
-#: data/simple-scan.ui:24
-msgid "_Authorize"
-msgstr "_Овласти"
+#: data/org.gnome.SimpleScan.gschema.xml:11
+msgid "Device to scan from"
+msgstr "Уређај за скенирање"
 
-#. Label beside username entry
-#: data/simple-scan.ui:102
-msgid "_Username for resource:"
-msgstr "_Корисничко име за извор:"
+#: data/org.gnome.SimpleScan.gschema.xml:12
+msgid "SANE device to acquire images from."
+msgstr "САНЕ уређај за стварање слика."
 
-#. Label beside password entry
-#: data/simple-scan.ui:117
-msgid "_Password:"
-msgstr "_Лозинка:"
+#: data/org.gnome.SimpleScan.gschema.xml:20
+msgid "Type of document being scanned"
+msgstr "Врста скенираног документа"
 
-#. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
-msgid "Front and Back"
-msgstr "Лице и позадина"
+#: data/org.gnome.SimpleScan.gschema.xml:21
+msgid ""
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+msgstr ""
+"Врста документа који се скенира. Ово подешавање утиче на резолуцију, боје и "
+"накнадну обраду."
 
-#. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
-msgid "Front"
-msgstr "Лице"
+#: data/org.gnome.SimpleScan.gschema.xml:25
+msgid "Width of paper in tenths of a mm"
+msgstr "Ширина папира у десетим деловима милиметра"
 
-#. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
-msgid "Back"
-msgstr "Позадина"
+#: data/org.gnome.SimpleScan.gschema.xml:26
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"Ширина папира у десетим деловима милиметра (унети 0 за аутоматско "
+"препознавање папира)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:30
+msgid "Height of paper in tenths of a mm"
+msgstr "Висина папира у десетим деловима милиметра"
+
+#: data/org.gnome.SimpleScan.gschema.xml:31
+msgid ""
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"Висина папира у десетим деловима милиметра (унети 0 за аутоматско "
+"препознавање папира)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:35
+msgid "Brightness of scan"
+msgstr "Осветљеност приликом скенирања"
+
+#: data/org.gnome.SimpleScan.gschema.xml:36
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr "Подешавање осветљености од -100 до 100 (0 за никакво осветљење)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:40
+msgid "Contrast of scan"
+msgstr "Контраст приликом скенирања"
+
+#: data/org.gnome.SimpleScan.gschema.xml:41
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr "Подешавање контраста од -100 до 100 (0 за без контраста)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:45
+msgid "Resolution for text scans"
+msgstr "Резолуција скенирања текста"
+
+#: data/org.gnome.SimpleScan.gschema.xml:46
+msgid "The resolution in dots-per-inch to use when scanning text."
+msgstr "Резолуција у тачкама по инчу за пробно скенирање."
+
+#: data/org.gnome.SimpleScan.gschema.xml:50
+msgid "Resolution for photo scans"
+msgstr "Резолуција скенирања слика"
+
+#: data/org.gnome.SimpleScan.gschema.xml:51
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr "Резолуција у тачкама по инчу за скенирање слика."
+
+#: data/org.gnome.SimpleScan.gschema.xml:55
+msgid "Page side to scan"
+msgstr "Страна папира за скенирање"
+
+#: data/org.gnome.SimpleScan.gschema.xml:56
+msgid "The page side to scan."
+msgstr "Страна папира за скенирање."
+
+#: data/org.gnome.SimpleScan.gschema.xml:60
+msgid "Directory to save files to"
+msgstr "Директоријум за чување датотека"
+
+#: data/org.gnome.SimpleScan.gschema.xml:61
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+"Директоријум за чување датотека. Подразумевана локација је директоријум за "
+"документе."
+
+#: data/org.gnome.SimpleScan.gschema.xml:66
+msgid "Quality value to use for JPEG compression"
+msgstr "Квалитет ЈПЕГ компресије"
+
+#: data/org.gnome.SimpleScan.gschema.xml:67
+msgid "Quality value to use for JPEG compression."
+msgstr "Квалитет ЈПЕГ компресије."
 
+#: data/org.gnome.SimpleScan.gschema.xml:72
+msgid "Delay in millisecond between pages"
+msgstr "Размак у милисекундама између страница"
+
+#: data/org.gnome.SimpleScan.gschema.xml:73
+msgid "Delay in millisecond between pages."
+msgstr "Размак у милисекундама између страница."
+
+#. Title of scan window
+#. Set HeaderBar title here because Glade doesn't keep it translated
+#. https://bugzilla.gnome.org/show_bug.cgi?id=782753
 #. 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
+#: data/simple-scan.appdata.xml.in:6 data/simple-scan.desktop.in:3
+#: src/app-window.ui:76 src/app-window.vala:1560
 msgid "Simple Scan"
-msgstr "Обично скенирање"
+msgstr "Једноставно cкенирање"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
-msgid "_Document"
-msgstr "_Документ"
+#: data/simple-scan.appdata.xml.in:7 data/simple-scan.desktop.in:5
+msgid "Scan Documents"
+msgstr "Скенирајте документе"
 
-#. Scan menu item
-#: data/simple-scan.ui:260
-msgid "Sc_an"
-msgstr "С_кенирај"
+#: 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 "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+"Веома једноставан начин за скенирање докумената и слика. Можете исећи лоше "
+"делове слике и ротирати је ако је окренута на погрешну страну. Можете "
+"штампати скениране датотеке, сачувати их у формату ПДФ или у великом избору "
+"осталих формата."
 
+#: data/simple-scan.appdata.xml.in:14
+msgid "Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+"Једноставно Скенирање користи САНЕ фрејмворк као подршку за велики број "
+"скенера."
+
+#: data/simple-scan.desktop.in:4
+msgid "Document Scanner"
+msgstr "Скенер за документе"
+
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: data/simple-scan.desktop.in:7
+msgid "scan;scanner;flatbed;adf;"
+msgstr ""
+"scan;scanner;flatbed;adf;скенирање;скенер;копирање;skeniranje;skener;"
+"kopiranje;"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: data/simple-scan.desktop.in:10
+msgid "scanner"
+msgstr "scanner"
+
+#. Toolbar scan menu item to scan a single page from the scanner
 #. 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/app-window.ui:22 src/app-window.ui:123 src/app-window.ui:820
 msgid "Single _Page"
-msgstr "Једну _страницу"
+msgstr "_Једонострано"
 
+#. Toolbar scan menu item to scan all pages from a document feeder
 #. 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/app-window.ui:31 src/app-window.ui:133 src/app-window.ui:829
 msgid "All Pages From _Feeder"
-msgstr "Све странице из _фиоке"
+msgstr "Све странице из _фиоке скенера"
 
-#. Menu entry to stop current scan
-#: data/simple-scan.ui:294
-msgid "_Stop Scan"
-msgstr "_Заустави скенирање"
+#. Toolbar scan menu item to scan continuously from the flatbed
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/app-window.ui:40 src/app-window.ui:143 src/app-window.ui:838
+msgid "_Multiple Pages From Flatbed"
+msgstr "_Више страница са положеног скенера"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:853
 msgid "Text"
 msgstr "Текст"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:863
 msgid "Photo"
 msgstr "Слика"
 
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: src/app-window.ui:91
+msgid "_Document"
+msgstr "_Документ"
+
+#. Scan menu item
+#: src/app-window.ui:110
+msgid "Sc_an"
+msgstr "_Скенирај"
+
+#. Menu entry to stop current scan
+#: src/app-window.ui:154
+msgid "_Stop Scan"
+msgstr "_Заустави скенирање"
+
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/app-window.ui:196 src/app-window.vala:967 src/app-window.vala:1590
 msgid "Reorder Pages"
-msgstr "Промени ред страница"
+msgstr "Промените распоред страница"
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/app-window.ui:215
 msgid "_Email"
-msgstr "_Ел. пошта"
+msgstr "_Е-пошта"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/app-window.ui:280
 msgid "_Page"
-msgstr "_Страница"
+msgstr "Ст_раница"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/app-window.ui:290
 msgid "Rotate _Left"
-msgstr "Окрени на _лево"
+msgstr "Ротирај на_лево"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/app-window.ui:300
 msgid "Rotate _Right"
-msgstr "Окрени на _десно"
+msgstr "Ротирај на_десно"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/app-window.ui:310
 msgid "_Crop"
-msgstr "_Опсеци"
+msgstr "_Исеци"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/app-window.ui:320
 msgid "_None"
 msgstr "_Ништа"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/app-window.ui:331
 msgid "A_4"
-msgstr "А_4"
+msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/app-window.ui:342
 msgid "A_5"
-msgstr "А_5"
+msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/app-window.ui:353
 msgid "A_6"
-msgstr "А_6"
+msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/app-window.ui:364
 msgid "_Letter"
-msgstr "_Америчко писмо"
+msgstr "_Писмо"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/app-window.ui:375
 msgid "Le_gal"
-msgstr "_Легал"
+msgstr "_УС легал"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/app-window.ui:386
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/app-window.ui:397
 msgid "_Custom"
 msgstr "_Произвољно"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/app-window.ui:415
 msgid "_Rotate Crop"
-msgstr "_Заокрени опсечено"
+msgstr "Ро_тирај исечак"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/app-window.ui:428
 msgid "Move Left"
-msgstr "Помери улево"
+msgstr "Помери налево"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/app-window.ui:437
 msgid "Move Right"
-msgstr "Помери удесно"
+msgstr "Помери надесно"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/app-window.ui:474
 msgid "_Help"
-msgstr "По_моћ"
+msgstr "_Помоћ"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/app-window.ui:482
 msgid "_Contents"
-msgstr "_Садржај"
-
-#. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
-msgid "Start a new document"
-msgstr "Покрените нови документ"
-
-#: data/simple-scan.ui:675
-msgid "New"
-msgstr "Ново"
+msgstr "Садр_жај"
 
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/app-window.ui:520 src/app-window.ui:720
 msgid "Scan a single page from the scanner"
-msgstr "Скенирајте једну страницу са скенера"
+msgstr "Скенирај једну стану са скенера"
 
 #. Label on scan toolbar item
-#: data/simple-scan.ui:691 data/simple-scan.ui:837
+#: src/app-window.ui:522 src/app-window.ui:716
 msgid "Scan"
 msgstr "Скенирај"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/app-window.ui:538 src/app-window.ui:787
 msgid "Save document to a file"
-msgstr "Сачувајте документ у датотеку"
+msgstr "Сачувај документ у датотеку"
 
-#: ../src/ui.vala:1842
+#: src/app-window.ui:540
 msgid "Save"
 msgstr "Сачувај"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/app-window.ui:555 src/app-window.ui:700
 msgid "Stop the current scan"
-msgstr "Зауставите текуће скенирање"
+msgstr "Заустави скенирање"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/app-window.ui:556 src/app-window.ui:697
 msgid "Stop"
 msgstr "Заустави"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "Окрените страницу на лево (супротно смеру казаљке на сату)"
-
-#. Label on rotate page left (anti-clockwise) item
-#: data/simple-scan.ui:750
-msgid "Rotate Left"
-msgstr "Окрени на лево"
-
-#. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
-msgid "Rotate the page to the right (clockwise)"
-msgstr "Окрените страницу на десно (у смеру казаљке на сату)"
-
-#. Label on rotate page right (clockwise) item
-#: data/simple-scan.ui:765
-msgid "Rotate Right"
-msgstr "Окрени на десно"
-
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
-msgid "Crop the selected page"
-msgstr "Одрежите изабрану страницу"
-
-#: data/simple-scan.ui:781
-msgid "Crop"
-msgstr "Одрежи"
-
-#: ../src/ui.vala:1849
-msgid "Preferences"
-msgstr "Поставке"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1048
-msgid "Scan S_ource:"
-msgstr "_Извор скенирања:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1079
-msgid "_Text Resolution:"
-msgstr "Резолуција _текста:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1095
-msgid "_Photo Resolution:"
-msgstr "Резолуција _слике:"
-
-#. Label beside scan side combo box
-#: data/simple-scan.ui:1139
-msgid "Scan Side:"
-msgstr "Странице за скенирање:"
-
-#. Label beside page size combo box
-#: data/simple-scan.ui:1169
-msgid "Page Size:"
-msgstr "Величина странице:"
+#. Label shown when searching for scanners
+#: src/app-window.ui:611
+msgid "Searching for Scanners…"
+msgstr "Тражење скенера…"
 
-#. Label beside brightness scale
-#: data/simple-scan.ui:1199
-msgid "Brightness:"
-msgstr "Осветљај:"
-
-#. Label beside contrast scale
-#: data/simple-scan.ui:1229
-msgid "Contrast:"
-msgstr "Контраст:"
-
-#. Label beside quality scale
-#: data/simple-scan.ui:1260
-msgid "Quality:"
-msgstr "Квалитет:"
-
-#: data/simple-scan.desktop.in:4
-msgid "Document Scanner"
-msgstr "Скенер докумената"
-
-#: data/simple-scan.desktop.in:5
-msgid "Scan Documents"
-msgstr "Скенирајте документе"
+#: src/app-window.vala:237 src/app-window.vala:1380
+msgid "_Close"
+msgstr "_Затвори"
 
-#: data/simple-scan.desktop.in:6
-msgid "scan;scanner;flatbed;adf;"
-msgstr "скенирај;скенер;flatbed;adf;"
+#. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
+#: src/app-window.vala:246
+#, c-format
+msgid "Username and password required to access “%s”"
+msgstr "Име налога и лозинка који су потребни за приступ “%s”"
 
-#: data/simple-scan.desktop.in:8
-msgid "scanner"
-msgstr ""
+#. Label shown when detected a scanner
+#: src/app-window.vala:266 src/app-window.vala:584
+msgid "Ready to Scan"
+msgstr "Спреман за скенирање"
 
-#: data/simple-scan.appdata.xml.in:8
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-"Једноставно решење за лако скенирање докумената и слика. Можете отсећи лоше "
-"делове слика и окренути скенирано. Можете штампати скенирано, одрадити извоз "
-"у ПДФ или сачувати скенирано у један од мноштва подржаних формата слика."
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: src/app-window.vala:273
+msgid "Additional software needed"
+msgstr "Потребан је додатни софтвер"
 
-#: data/simple-scan.appdata.xml.in:13
+#. Instructions to install driver software
+#: src/app-window.vala:275
 msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
+"You need to <a href=\"install-firmware\">install driver software</a> for "
+"your scanner."
 msgstr ""
-"Обично скенирање користи САНЕ радни оквир да би додатно подржао већину "
-"тренутних скенера."
-
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
-msgid "No scanners available.  Please connect a scanner."
-msgstr "Нема доступних скенера.  Прикључите скенер."
-
-#. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
-msgid "Unable to connect to scanner"
-msgstr "Не могу да се повежем са скенером"
-
-#. Error display when unable to start scan
-#: ../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
-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 "Исписује поруке за отклањање грешака"
-
-#: ../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
-msgid "Failed to scan"
-msgstr "Нисам успео да скенирам"
-
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
-msgid "[DEVICE...] - Scanning utility"
-msgstr "[УРЕЂАЈ...] — алатка за скенирање"
-
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
-#, c-format
-msgid "Run '%s --help' to see a full list of available command line options."
-msgstr ""
-"Покрените „%s --help“ за потпуни списак свих опција из командне линије."
-
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
-msgid "_Close"
-msgstr "_Затвори"
-
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
-#, c-format
-msgid "Username and password required to access '%s'"
-msgstr "Корисничко име и лозинка су обавезни за приступ „%s“"
+"Морате да <a href=\"install-firmware\">инсталирате управљачки програм</a> за "
+"Ваш скенер."
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/app-window.vala:281
 msgid "No scanners detected"
-msgstr "Нема откривених скенера"
+msgstr "Ниједан скенер није пронађен"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/app-window.vala:283
 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
-msgid "Additional software needed"
-msgstr "Потребан је додатни софтвер"
-
-#. Instructions to install driver software
-#: ../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
-msgid "Save As..."
-msgstr "Сачувај као..."
+#: src/app-window.vala:298
+msgid "Save As…"
+msgstr "Сачувај као…"
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/app-window.vala:301 src/app-window.vala:471 src/app-window.vala:552
 msgid "_Cancel"
 msgstr "_Откажи"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/app-window.vala:302 src/app-window.vala:553
 msgid "_Save"
 msgstr "_Сачувај"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/app-window.vala:310
 msgid "Scanned Document.pdf"
 msgstr "Скенирани документ.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#. Save dialog: Filter name to show only supported image files
+#: src/app-window.vala:316
 msgid "Image Files"
 msgstr "Датотеке слика"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/app-window.vala:326
 msgid "All Files"
 msgstr "Све датотеке"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/app-window.vala:335
 msgid "PDF (multi-page document)"
 msgstr "ПДФ (документ са више страна)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/app-window.vala:341
 msgid "JPEG (compressed)"
-msgstr "ЈПЕГ (сажето)"
+msgstr "ЈПЕГ (компримовани)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/app-window.vala:347
 msgid "PNG (lossless)"
 msgstr "ПНГ (без губитака)"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#. Save dialog: Label for sabing in WEBP format
+#: src/app-window.vala:354
+msgid "WebP (compressed)"
+msgstr "ВебП (компримовани)"
+
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
+#: src/app-window.vala:364
 msgid "File format:"
-msgstr "Запис датотеке:"
+msgstr "Формат датотеке:"
+
+#. Label in save dialog beside compression slider
+#: src/app-window.vala:376
+msgid "Compression:"
+msgstr "Компресија:"
+
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/app-window.vala:470
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr "Датотека са називом “%s” већ постоји.  Да ли желите да је замените?"
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/app-window.vala:473
+msgid "_Replace"
+msgstr "_Замени"
+
+#: src/app-window.vala:512
+msgid "Saving"
+msgstr "Чување"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/app-window.vala:527
 msgid "Failed to save file"
-msgstr "Нисам успео да сачувам датотеку"
+msgstr "Чување датотеке није успело"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
-msgid "If you don't save, changes will be permanently lost."
-msgstr "Уколико не сачувате, измене ће бити трајно изгубљене."
+#: src/app-window.vala:550
+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/app-window.vala:591
 msgid "Save current document?"
-msgstr "Да сачувам текући документ?"
+msgstr "Сачувати тренутни документ?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/app-window.vala:593
 msgid "Discard Changes"
 msgstr "Одбаци измене"
 
+#. Label shown when scan started
+#: src/app-window.vala:692
+msgid "Contacting scanner…"
+msgstr "Контактирање скенера…"
+
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/app-window.vala:800
 msgid "Unable to save image for preview"
-msgstr "Не могу да сачувам слику за преглед"
+msgstr "Чување пробне слике није успело"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/app-window.vala:812
 msgid "Unable to open image preview application"
-msgstr "Не могу да отворим програм за приказивање слика"
+msgstr "Покретање програма за приказ слике није успело"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/app-window.vala:990
 msgid "Combine sides"
-msgstr "Обједини стране"
+msgstr "Комбинуј странице"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/app-window.vala:1000
 msgid "Combine sides (reverse)"
-msgstr "Обједини стране (преокрени)"
+msgstr "Комбинуј странице (уназад)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/app-window.vala:1010
 msgid "Reverse"
-msgstr "Преокрени"
+msgstr "Изокрени"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/app-window.vala:1020
 msgid "Keep unchanged"
-msgstr "Задржи неизмењено"
+msgstr "Без измена"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/app-window.vala:1250
 msgid "Unable to open help file"
-msgstr "Не могу да отворим датотеку помоћи"
+msgstr "Није могуће отворити датотеку помоћи"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/app-window.vala:1271
 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"
@@ -527,31 +539,30 @@ 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 ""
-"Овај програм је слободан софтвер: можете га делити и/или\n"
-"мењати под условима Гнуове Опште јавне лиценце коју је\n"
-"објавила Задужбина слободног софтвера, било верзије 3\n"
-"лиценце, или (по вашем избору) било које новије верзије.\n"
+"Овај пограм је слободан софтвер: можете га делити и/или модификовати\n"
+"под условима ГНУ-ове Опште јавне лиценце коју је објавила\n"
+"Задужбина за Слободан Софтвер, верзија 3 или\n"
+"по вашој жељи било која старија верзија.\n"
 "\n"
-"Овај програм се расподељује у нади да ће бити користан,\n"
-"али БЕЗ ИКАКВЕ ГАРАНЦИЈЕ, чак и без примењене гаранције\n"
-"ТРЖИШНЕ ВРЕДНОСТИ или ПРИЛАГОЂЕНОСТИ ОДРЕЂЕНОЈ НАМЕНИ.\n"
-"Погледајте ГНУ Општу јавну лиценцу за више детаља.\n"
+"Овај програм је доступан у нади да ће бити користан,\n"
+"али БЕЗ БИЛО КАКВЕ ГАРАНЦИЈЕ; чак и без претпостављене гаранције\n"
+"на МОГУЋНОСТ ПРОДАЈЕ и СЛУЖЕЊА НАМЕНИ. Погледајте\n"
+"ГНУ-ову Општу јавну лиценцу за више детаља.\n"
 "\n"
-"Требали сте да примите примерак ГНУ Опште јавне лиценце\n"
-"уз овај програм. Ако нисте, погледајте:\n"
-"http://www.gnu.org/licenses/."
+"Требало би да сте добили копију ГНУ-ове Опште јавне лиценце\n"
+"уз овај програм. Ако нисте посетите <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/app-window.vala:1274
 msgid "About Simple Scan"
-msgstr "О Једноставном скенирању"
+msgstr "О програму Једноставно Скенирање"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/app-window.vala:1277
 msgid "Simple document scanning tool"
 msgstr "Једноставна алатка за скенирање докумената"
 
-#: ../src/ui.vala:1487
+#: src/app-window.vala:1286
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -560,409 +571,470 @@ msgstr ""
 "  Launchpad Translations Administrators https://launchpad.net/~rosetta\n"
 "  Michael Hoth https://launchpad.net/~hoth-einbeck\n"
 "  Марко М. Костић https://launchpad.net/~marko-m-kostic\n"
-"  Мирослав Николић https://launchpad.net/~lipek"
+"  Мирослав Николић https://launchpad.net/~lipek\n"
+"Serbian GNOME Translation Project:\n"
+"  Борисав Живановић <borisavzivanovic@gmail.com>"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/app-window.vala:1308
 msgid "Save document before quitting?"
 msgstr "Да сачувам документ пре него што изађем?"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:1310
 msgid "Quit without Saving"
-msgstr "Изађи без чувања"
+msgstr "Затвори без чувања"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/app-window.vala:1357
 msgid "You appear to have a Brother scanner."
-msgstr "Изгледа да имате Бродеров скенер."
+msgstr "Изгледа да имате Брадеров скенер."
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/app-window.vala:1359
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.brother.com\">Brother website</a>."
+"Drivers for this are available on the <a href=\"http://support.brother.com"
+"\">Brother website</a>."
 msgstr ""
-"Управљачки програми су доступни на <a "
-"href=\"http://support.brother.com\">веб сајту Бродера</a>."
+"Управљачки програми се налазе на  <a href=\"http://support.brother.com"
+"\">вебсајту Брадера</a>."
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/app-window.vala:1363
 msgid "You appear to have a Samsung scanner."
 msgstr "Изгледа да имате Самсунгов скенер."
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/app-window.vala:1365
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://samsung.com/support\">Samsung website</a>."
+"Drivers for this are available on the <a href=\"http://samsung.com/support"
+"\">Samsung website</a>."
 msgstr ""
-"Управљачки програми су доступни на <a "
-"href=\"http://samsung.com/support\">веб сајту Самсунга</a>."
+"Управљачки програми се налазе на  <a href=\"http://samsung.com/support"
+"\">вебсајту Самсунга</a>."
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/app-window.vala:1369
 msgid "You appear to have an HP scanner."
-msgstr "Изгледа да имате Хевлет-Пакардов скенер."
+msgstr "Изгледа да имате ХП-ов скенер."
 
 #. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/app-window.vala:1374
 msgid "You appear to have an Epson scanner."
 msgstr "Изгледа да имате Епсонов скенер."
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/app-window.vala:1376
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.epson.com\">Epson website</a>."
+"Drivers for this are available on the <a href=\"http://support.epson.com"
+"\">Epson website</a>."
 msgstr ""
-"Управљачки програми су доступни на <a href=\"http://support.epson.com\">веб "
-"сајту Епсона</a>."
+"Управљачки програми се налазе на  <a href=\"http://support.epson.com"
+"\">вебсајту Епсона</a>."
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/app-window.vala:1380
 msgid "Install drivers"
-msgstr "Инсталација управљачких програма"
+msgstr "Инталирај управљачки програм"
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/app-window.vala:1411
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
-"Након инсталације мораћете поново да покренете Једноставно скенирање."
+"Када инсталирате управљачки програм морате поново покренути Једноставно "
+"Скенирање."
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
-msgid "Installing drivers..."
-msgstr "Инсталирам управљачке програме..."
+#: src/app-window.vala:1423
+msgid "Installing drivers…"
+msgstr "Инсталација управљачког програма у току…"
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/app-window.vala:1431
 msgid "Drivers installed successfully!"
-msgstr "Управљачки програми су успешно инсталирани!"
+msgstr "Управљачки програм успешно инсталиран!"
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/app-window.vala:1441
 #, c-format
 msgid "Failed to install drivers (error code %d)."
-msgstr "Нисам успео да инсталирам управљачке програме (грешка %d)."
+msgstr "Инсталација управљачког програма није успела (код грешке  %d)."
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/app-window.vala:1447
 msgid "Failed to install drivers."
-msgstr "Нисам успео да инсталирам управљачке програме."
+msgstr "Инсталација управљачког програма није успела."
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/app-window.vala:1454
 #, 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
-#, c-format
-msgid "%d dpi (default)"
-msgstr "%d тпи (основно)"
-
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../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
-#, 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
-#, c-format
-msgid "%d dpi"
-msgstr "%d тпи"
-
-#: ../src/ui.vala:1835
-msgid "New Document"
-msgstr "Нови документ"
-
-#: ../src/ui.vala:1840
-msgid "Document"
-msgstr "Документ"
-
-#: ../src/ui.vala:1844
-msgid "Email..."
-msgstr "Ел. пошта..."
+msgid "You need to install the %s package."
+msgid_plural "You need to install the %s packages."
+msgstr[0] "Морате инсталирати %s пакет"
+msgstr[1] "Морате инсталирати %s пакетa"
+msgstr[2] "Морате инсталирати %s пакетa"
+
+#. Title of preferences dialog
+#: src/app-window.vala:1568 src/app-window.vala:1591
+#: src/preferences-dialog.ui:53
+msgid "Preferences"
+msgstr "Поставке"
 
-#: ../src/ui.vala:1845
-msgid "Print..."
-msgstr "Штампај..."
+#: src/app-window.vala:1572
+msgid "Keyboard Shortcuts"
+msgstr "Пречице на тастатури"
 
-#: ../src/ui.vala:1853
+#: src/app-window.vala:1573
 msgid "Help"
 msgstr "Помоћ"
 
-#: ../src/ui.vala:1854
+#: src/app-window.vala:1574
 msgid "About"
 msgstr "О програму"
 
-#: ../src/ui.vala:1855
+#: src/app-window.vala:1575
 msgid "Quit"
-msgstr "Изађи"
+msgstr "Излаз"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
-msgid "Change _Scanner"
-msgstr "Промени _скенер"
+#: src/app-window.vala:1589
+msgid "Email"
+msgstr "Е-пошта"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
-msgid "_Install Drivers"
-msgstr "_Инсталирај управљачке програме"
+#. Populate ActionBar (not supported in Glade)
+#. https://bugzilla.gnome.org/show_bug.cgi?id=769966
+#. Label on new document button
+#: src/app-window.vala:1599
+msgid "Start Again…"
+msgstr "_Поново покрени…"
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
-msgid "Automatic"
-msgstr "Самостално"
+#. Tooltip for rotate left (counter-clockwise) button
+#: src/app-window.vala:1616
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Ротирај страницу налево (супротно казаљци на сату)"
 
-#: ../src/ui.vala:1947
-msgid "Darker"
-msgstr "Тамније"
+#. Tooltip for rotate right (clockwise) button
+#: src/app-window.vala:1623
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Ротирај страницу надесно (смер казаљке на сату)"
 
-#: ../src/ui.vala:1949
-msgid "Lighter"
-msgstr "Светлије"
+#. Tooltip for crop button
+#: src/app-window.vala:1633
+msgid "Crop the selected page"
+msgstr "Исеци означену страницу"
 
-#: ../src/ui.vala:1957
-msgid "Less"
-msgstr "Мањи"
+#. Tooltip for delete button
+#: src/app-window.vala:1649
+msgid "Delete the selected page"
+msgstr "Обриши означену страницу"
 
-#: ../src/ui.vala:1959
-msgid "More"
-msgstr "Већи"
+#. Text of button for cancelling save
+#: src/app-window.vala:1814
+msgid "Cancel"
+msgstr "Откажи"
 
-#: ../src/ui.vala:1967
-msgid "Minimum"
-msgstr "Најнижи"
+#. Button to submit authorization dialog
+#: src/authorize-dialog.ui:25
+msgid "_Authorize"
+msgstr "Дај _приступ"
 
-#: ../src/ui.vala:1969
-msgid "Maximum"
-msgstr "Највиши"
+#. Label beside username entry
+#: src/authorize-dialog.ui:99
+msgid "_Username for resource:"
+msgstr "_Корисничко име:"
 
-#: ../src/ui.vala:2008
-msgid "Saving document..."
-msgstr "Чувам документ..."
+#. Label beside password entry
+#: src/authorize-dialog.ui:112
+msgid "_Password:"
+msgstr "_Шифра:"
 
-#: ../src/ui.vala:2173
+#: src/book.vala:331 src/book.vala:337
 #, c-format
-msgid "Saving page %d out of %d"
-msgstr "Чувам %d. страницу од укупно %d"
+msgid "Unable to encode page %i"
+msgstr "Кодирање странице %i није могуће"
+
+#: src/help-overlay.ui:12
+msgctxt "shortcut window"
+msgid "Scanning"
+msgstr "Скенирање"
+
+#: src/help-overlay.ui:17
+msgctxt "shortcut window"
+msgid "Scan a single page"
+msgstr "Скенирање једне странице"
+
+#: src/help-overlay.ui:24
+msgctxt "shortcut window"
+msgid "Scan all pages from document feeder"
+msgstr "Скенирање свих страница из фијоке"
+
+#: src/help-overlay.ui:31
+msgctxt "shortcut window"
+msgid "Scan continuously from a flatbed scanner"
+msgstr "Скенирање без прекида са положеног скенера"
+
+#: src/help-overlay.ui:38
+msgctxt "shortcut window"
+msgid "Stop scan in progress"
+msgstr "Прекид текућег скенирања"
+
+#: src/help-overlay.ui:46
+msgctxt "shortcut window"
+msgid "Document Modification"
+msgstr "Измена документа"
+
+#: src/help-overlay.ui:51
+msgctxt "shortcut window"
+msgid "Move page left"
+msgstr "Померање станице налево"
+
+#: src/help-overlay.ui:58
+msgctxt "shortcut window"
+msgid "Move page right"
+msgstr "Померање станице надесно"
+
+#: src/help-overlay.ui:65
+msgctxt "shortcut window"
+msgid "Rotate page to the left (anti-clockwise)"
+msgstr "Ротирање странице налево (супротно казаљци на сату)"
+
+#: src/help-overlay.ui:72
+msgctxt "shortcut window"
+msgid "Rotate page to the right (clockwise)"
+msgstr "Ротирање странице надесно (смер казаљке на сату)"
+
+#: src/help-overlay.ui:79
+msgctxt "shortcut window"
+msgid "Delete page"
+msgstr "Брисање странице"
+
+#: src/help-overlay.ui:87
+msgctxt "shortcut window"
+msgid "Document Management"
+msgstr "Управљање документима"
+
+#: src/help-overlay.ui:92
+msgctxt "shortcut window"
+msgid "Start new document"
+msgstr "Прављење новог документа"
+
+#: src/help-overlay.ui:99
+msgctxt "shortcut window"
+msgid "Save scanned document"
+msgstr "Чување скенираног документа"
+
+#: src/help-overlay.ui:106
+msgctxt "shortcut window"
+msgid "Email scanned document"
+msgstr "Слање скенираног документа е-поштом"
+
+#: src/help-overlay.ui:113
+msgctxt "shortcut window"
+msgid "Print scanned document"
+msgstr "Штампање скенираног документа"
+
+#: src/help-overlay.ui:120
+msgctxt "shortcut window"
+msgid "Copy current page to clipboard"
+msgstr "Копирање тренутне странице на оставу"
 
-#~ msgid "4&#xD7;6"
-#~ msgstr "4&#xD7;6"
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:113
+msgid "_Scanner"
+msgstr "_Скенер"
 
-#~ msgid "Please check your installation"
-#~ msgstr "Проверите вашу инсталацију"
+#. Label beside scan side combo box
+#: src/preferences-dialog.ui:143
+msgid "Scan Sides"
+msgstr "Странице за скенирање"
 
-#~ msgid "Files missing"
-#~ msgstr "Недостају датотеке"
+#. Label beside page size combo box
+#: src/preferences-dialog.ui:160
+msgid "Page Size"
+msgstr "Величина странице"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:191
+msgid "Front"
+msgstr "Предња страна"
 
-#~ msgid "Direction of scan"
-#~ msgstr "Правац скенирања"
+#. Preferences Dialog: Toggle button to select scanning on the back side of a page
+#: src/preferences-dialog.ui:206
+msgid "Back"
+msgstr "Задња страна"
+
+#. Preferences Dialog: Toggle button to select scanning on both sides of a page
+#: src/preferences-dialog.ui:221
+msgid "Both"
+msgstr "Обе стране"
+
+#. Label beside page delay scale
+#: src/preferences-dialog.ui:260
+msgid "Delay"
+msgstr "Временски размак"
+
+#. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
+#: src/preferences-dialog.ui:276
+msgid "Multiple pages from flatbed"
+msgstr "Више страна са положеног скенера"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:295
+msgid "3"
+msgstr "3"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:310
+msgid "5"
+msgstr "5"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:326
+msgid "7"
+msgstr "7"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:342
+msgid "10"
+msgstr "10"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:358
+msgid "15"
+msgstr "15"
+
+#. Label after page delay radio buttons
+#: src/preferences-dialog.ui:385
+msgid "Seconds"
+msgstr "секунди"
+
+#. Preferences Dialog: Tab label for scanning settings
+#: src/preferences-dialog.ui:413
+msgid "Scanning"
+msgstr "Скенирање"
 
-#~ msgid "Resolution of last scanned image"
-#~ msgstr "Резолуција последње скениране слике"
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:436
+msgid "_Text Resolution"
+msgstr "Резолуција _текста"
 
-#~ msgid "The resolution in dots-per-inch of the previously scanned image."
-#~ msgstr "Резолуција у тачкама-по-инчу (dpi) претходно скениране слике."
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:452
+msgid "_Photo Resolution"
+msgstr "Резолуција _слике"
 
-#~ msgid "Resolution for photo scans"
-#~ msgstr "Резолуција за скенирања слика"
+#. Label beside brightness scale
+#: src/preferences-dialog.ui:505
+msgid "Brightness"
+msgstr "Осветљење"
 
-#~ msgid "Resolution for text scans"
-#~ msgstr "Резолуција за скенирања текста"
+#. Label beside contrast scale
+#: src/preferences-dialog.ui:521
+msgid "Contrast"
+msgstr "Контраст"
 
-#~ msgid "Directory to save files to"
-#~ msgstr "Директоријум за чување датотека"
+#. Preferences Dialog: Tab for quality settings
+#: src/preferences-dialog.ui:576
+msgid "Quality"
+msgstr "Квалитет"
 
-#~ msgid "Scanned Document"
-#~ msgstr "Скенирани документ"
+#. Combo box value for automatic paper size
+#: src/preferences-dialog.vala:77
+msgid "Automatic"
+msgstr "Аутоматски"
 
-#~ msgid "Page side to scan"
-#~ msgstr "Страна странице за скенирање"
+#: src/preferences-dialog.vala:116
+msgid "Darker"
+msgstr "Тамније"
 
-#~ msgid "Height of paper in tenths of a mm"
-#~ msgstr "Висина папира у десетом делу милиметра"
+#: src/preferences-dialog.vala:118
+msgid "Lighter"
+msgstr "Светлије"
 
-#~ msgid "Height of scanned image in pixels"
-#~ msgstr "Висина скениране слике у тачкама"
+#: src/preferences-dialog.vala:126
+msgid "Less"
+msgstr "Мање"
 
-#~ msgid "TRUE if the application window is maximized"
-#~ msgstr "ТАЧНО ако је прозор програма увећан"
+#: src/preferences-dialog.vala:128
+msgid "More"
+msgstr "Више"
 
-#~ msgid "The direction of the scanner across the scanned page."
-#~ msgstr "Усмерење скенера преко скениране странице."
+#. Preferences dialog: Label for default resolution in resolution list
+#: src/preferences-dialog.vala:440
+#, c-format
+msgid "%d dpi (default)"
+msgstr "%d тачака по инчу (подразумевано)"
 
-#~ msgid ""
-#~ "The directory to save files to. Defaults to the documents directory if unset."
-#~ msgstr ""
-#~ "Директоријум у коме ће бити сачуване датотеке. Ако није постављено онда је "
-#~ "то основни директоријум докумената."
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: src/preferences-dialog.vala:443
+#, c-format
+msgid "%d dpi (draft)"
+msgstr "%d тачака по инчу (белешка)"
 
-#~ msgid "The page side to scan."
-#~ msgstr "Страна странице за скенирање."
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: src/preferences-dialog.vala:446
+#, c-format
+msgid "%d dpi (high resolution)"
+msgstr "%d тачака по инчу (висока резолуција)"
 
-#~ msgid "Type of document being scanned"
-#~ msgstr "Врста документа који ће бити скениран"
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: src/preferences-dialog.vala:449
+#, c-format
+msgid "%d dpi"
+msgstr "%d тачака по инчу"
 
-#~ msgid ""
-#~ "Type of document being scanned. This setting decides on the scan resolution, "
-#~ "colors and post-processing."
-#~ msgstr ""
-#~ "Врста документа који ће бити скениран. Ово подешавање одлучује о резолуцији, "
-#~ "бојама и завршној обради скенирања."
+#. Error displayed when no scanners to scan with
+#: src/scanner.vala:844
+msgid "No scanners available.  Please connect a scanner."
+msgstr "Ниједан скенер није доступан. Повежи скенер."
 
-#~ msgid "Width of paper in tenths of a mm"
-#~ msgstr "Ширина папира у десетом делу милиметра"
+#. Error displayed when cannot connect to scanner
+#: src/scanner.vala:874
+msgid "Unable to connect to scanner"
+msgstr "Није могуће контактирати скенер"
 
-#~ msgid "Width of scanned image in pixels"
-#~ msgstr "Ширина скениране слике у тачкама"
+#. Error display when unable to start scan
+#: src/scanner.vala:1227
+msgid "Unable to start scan"
+msgstr "Није могуће почети скенирање"
 
-#~ msgid "Window height in pixels"
-#~ msgstr "Висина прозора у тачкама"
+#. Error displayed when communication with scanner broken
+#: src/scanner.vala:1240 src/scanner.vala:1340
+msgid "Error communicating with scanner"
+msgstr "Грешка у комуникацији са скенером"
 
-#~ msgid "Window width in pixels"
-#~ msgstr "Ширина прозора у тачкама"
+#. Help string for command line --version flag
+#: src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "Прикажи верзију"
 
-#~ msgid ""
-#~ "The direction of the scanner across the scanned page. It can be one of the "
-#~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
-#~ msgstr ""
-#~ "Усмерење скенера преко скениране странице. Може бити једна од следећих "
-#~ "вредности: „top-to-bottom“ (одозго-на-доле), „bottom-to-top“ (одоздо-на-"
-#~ "горе), „left-to-right“ (слева-на-десно) или „right-to-left“ (сдесна-на-лево)."
+#. Help string for command line --debug flag
+#: src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Испиши поруке за дебаговање"
 
-#~ msgid ""
-#~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
-#~ msgstr ""
-#~ "Страна странице за скенирање. Може бити једна од следећих вредности: „both“ "
-#~ "(обе), „front“ (наличје) или „back“ (позадина)."
+#: src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+msgstr ""
+"Поправи ПДФ датотеке које су направиле старије верзије Једноставног Скенирања"
 
-#~ msgid ""
-#~ "Type of document being scanned. 'text' for text documents, 'photo' for "
-#~ "photos. This setting decides on the scan resolution, colors and post-"
-#~ "processing."
-#~ msgstr ""
-#~ "Врста документа који ће бити скениран. „text“ (текст) за документа, „photo“ "
-#~ "(фотографија) за фотографије. Ово подешавање одлучује о резолуцији, бојама и "
-#~ "завршној обради скенирања."
+#. Title of error dialog when scan failed
+#: src/simple-scan.vala:392
+msgid "Failed to scan"
+msgstr "Скенирање није успело"
 
-#, c-format
-#~ msgid ""
-#~ "Usage:\n"
-#~ "  %s [DEVICE...] - Scanning utility"
-#~ msgstr ""
-#~ "Коришћење:\n"
-#~ "  %s [УРЕЂАЈ...] — алатка за скенирање"
+#. Attempt to inhibit the screensaver when scanning
+#: src/simple-scan.vala:407
+msgid "Scan in progress"
+msgstr "Скенирање у току"
 
-#, c-format
-#~ msgid ""
-#~ "Help Options:\n"
-#~ "  -d, --debug                     Print debugging messages\n"
-#~ "  -v, --version                   Show release version\n"
-#~ "  -h, --help                      Show help options\n"
-#~ "  --help-all                      Show all help options\n"
-#~ "  --help-gtk                      Show GTK+ options"
-#~ msgstr ""
-#~ "Опције помоћи:\n"
-#~ "  -d, --debug                     Исписује поруке за исправљање грешака\n"
-#~ "  -v, --version                   Исписује издање програма\n"
-#~ "  -h, -?, --help                  Приказује опције помоћи\n"
-#~ "  --help-all                      Приказује све опције помоћи\n"
-#~ "  --help-gtk                      Приказује Гтк+ опције"
+#. Arguments and description for --help text
+#: src/simple-scan.vala:584
+msgid "[DEVICE…] — Scanning utility"
+msgstr "[УРЕЂАЈ…] — Алат за скенирање"
 
+#. Text printed out when an unknown command-line argument provided
+#: src/simple-scan.vala:595
 #, c-format
-#~ msgid ""
-#~ "GTK+ Options:\n"
-#~ "  --class=CLASS                   Program class as used by the window "
-#~ "manager\n"
-#~ "  --name=NAME                     Program name as used by the window "
-#~ "manager\n"
-#~ "  --screen=SCREEN                 X screen to use\n"
-#~ "  --sync                          Make X calls synchronous\n"
-#~ "  --gtk-module=MODULES            Load additional GTK+ modules\n"
-#~ "  --g-fatal-warnings              Make all warnings fatal"
-#~ msgstr ""
-#~ "Гтк+ опције:\n"
-#~ "  --class=CLASS                   Класа програма коју користи управљач "
-#~ "прозора\n"
-#~ "  --name=NAME                     Име програма које користи управљач "
-#~ "прозора\n"
-#~ "  --screen=SCREEN                 Икс екран за коришћење\n"
-#~ "  --sync                          Усаглашава позиве Икса\n"
-#~ "  --gtk-module=MODULES            Учитава допунске Гтк+ модуле\n"
-#~ "  --g-fatal-warnings              Чини сва упозорења кобним"
-
-#~ msgid ""
-#~ "The width of scanned image in pixels. This value is updated to what the last "
-#~ "scanned page was."
-#~ msgstr ""
-#~ "Ширина скениране слике у тачкама. Ова вредност се аутоматски поставља на "
-#~ "величину последње скениране странице."
-
-#~ msgid ""
-#~ "The height of scanned image in pixels. This value is updated to what the "
-#~ "last scanned page was."
-#~ msgstr ""
-#~ "Висина скениране слике у тачкама. Ова вредност се аутоматски поставља на "
-#~ "величину последње скениране странице."
-
-#~ msgid "Device to scan from"
-#~ msgstr "Уређај са ког ће се скенирати"
-
-#~ msgid "SANE device to acquire images from."
-#~ msgstr "САНЕ уређај са ког ће се унети слике."
-
-#~ msgid ""
-#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
-#~ msgstr ""
-#~ "Ширина папира у десетом делу милиметра (или 0 за самостално откривање "
-#~ "папира)."
-
-#~ msgid ""
-#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
-#~ msgstr ""
-#~ "Висина папира у десетом делу милиметра (или 0 за самостално откривање "
-#~ "папира)."
-
-#~ msgid "Brightness of scan"
-#~ msgstr "Осветљај скенирања"
-
-#~ msgid "Contrast of scan"
-#~ msgstr "Контраст скенирања"
-
-#~ msgid "Quality value to use for JPEG compression"
-#~ msgstr "Вредност квалитета за ЈПЕГ сажимање"
-
-#~ msgid "Quality value to use for JPEG compression."
-#~ msgstr "Вредност квалитета која ће се користити за ЈПЕГ сажимање."
-
-#~ msgid "Select File _Type"
-#~ msgstr "_Изабери врсту датотеке"
-
-#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
-#~ msgstr "Дотеривање осветљаја од -100 до 100 (0 значи ништа)."
-
-#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
-#~ msgstr "Дотеривање контраста од -100 до 100 (0 значи ништа)."
-
-#~ msgid "The resolution in dots-per-inch to use when scanning text."
-#~ msgstr ""
-#~ "Резолуција у тачкама-по-палцу (dpi) која ће бити коришћена при скенирању "
-#~ "текста."
-
-#~ msgid "The resolution in dots-per-inch to use when scanning photos."
-#~ msgstr ""
-#~ "Резолуција у тачкама-по-палцу (dpi) која ће бити коришћена при скенирању "
-#~ "фотографија."
+msgid "Run “%s --help” to see a full list of available command line options."
+msgstr ""
+"Покрените “%s --help” да бисте видели листу свих опција командне линије."
diff --git a/po/sr@latin.po b/po/sr@latin.po
new file mode 100644
index 0000000..7d8df05
--- /dev/null
+++ b/po/sr@latin.po
@@ -0,0 +1,1040 @@
+# Serbian translation for simple-scan
+# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# This file is distributed under the same license as the simple-scan package.
+# Miroslav Nikolić <miroslavnikolic@rocketmail.com>, 2011—2016.
+# Borisav Živanović <borisavzivanovic@gmail.com>, 2017.
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
+"product=simple-scan&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-08-15 20:17+0000\n"
+"PO-Revision-Date: 2017-08-06 13:06+0200\n"
+"Last-Translator: Borisav Živanović <borisavzivanovic@gmail.com>\n"
+"Language-Team: Serbian\n"
+"Language: sr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Poedit 2.0.3\n"
+
+#: data/org.gnome.SimpleScan.gschema.xml:11
+msgid "Device to scan from"
+msgstr "Uređaj za skeniranje"
+
+#: data/org.gnome.SimpleScan.gschema.xml:12
+msgid "SANE device to acquire images from."
+msgstr "SANE uređaj za stvaranje slika."
+
+#: data/org.gnome.SimpleScan.gschema.xml:20
+msgid "Type of document being scanned"
+msgstr "Vrsta skeniranog dokumenta"
+
+#: data/org.gnome.SimpleScan.gschema.xml:21
+msgid ""
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+msgstr ""
+"Vrsta dokumenta koji se skenira. Ovo podešavanje utiče na rezoluciju, boje i "
+"naknadnu obradu."
+
+#: data/org.gnome.SimpleScan.gschema.xml:25
+msgid "Width of paper in tenths of a mm"
+msgstr "Širina papira u desetim delovima milimetra"
+
+#: data/org.gnome.SimpleScan.gschema.xml:26
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"Širina papira u desetim delovima milimetra (uneti 0 za automatsko "
+"prepoznavanje papira)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:30
+msgid "Height of paper in tenths of a mm"
+msgstr "Visina papira u desetim delovima milimetra"
+
+#: data/org.gnome.SimpleScan.gschema.xml:31
+msgid ""
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"Visina papira u desetim delovima milimetra (uneti 0 za automatsko "
+"prepoznavanje papira)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:35
+msgid "Brightness of scan"
+msgstr "Osvetljenost prilikom skeniranja"
+
+#: data/org.gnome.SimpleScan.gschema.xml:36
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr "Podešavanje osvetljenosti od -100 do 100 (0 za nikakvo osvetljenje)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:40
+msgid "Contrast of scan"
+msgstr "Kontrast prilikom skeniranja"
+
+#: data/org.gnome.SimpleScan.gschema.xml:41
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr "Podešavanje kontrasta od -100 do 100 (0 za bez kontrasta)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:45
+msgid "Resolution for text scans"
+msgstr "Rezolucija skeniranja teksta"
+
+#: data/org.gnome.SimpleScan.gschema.xml:46
+msgid "The resolution in dots-per-inch to use when scanning text."
+msgstr "Rezolucija u tačkama po inču za probno skeniranje."
+
+#: data/org.gnome.SimpleScan.gschema.xml:50
+msgid "Resolution for photo scans"
+msgstr "Rezolucija skeniranja slika"
+
+#: data/org.gnome.SimpleScan.gschema.xml:51
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr "Rezolucija u tačkama po inču za skeniranje slika."
+
+#: data/org.gnome.SimpleScan.gschema.xml:55
+msgid "Page side to scan"
+msgstr "Strana papira za skeniranje"
+
+#: data/org.gnome.SimpleScan.gschema.xml:56
+msgid "The page side to scan."
+msgstr "Strana papira za skeniranje."
+
+#: data/org.gnome.SimpleScan.gschema.xml:60
+msgid "Directory to save files to"
+msgstr "Direktorijum za čuvanje datoteka"
+
+#: data/org.gnome.SimpleScan.gschema.xml:61
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+"Direktorijum za čuvanje datoteka. Podrazumevana lokacija je direktorijum za "
+"dokumente."
+
+#: data/org.gnome.SimpleScan.gschema.xml:66
+msgid "Quality value to use for JPEG compression"
+msgstr "Kvalitet JPEG kompresije"
+
+#: data/org.gnome.SimpleScan.gschema.xml:67
+msgid "Quality value to use for JPEG compression."
+msgstr "Kvalitet JPEG kompresije."
+
+#: data/org.gnome.SimpleScan.gschema.xml:72
+msgid "Delay in millisecond between pages"
+msgstr "Razmak u milisekundama između stranica"
+
+#: data/org.gnome.SimpleScan.gschema.xml:73
+msgid "Delay in millisecond between pages."
+msgstr "Razmak u milisekundama između stranica."
+
+#. Title of scan window
+#. Set HeaderBar title here because Glade doesn't keep it translated
+#. https://bugzilla.gnome.org/show_bug.cgi?id=782753
+#. Title of scan window
+#: data/simple-scan.appdata.xml.in:6 data/simple-scan.desktop.in:3
+#: src/app-window.ui:76 src/app-window.vala:1560
+msgid "Simple Scan"
+msgstr "Jednostavno ckeniranje"
+
+#: data/simple-scan.appdata.xml.in:7 data/simple-scan.desktop.in:5
+msgid "Scan Documents"
+msgstr "Skenirajte dokumente"
+
+#: 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 "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+"Veoma jednostavan način za skeniranje dokumenata i slika. Možete iseći loše "
+"delove slike i rotirati je ako je okrenuta na pogrešnu stranu. Možete "
+"štampati skenirane datoteke, sačuvati ih u formatu PDF ili u velikom izboru "
+"ostalih formata."
+
+#: data/simple-scan.appdata.xml.in:14
+msgid "Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+"Jednostavno Skeniranje koristi SANE frejmvork kao podršku za veliki broj "
+"skenera."
+
+#: data/simple-scan.desktop.in:4
+msgid "Document Scanner"
+msgstr "Skener za dokumente"
+
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: data/simple-scan.desktop.in:7
+msgid "scan;scanner;flatbed;adf;"
+msgstr ""
+"scan;scanner;flatbed;adf;skeniranje;skener;kopiranje;skeniranje;skener;"
+"kopiranje;"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: data/simple-scan.desktop.in:10
+msgid "scanner"
+msgstr "scanner"
+
+#. Toolbar scan menu item to scan a single page from the scanner
+#. Scan menu item to scan a single page from the scanner
+#. Toolbar scan menu item to scan a single page from the scanner
+#: src/app-window.ui:22 src/app-window.ui:123 src/app-window.ui:820
+msgid "Single _Page"
+msgstr "_Jedonostrano"
+
+#. Toolbar scan menu item to scan all pages from a document feeder
+#. Scan menu item to scan all pages from a document feeder
+#. Toolbar scan menu item to scan all pages from a document feeder
+#: src/app-window.ui:31 src/app-window.ui:133 src/app-window.ui:829
+msgid "All Pages From _Feeder"
+msgstr "Sve stranice iz _fioke skenera"
+
+#. Toolbar scan menu item to scan continuously from the flatbed
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/app-window.ui:40 src/app-window.ui:143 src/app-window.ui:838
+msgid "_Multiple Pages From Flatbed"
+msgstr "_Više stranica sa položenog skenera"
+
+#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:853
+msgid "Text"
+msgstr "Tekst"
+
+#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:863
+msgid "Photo"
+msgstr "Slika"
+
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: src/app-window.ui:91
+msgid "_Document"
+msgstr "_Dokument"
+
+#. Scan menu item
+#: src/app-window.ui:110
+msgid "Sc_an"
+msgstr "_Skeniraj"
+
+#. Menu entry to stop current scan
+#: src/app-window.ui:154
+msgid "_Stop Scan"
+msgstr "_Zaustavi skeniranje"
+
+#. Menu item to reorder pages
+#. Title of dialog to reorder pages
+#: src/app-window.ui:196 src/app-window.vala:967 src/app-window.vala:1590
+msgid "Reorder Pages"
+msgstr "Promenite raspored stranica"
+
+#. Label on email menu item
+#: src/app-window.ui:215
+msgid "_Email"
+msgstr "_E-pošta"
+
+#. Page menu (contains action for each page, e.g. delete, crop)
+#: src/app-window.ui:280
+msgid "_Page"
+msgstr "St_ranica"
+
+#. Menu item to rotate page to left (anti-clockwise)
+#: src/app-window.ui:290
+msgid "Rotate _Left"
+msgstr "Rotiraj na_levo"
+
+#. Menu item to rotate page to right (clockwise)
+#: src/app-window.ui:300
+msgid "Rotate _Right"
+msgstr "Rotiraj na_desno"
+
+#. Label for page crop submenu
+#: src/app-window.ui:310
+msgid "_Crop"
+msgstr "_Iseci"
+
+#. Radio button for no crop
+#: src/app-window.ui:320
+msgid "_None"
+msgstr "_Ništa"
+
+#. Radio button for cropping page to A4 size
+#: src/app-window.ui:331
+msgid "A_4"
+msgstr "A_4"
+
+#. Radio button for cropping page to A5 size
+#: src/app-window.ui:342
+msgid "A_5"
+msgstr "A_5"
+
+#. Radio button for cropping page to A6 size
+#: src/app-window.ui:353
+msgid "A_6"
+msgstr "A_6"
+
+#. Radio button for cropping page to US letter size
+#: src/app-window.ui:364
+msgid "_Letter"
+msgstr "_Pismo"
+
+#. Radio button for cropping to page to US legal size
+#: src/app-window.ui:375
+msgid "Le_gal"
+msgstr "_US legal"
+
+#. Radio button for cropping page to 4x6 inch
+#: src/app-window.ui:386
+msgid "4×6"
+msgstr "4×6"
+
+#. Radio button for cropping to custom page size
+#: src/app-window.ui:397
+msgid "_Custom"
+msgstr "_Proizvoljno"
+
+#. Menu item to rotate the crop area
+#: src/app-window.ui:415
+msgid "_Rotate Crop"
+msgstr "Ro_tiraj isečak"
+
+#. Menu item to move the selected page to the left
+#: src/app-window.ui:428
+msgid "Move Left"
+msgstr "Pomeri nalevo"
+
+#. Menu item to move the selected page to the right
+#: src/app-window.ui:437
+msgid "Move Right"
+msgstr "Pomeri nadesno"
+
+#. Label on help menu
+#: src/app-window.ui:474
+msgid "_Help"
+msgstr "_Pomoć"
+
+#. Help|Contents menu
+#: src/app-window.ui:482
+msgid "_Contents"
+msgstr "Sadr_žaj"
+
+#. Tooltip for scan toolbar button
+#: src/app-window.ui:520 src/app-window.ui:720
+msgid "Scan a single page from the scanner"
+msgstr "Skeniraj jednu stanu sa skenera"
+
+#. Label on scan toolbar item
+#: src/app-window.ui:522 src/app-window.ui:716
+msgid "Scan"
+msgstr "Skeniraj"
+
+#. Tooltip for save toolbar button
+#: src/app-window.ui:538 src/app-window.ui:787
+msgid "Save document to a file"
+msgstr "Sačuvaj dokument u datoteku"
+
+#: src/app-window.ui:540
+msgid "Save"
+msgstr "Sačuvaj"
+
+#. Tooltip for stop button
+#: src/app-window.ui:555 src/app-window.ui:700
+msgid "Stop the current scan"
+msgstr "Zaustavi skeniranje"
+
+#: src/app-window.ui:556 src/app-window.ui:697
+msgid "Stop"
+msgstr "Zaustavi"
+
+#. Label shown when searching for scanners
+#: src/app-window.ui:611
+msgid "Searching for Scanners…"
+msgstr "Traženje skenera…"
+
+#: src/app-window.vala:237 src/app-window.vala:1380
+msgid "_Close"
+msgstr "_Zatvori"
+
+#. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
+#: src/app-window.vala:246
+#, c-format
+msgid "Username and password required to access “%s”"
+msgstr "Ime naloga i lozinka koji su potrebni za pristup “%s”"
+
+#. Label shown when detected a scanner
+#: src/app-window.vala:266 src/app-window.vala:584
+msgid "Ready to Scan"
+msgstr "Spreman za skeniranje"
+
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: src/app-window.vala:273
+msgid "Additional software needed"
+msgstr "Potreban je dodatni softver"
+
+#. Instructions to install driver software
+#: src/app-window.vala:275
+msgid ""
+"You need to <a href=\"install-firmware\">install driver software</a> for "
+"your scanner."
+msgstr ""
+"Morate da <a href=\"install-firmware\">instalirate upravljački program</a> za "
+"Vaš skener."
+
+#. Warning displayed when no scanners are detected
+#: src/app-window.vala:281
+msgid "No scanners detected"
+msgstr "Nijedan skener nije pronađen"
+
+#. Hint to user on why there are no scanners detected
+#: src/app-window.vala:283
+msgid "Please check your scanner is connected and powered on"
+msgstr "Proveri da li je skener povezan i uključen"
+
+#. Save dialog: Dialog title
+#: src/app-window.vala:298
+msgid "Save As…"
+msgstr "Sačuvaj kao…"
+
+#: src/app-window.vala:301 src/app-window.vala:471 src/app-window.vala:552
+msgid "_Cancel"
+msgstr "_Otkaži"
+
+#: src/app-window.vala:302 src/app-window.vala:553
+msgid "_Save"
+msgstr "_Sačuvaj"
+
+#. Default filename to use when saving document
+#: src/app-window.vala:310
+msgid "Scanned Document.pdf"
+msgstr "Skenirani dokument.pdf"
+
+#. Save dialog: Filter name to show only supported image files
+#: src/app-window.vala:316
+msgid "Image Files"
+msgstr "Datoteke slika"
+
+#. Save dialog: Filter name to show all files
+#: src/app-window.vala:326
+msgid "All Files"
+msgstr "Sve datoteke"
+
+#. Save dialog: Label for saving in PDF format
+#: src/app-window.vala:335
+msgid "PDF (multi-page document)"
+msgstr "PDF (dokument sa više strana)"
+
+#. Save dialog: Label for saving in JPEG format
+#: src/app-window.vala:341
+msgid "JPEG (compressed)"
+msgstr "JPEG (komprimovani)"
+
+#. Save dialog: Label for saving in PNG format
+#: src/app-window.vala:347
+msgid "PNG (lossless)"
+msgstr "PNG (bez gubitaka)"
+
+#. Save dialog: Label for sabing in WEBP format
+#: src/app-window.vala:354
+msgid "WebP (compressed)"
+msgstr "VebP (komprimovani)"
+
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
+#: src/app-window.vala:364
+msgid "File format:"
+msgstr "Format datoteke:"
+
+#. Label in save dialog beside compression slider
+#: src/app-window.vala:376
+msgid "Compression:"
+msgstr "Kompresija:"
+
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/app-window.vala:470
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr "Datoteka sa nazivom “%s” već postoji.  Da li želite da je zamenite?"
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/app-window.vala:473
+msgid "_Replace"
+msgstr "_Zameni"
+
+#: src/app-window.vala:512
+msgid "Saving"
+msgstr "Čuvanje"
+
+#. Title of error dialog when save failed
+#: src/app-window.vala:527
+msgid "Failed to save file"
+msgstr "Čuvanje datoteke nije uspelo"
+
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:550
+msgid "If you don’t save, changes will be permanently lost."
+msgstr "Ako ne sačuvate izmene će biti izgubljene zauvek."
+
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:591
+msgid "Save current document?"
+msgstr "Sačuvati trenutni dokument?"
+
+#. Button in dialog to create new document and discard unsaved document
+#: src/app-window.vala:593
+msgid "Discard Changes"
+msgstr "Odbaci izmene"
+
+#. Label shown when scan started
+#: src/app-window.vala:692
+msgid "Contacting scanner…"
+msgstr "Kontaktiranje skenera…"
+
+#. Error message display when unable to save image for preview
+#: src/app-window.vala:800
+msgid "Unable to save image for preview"
+msgstr "Čuvanje probne slike nije uspelo"
+
+#. Error message display when unable to preview image
+#: src/app-window.vala:812
+msgid "Unable to open image preview application"
+msgstr "Pokretanje programa za prikaz slike nije uspelo"
+
+#. Label on button for combining sides in reordering dialog
+#: src/app-window.vala:990
+msgid "Combine sides"
+msgstr "Kombinuj stranice"
+
+#. Label on button for combining sides in reverse order in reordering dialog
+#: src/app-window.vala:1000
+msgid "Combine sides (reverse)"
+msgstr "Kombinuj stranice (unazad)"
+
+#. Label on button for reversing in reordering dialog
+#: src/app-window.vala:1010
+msgid "Reverse"
+msgstr "Izokreni"
+
+#. Label on button for cancelling page reordering dialog
+#: src/app-window.vala:1020
+msgid "Keep unchanged"
+msgstr "Bez izmena"
+
+#. Error message displayed when unable to launch help browser
+#: src/app-window.vala:1250
+msgid "Unable to open help file"
+msgstr "Nije moguće otvoriti datoteku pomoći"
+
+#. The license this software is under (GPL3+)
+#: src/app-window.vala:1271
+msgid ""
+"This program is free software: you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation, either version 3 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License\n"
+"along with this program.  If not, see <http://www.gnu.org/licenses/>."
+msgstr ""
+"Ovaj pogram je slobodan softver: možete ga deliti i/ili modifikovati\n"
+"pod uslovima GNU-ove Opšte javne licence koju je objavila\n"
+"Zadužbina za Slobodan Softver, verzija 3 ili\n"
+"po vašoj želji bilo koja starija verzija.\n"
+"\n"
+"Ovaj program je dostupan u nadi da će biti koristan,\n"
+"ali BEZ BILO KAKVE GARANCIJE; čak i bez pretpostavljene garancije\n"
+"na MOGUĆNOST PRODAJE i SLUŽENJA NAMENI. Pogledajte\n"
+"GNU-ovu Opštu javnu licencu za više detalja.\n"
+"\n"
+"Trebalo bi da ste dobili kopiju GNU-ove Opšte javne licence\n"
+"uz ovaj program. Ako niste posetite <http://www.gnu.org/licenses/>."
+
+#. Title of about dialog
+#: src/app-window.vala:1274
+msgid "About Simple Scan"
+msgstr "O programu Jednostavno Skeniranje"
+
+#. Description of program
+#: src/app-window.vala:1277
+msgid "Simple document scanning tool"
+msgstr "Jednostavna alatka za skeniranje dokumenata"
+
+#: src/app-window.vala:1286
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  Ivan Petrovic https://launchpad.net/~ivanpetrovic\n"
+"  Kosava https://launchpad.net/~kosava\n"
+"  Launchpad Translations Administrators https://launchpad.net/~rosetta\n"
+"  Michael Hoth https://launchpad.net/~hoth-einbeck\n"
+"  Marko M. Kostić https://launchpad.net/~marko-m-kostic\n"
+"  Miroslav Nikolić https://launchpad.net/~lipek\n"
+"Serbian GNOME Translation Project:\n"
+"  Borisav Živanović <borisavzivanovic@gmail.com>"
+
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:1308
+msgid "Save document before quitting?"
+msgstr "Da sačuvam dokument pre nego što izađem?"
+
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:1310
+msgid "Quit without Saving"
+msgstr "Zatvori bez čuvanja"
+
+#. Message to indicate a Brother scanner has been detected
+#: src/app-window.vala:1357
+msgid "You appear to have a Brother scanner."
+msgstr "Izgleda da imate Braderov skener."
+
+#. Instructions on how to install Brother scanner drivers
+#: src/app-window.vala:1359
+msgid ""
+"Drivers for this are available on the <a href=\"http://support.brother.com"
+"\">Brother website</a>."
+msgstr ""
+"Upravljački programi se nalaze na  <a href=\"http://support.brother.com"
+"\">vebsajtu Bradera</a>."
+
+#. Message to indicate a Samsung scanner has been detected
+#: src/app-window.vala:1363
+msgid "You appear to have a Samsung scanner."
+msgstr "Izgleda da imate Samsungov skener."
+
+#. Instructions on how to install Samsung scanner drivers
+#: src/app-window.vala:1365
+msgid ""
+"Drivers for this are available on the <a href=\"http://samsung.com/support"
+"\">Samsung website</a>."
+msgstr ""
+"Upravljački programi se nalaze na  <a href=\"http://samsung.com/support"
+"\">vebsajtu Samsunga</a>."
+
+#. Message to indicate a HP scanner has been detected
+#: src/app-window.vala:1369
+msgid "You appear to have an HP scanner."
+msgstr "Izgleda da imate HP-ov skener."
+
+#. Message to indicate an Epson scanner has been detected
+#: src/app-window.vala:1374
+msgid "You appear to have an Epson scanner."
+msgstr "Izgleda da imate Epsonov skener."
+
+#. Instructions on how to install Epson scanner drivers
+#: src/app-window.vala:1376
+msgid ""
+"Drivers for this are available on the <a href=\"http://support.epson.com"
+"\">Epson website</a>."
+msgstr ""
+"Upravljački programi se nalaze na  <a href=\"http://support.epson.com"
+"\">vebsajtu Epsona</a>."
+
+#. Title of dialog giving instructions on how to install drivers
+#: src/app-window.vala:1380
+msgid "Install drivers"
+msgstr "Intaliraj upravljački program"
+
+#. Message in driver install dialog
+#: src/app-window.vala:1411
+msgid "Once installed you will need to restart Simple Scan."
+msgstr ""
+"Kada instalirate upravljački program morate ponovo pokrenuti Jednostavno "
+"Skeniranje."
+
+#. Label shown while installing drivers
+#: src/app-window.vala:1423
+msgid "Installing drivers…"
+msgstr "Instalacija upravljačkog programa u toku…"
+
+#. Label shown once drivers successfully installed
+#: src/app-window.vala:1431
+msgid "Drivers installed successfully!"
+msgstr "Upravljački program uspešno instaliran!"
+
+#. Label shown if failed to install drivers
+#: src/app-window.vala:1441
+#, c-format
+msgid "Failed to install drivers (error code %d)."
+msgstr "Instalacija upravljačkog programa nije uspela (kod greške  %d)."
+
+#. Label shown if failed to install drivers
+#: src/app-window.vala:1447
+msgid "Failed to install drivers."
+msgstr "Instalacija upravljačkog programa nije uspela."
+
+#. Label shown to prompt user to install packages (when PackageKit not available)
+#: src/app-window.vala:1454
+#, c-format
+msgid "You need to install the %s package."
+msgid_plural "You need to install the %s packages."
+msgstr[0] "Morate instalirati %s paket"
+msgstr[1] "Morate instalirati %s paketa"
+msgstr[2] "Morate instalirati %s paketa"
+
+#. Title of preferences dialog
+#: src/app-window.vala:1568 src/app-window.vala:1591
+#: src/preferences-dialog.ui:53
+msgid "Preferences"
+msgstr "Postavke"
+
+#: src/app-window.vala:1572
+msgid "Keyboard Shortcuts"
+msgstr "Prečice na tastaturi"
+
+#: src/app-window.vala:1573
+msgid "Help"
+msgstr "Pomoć"
+
+#: src/app-window.vala:1574
+msgid "About"
+msgstr "O programu"
+
+#: src/app-window.vala:1575
+msgid "Quit"
+msgstr "Izlaz"
+
+#: src/app-window.vala:1589
+msgid "Email"
+msgstr "E-pošta"
+
+#. Populate ActionBar (not supported in Glade)
+#. https://bugzilla.gnome.org/show_bug.cgi?id=769966
+#. Label on new document button
+#: src/app-window.vala:1599
+msgid "Start Again…"
+msgstr "_Ponovo pokreni…"
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: src/app-window.vala:1616
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Rotiraj stranicu nalevo (suprotno kazaljci na satu)"
+
+#. Tooltip for rotate right (clockwise) button
+#: src/app-window.vala:1623
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Rotiraj stranicu nadesno (smer kazaljke na satu)"
+
+#. Tooltip for crop button
+#: src/app-window.vala:1633
+msgid "Crop the selected page"
+msgstr "Iseci označenu stranicu"
+
+#. Tooltip for delete button
+#: src/app-window.vala:1649
+msgid "Delete the selected page"
+msgstr "Obriši označenu stranicu"
+
+#. Text of button for cancelling save
+#: src/app-window.vala:1814
+msgid "Cancel"
+msgstr "Otkaži"
+
+#. Button to submit authorization dialog
+#: src/authorize-dialog.ui:25
+msgid "_Authorize"
+msgstr "Daj _pristup"
+
+#. Label beside username entry
+#: src/authorize-dialog.ui:99
+msgid "_Username for resource:"
+msgstr "_Korisničko ime:"
+
+#. Label beside password entry
+#: src/authorize-dialog.ui:112
+msgid "_Password:"
+msgstr "_Šifra:"
+
+#: src/book.vala:331 src/book.vala:337
+#, c-format
+msgid "Unable to encode page %i"
+msgstr "Kodiranje stranice %i nije moguće"
+
+#: src/help-overlay.ui:12
+msgctxt "shortcut window"
+msgid "Scanning"
+msgstr "Skeniranje"
+
+#: src/help-overlay.ui:17
+msgctxt "shortcut window"
+msgid "Scan a single page"
+msgstr "Skeniranje jedne stranice"
+
+#: src/help-overlay.ui:24
+msgctxt "shortcut window"
+msgid "Scan all pages from document feeder"
+msgstr "Skeniranje svih stranica iz fijoke"
+
+#: src/help-overlay.ui:31
+msgctxt "shortcut window"
+msgid "Scan continuously from a flatbed scanner"
+msgstr "Skeniranje bez prekida sa položenog skenera"
+
+#: src/help-overlay.ui:38
+msgctxt "shortcut window"
+msgid "Stop scan in progress"
+msgstr "Prekid tekućeg skeniranja"
+
+#: src/help-overlay.ui:46
+msgctxt "shortcut window"
+msgid "Document Modification"
+msgstr "Izmena dokumenta"
+
+#: src/help-overlay.ui:51
+msgctxt "shortcut window"
+msgid "Move page left"
+msgstr "Pomeranje stanice nalevo"
+
+#: src/help-overlay.ui:58
+msgctxt "shortcut window"
+msgid "Move page right"
+msgstr "Pomeranje stanice nadesno"
+
+#: src/help-overlay.ui:65
+msgctxt "shortcut window"
+msgid "Rotate page to the left (anti-clockwise)"
+msgstr "Rotiranje stranice nalevo (suprotno kazaljci na satu)"
+
+#: src/help-overlay.ui:72
+msgctxt "shortcut window"
+msgid "Rotate page to the right (clockwise)"
+msgstr "Rotiranje stranice nadesno (smer kazaljke na satu)"
+
+#: src/help-overlay.ui:79
+msgctxt "shortcut window"
+msgid "Delete page"
+msgstr "Brisanje stranice"
+
+#: src/help-overlay.ui:87
+msgctxt "shortcut window"
+msgid "Document Management"
+msgstr "Upravljanje dokumentima"
+
+#: src/help-overlay.ui:92
+msgctxt "shortcut window"
+msgid "Start new document"
+msgstr "Pravljenje novog dokumenta"
+
+#: src/help-overlay.ui:99
+msgctxt "shortcut window"
+msgid "Save scanned document"
+msgstr "Čuvanje skeniranog dokumenta"
+
+#: src/help-overlay.ui:106
+msgctxt "shortcut window"
+msgid "Email scanned document"
+msgstr "Slanje skeniranog dokumenta e-poštom"
+
+#: src/help-overlay.ui:113
+msgctxt "shortcut window"
+msgid "Print scanned document"
+msgstr "Štampanje skeniranog dokumenta"
+
+#: src/help-overlay.ui:120
+msgctxt "shortcut window"
+msgid "Copy current page to clipboard"
+msgstr "Kopiranje trenutne stranice na ostavu"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:113
+msgid "_Scanner"
+msgstr "_Skener"
+
+#. Label beside scan side combo box
+#: src/preferences-dialog.ui:143
+msgid "Scan Sides"
+msgstr "Stranice za skeniranje"
+
+#. Label beside page size combo box
+#: src/preferences-dialog.ui:160
+msgid "Page Size"
+msgstr "Veličina stranice"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:191
+msgid "Front"
+msgstr "Prednja strana"
+
+#. Preferences Dialog: Toggle button to select scanning on the back side of a page
+#: src/preferences-dialog.ui:206
+msgid "Back"
+msgstr "Zadnja strana"
+
+#. Preferences Dialog: Toggle button to select scanning on both sides of a page
+#: src/preferences-dialog.ui:221
+msgid "Both"
+msgstr "Obe strane"
+
+#. Label beside page delay scale
+#: src/preferences-dialog.ui:260
+msgid "Delay"
+msgstr "Vremenski razmak"
+
+#. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
+#: src/preferences-dialog.ui:276
+msgid "Multiple pages from flatbed"
+msgstr "Više strana sa položenog skenera"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:295
+msgid "3"
+msgstr "3"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:310
+msgid "5"
+msgstr "5"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:326
+msgid "7"
+msgstr "7"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:342
+msgid "10"
+msgstr "10"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:358
+msgid "15"
+msgstr "15"
+
+#. Label after page delay radio buttons
+#: src/preferences-dialog.ui:385
+msgid "Seconds"
+msgstr "sekundi"
+
+#. Preferences Dialog: Tab label for scanning settings
+#: src/preferences-dialog.ui:413
+msgid "Scanning"
+msgstr "Skeniranje"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:436
+msgid "_Text Resolution"
+msgstr "Rezolucija _teksta"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:452
+msgid "_Photo Resolution"
+msgstr "Rezolucija _slike"
+
+#. Label beside brightness scale
+#: src/preferences-dialog.ui:505
+msgid "Brightness"
+msgstr "Osvetljenje"
+
+#. Label beside contrast scale
+#: src/preferences-dialog.ui:521
+msgid "Contrast"
+msgstr "Kontrast"
+
+#. Preferences Dialog: Tab for quality settings
+#: src/preferences-dialog.ui:576
+msgid "Quality"
+msgstr "Kvalitet"
+
+#. Combo box value for automatic paper size
+#: src/preferences-dialog.vala:77
+msgid "Automatic"
+msgstr "Automatski"
+
+#: src/preferences-dialog.vala:116
+msgid "Darker"
+msgstr "Tamnije"
+
+#: src/preferences-dialog.vala:118
+msgid "Lighter"
+msgstr "Svetlije"
+
+#: src/preferences-dialog.vala:126
+msgid "Less"
+msgstr "Manje"
+
+#: src/preferences-dialog.vala:128
+msgid "More"
+msgstr "Više"
+
+#. Preferences dialog: Label for default resolution in resolution list
+#: src/preferences-dialog.vala:440
+#, c-format
+msgid "%d dpi (default)"
+msgstr "%d tačaka po inču (podrazumevano)"
+
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: src/preferences-dialog.vala:443
+#, c-format
+msgid "%d dpi (draft)"
+msgstr "%d tačaka po inču (beleška)"
+
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: src/preferences-dialog.vala:446
+#, c-format
+msgid "%d dpi (high resolution)"
+msgstr "%d tačaka po inču (visoka rezolucija)"
+
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: src/preferences-dialog.vala:449
+#, c-format
+msgid "%d dpi"
+msgstr "%d tačaka po inču"
+
+#. Error displayed when no scanners to scan with
+#: src/scanner.vala:844
+msgid "No scanners available.  Please connect a scanner."
+msgstr "Nijedan skener nije dostupan. Poveži skener."
+
+#. Error displayed when cannot connect to scanner
+#: src/scanner.vala:874
+msgid "Unable to connect to scanner"
+msgstr "Nije moguće kontaktirati skener"
+
+#. Error display when unable to start scan
+#: src/scanner.vala:1227
+msgid "Unable to start scan"
+msgstr "Nije moguće početi skeniranje"
+
+#. Error displayed when communication with scanner broken
+#: src/scanner.vala:1240 src/scanner.vala:1340
+msgid "Error communicating with scanner"
+msgstr "Greška u komunikaciji sa skenerom"
+
+#. Help string for command line --version flag
+#: src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "Prikaži verziju"
+
+#. Help string for command line --debug flag
+#: src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Ispiši poruke za debagovanje"
+
+#: src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+msgstr ""
+"Popravi PDF datoteke koje su napravile starije verzije Jednostavnog Skeniranja"
+
+#. Title of error dialog when scan failed
+#: src/simple-scan.vala:392
+msgid "Failed to scan"
+msgstr "Skeniranje nije uspelo"
+
+#. Attempt to inhibit the screensaver when scanning
+#: src/simple-scan.vala:407
+msgid "Scan in progress"
+msgstr "Skeniranje u toku"
+
+#. Arguments and description for --help text
+#: src/simple-scan.vala:584
+msgid "[DEVICE…] — Scanning utility"
+msgstr "[UREĐAJ…] — Alat za skeniranje"
+
+#. Text printed out when an unknown command-line argument provided
+#: src/simple-scan.vala:595
+#, c-format
+msgid "Run “%s --help” to see a full list of available command line options."
+msgstr ""
+"Pokrenite “%s --help” da biste videli listu svih opcija komandne linije."
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..da8b55a 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,519 +1,529 @@
 # Swedish translation for simple-scan
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# Copyright © 2009 Rosetta Contributors and Canonical Ltd 2009
 # This file is distributed under the same license as the simple-scan package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
+# Anders Jonsson <anders.jonsson@norsjovallen.se>, 2017.
+# Josef Andersson <l10nl18nsweja@gmail.com>, 2017.
 #
 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-08-25 06:00+0000\n"
-"Last-Translator: Daniel Nylander <yeager@ubuntu.com>\n"
-"Language-Team: Swedish <sv@li.org>\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
+"product=simple-scan&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-08-07 02:27+0000\n"
+"PO-Revision-Date: 2017-09-10 23:47+0200\n"
+"Last-Translator: Josef Andersson <l10nl18nsweja@gmail.com>\n"
+"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
+"Language: sv\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-25 06:10+0000\n"
+"X-Generator: Poedit 2.0.3\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. Button to submit authorization dialog
-#: data/simple-scan.ui:24
-msgid "_Authorize"
-msgstr "A_uktorisera"
+#: data/org.gnome.SimpleScan.gschema.xml:11
+msgid "Device to scan from"
+msgstr "Enhet att skanna från"
 
-#. Label beside username entry
-#: data/simple-scan.ui:102
-msgid "_Username for resource:"
-msgstr "_Användarnamn för källa:"
+#: data/org.gnome.SimpleScan.gschema.xml:12
+msgid "SANE device to acquire images from."
+msgstr "SANE-enhet att hämta in bilder från."
 
-#. Label beside password entry
-#: data/simple-scan.ui:117
-msgid "_Password:"
-msgstr "_Lösenord:"
+#: data/org.gnome.SimpleScan.gschema.xml:20
+msgid "Type of document being scanned"
+msgstr "Typ av dokument att skanna"
+
+#: data/org.gnome.SimpleScan.gschema.xml:21
+msgid ""
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+msgstr ""
+"Typ av dokument att skanna. Denna inställning bestämmer bildläsarens "
+"upplösning, färger och efterbehandling."
 
-#. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
-msgid "Front and Back"
-msgstr "Fram- och baksida"
+#: data/org.gnome.SimpleScan.gschema.xml:25
+msgid "Width of paper in tenths of a mm"
+msgstr "Bredd på pappret i tiondels millimeter"
 
-#. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
-msgid "Front"
-msgstr "Framsida"
+#: data/org.gnome.SimpleScan.gschema.xml:26
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"Bredd på pappret i tiondels millimeter (eller 0 för automatisk "
+"pappersidentifiering)."
 
-#. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
-msgid "Back"
-msgstr "Baksida"
+#: data/org.gnome.SimpleScan.gschema.xml:30
+msgid "Height of paper in tenths of a mm"
+msgstr "Höjd på pappret i tiondels millimeter"
+
+#: data/org.gnome.SimpleScan.gschema.xml:31
+msgid ""
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"Höjd på pappret i tiondels millimeter (eller 0 för automatisk "
+"pappersidentifiering)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:35
+msgid "Brightness of scan"
+msgstr "Ljusstyrka vid skanning"
+
+#: data/org.gnome.SimpleScan.gschema.xml:36
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr "Inställningen av ljusstyrkan från -100 till 100 (0 betyder ingen)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:40
+msgid "Contrast of scan"
+msgstr "Kontrasten på skanningen"
+
+#: data/org.gnome.SimpleScan.gschema.xml:41
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr "Inställningen av kontrast från -100 till 100 (0 betyder ingen)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:45
+msgid "Resolution for text scans"
+msgstr "Upplösning för textinläsningar"
+
+#: data/org.gnome.SimpleScan.gschema.xml:46
+msgid "The resolution in dots-per-inch to use when scanning text."
+msgstr "Upplösning i punkter per tum att använda när text skannas in."
+
+#: data/org.gnome.SimpleScan.gschema.xml:50
+msgid "Resolution for photo scans"
+msgstr "Upplösning för fotoinläsningar"
+
+#: data/org.gnome.SimpleScan.gschema.xml:51
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr "Upplösningen i punkter per tum att använda när foton skannas in."
+
+#: data/org.gnome.SimpleScan.gschema.xml:55
+msgid "Page side to scan"
+msgstr "Sida att skanna"
+
+#: data/org.gnome.SimpleScan.gschema.xml:56
+msgid "The page side to scan."
+msgstr "Papprets sida att skanna."
+
+#: data/org.gnome.SimpleScan.gschema.xml:60
+msgid "Directory to save files to"
+msgstr "Katalog att spara filer i"
+
+#: data/org.gnome.SimpleScan.gschema.xml:61
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+"Katalogen att spara filer i. Standardvärdet är dokumentkatalogen om den inte "
+"är inställd."
+
+#: data/org.gnome.SimpleScan.gschema.xml:66
+msgid "Quality value to use for JPEG compression"
+msgstr "Kvalitetsvärde för JPEG-kompression"
+
+#: data/org.gnome.SimpleScan.gschema.xml:67
+msgid "Quality value to use for JPEG compression."
+msgstr "Kvalitetsvärde för JPEG-kompression."
+
+#: data/org.gnome.SimpleScan.gschema.xml:72
+msgid "Delay in millisecond between pages"
+msgstr "Fördröjning i millisekunder mellan sidor"
+
+#: data/org.gnome.SimpleScan.gschema.xml:73
+msgid "Delay in millisecond between pages."
+msgstr "Fördröjning i millisekunder mellan sidor."
 
 #. 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
+#. Set HeaderBar title here because Glade doesn't keep it translated
+#. https://bugzilla.gnome.org/show_bug.cgi?id=782753
+#. Title of scan window
+#: data/simple-scan.appdata.xml.in:6 data/simple-scan.desktop.in:3
+#: src/app-window.ui:76 src/app-window.vala:1560
 msgid "Simple Scan"
-msgstr "Enkel bildinläsning"
+msgstr "Enkel bildläsning"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
-msgid "_Document"
-msgstr "_Dokument"
+#: data/simple-scan.appdata.xml.in:7 data/simple-scan.desktop.in:5
+msgid "Scan Documents"
+msgstr "Skanna dokument"
 
-#. Scan menu item
-#: data/simple-scan.ui:260
-msgid "Sc_an"
-msgstr "Läs _in"
+#: 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 "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+"Ett väldigt lätt sätt att skanna både dokument och foton. Du kan beskära "
+"bort dåliga delar av ett foto, och rotera det om det är felvänt. Du kan "
+"skriva ut det du skannat in, exportera till pdf, eller spara dem i ett brett "
+"utbud av bildformat."
+
+#: data/simple-scan.appdata.xml.in:14
+msgid "Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+"Enkel bildläsning använder ramverket SANE för att hantera de flesta "
+"bildläsare som finns på marknaden."
+
+#: data/simple-scan.desktop.in:4
+msgid "Document Scanner"
+msgstr "Dokumentbildläsare"
 
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: data/simple-scan.desktop.in:7
+msgid "scan;scanner;flatbed;adf;"
+msgstr "scan;scanner;flatbädd;adf;skan;skanner;bildläsare;"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: data/simple-scan.desktop.in:10
+msgid "scanner"
+msgstr "scanner"
+
+#. Toolbar scan menu item to scan a single page from the scanner
 #. 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/app-window.ui:22 src/app-window.ui:123 src/app-window.ui:820
 msgid "Single _Page"
 msgstr "Enkel _sida"
 
+#. Toolbar scan menu item to scan all pages from a document feeder
 #. 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/app-window.ui:31 src/app-window.ui:133 src/app-window.ui:829
 msgid "All Pages From _Feeder"
 msgstr "Alla sidor från _matare"
 
-#. Menu entry to stop current scan
-#: data/simple-scan.ui:294
-msgid "_Stop Scan"
-msgstr "_Stoppa inläsning"
+#. Toolbar scan menu item to scan continuously from the flatbed
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/app-window.ui:40 src/app-window.ui:143 src/app-window.ui:838
+msgid "_Multiple Pages From Flatbed"
+msgstr "_Flera sidor från flatbädd"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:853
 msgid "Text"
 msgstr "Text"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:863
 msgid "Photo"
 msgstr "Foto"
 
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: src/app-window.ui:91
+msgid "_Document"
+msgstr "_Dokument"
+
+#. Scan menu item
+#: src/app-window.ui:110
+msgid "Sc_an"
+msgstr "Skann_a"
+
+#. Menu entry to stop current scan
+#: src/app-window.ui:154
+msgid "_Stop Scan"
+msgstr "_Stoppa skanning"
+
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/app-window.ui:196 src/app-window.vala:967 src/app-window.vala:1590
 msgid "Reorder Pages"
 msgstr "Ändra sidordning"
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/app-window.ui:215
 msgid "_Email"
 msgstr "_E-post"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/app-window.ui:280
 msgid "_Page"
 msgstr "_Sida"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/app-window.ui:290
 msgid "Rotate _Left"
 msgstr "Rotera åt _vänster"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/app-window.ui:300
 msgid "Rotate _Right"
 msgstr "Rotera åt _höger"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/app-window.ui:310
 msgid "_Crop"
 msgstr "_Beskär"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/app-window.ui:320
 msgid "_None"
 msgstr "_Ingen"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/app-window.ui:331
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/app-window.ui:342
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/app-window.ui:353
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/app-window.ui:364
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/app-window.ui:375
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/app-window.ui:386
 msgid "4×6"
-msgstr "4x6"
+msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/app-window.ui:397
 msgid "_Custom"
 msgstr "An_passad"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/app-window.ui:415
 msgid "_Rotate Crop"
-msgstr "_Rotera beskär"
+msgstr "_Rotera beskärning"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/app-window.ui:428
 msgid "Move Left"
 msgstr "Flytta åt vänster"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/app-window.ui:437
 msgid "Move Right"
 msgstr "Flytta åt höger"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/app-window.ui:474
 msgid "_Help"
 msgstr "_Hjälp"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/app-window.ui:482
 msgid "_Contents"
 msgstr "_Innehåll"
 
-#. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
-msgid "Start a new document"
-msgstr "Starta ett nytt dokument"
-
-#: data/simple-scan.ui:675
-msgid "New"
-msgstr "Nytt"
-
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/app-window.ui:520 src/app-window.ui:720
 msgid "Scan a single page from the scanner"
-msgstr "Läs in en enstaka sida från bildläsaren"
+msgstr "Skanna in en enstaka sida från bildläsaren"
 
 #. Label on scan toolbar item
-#: data/simple-scan.ui:691 data/simple-scan.ui:837
+#: src/app-window.ui:522 src/app-window.ui:716
 msgid "Scan"
-msgstr "Läs in"
+msgstr "Skanna"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/app-window.ui:538 src/app-window.ui:787
 msgid "Save document to a file"
 msgstr "Spara dokument till en fil"
 
-#: ../src/ui.vala:1842
+#: src/app-window.ui:540
 msgid "Save"
 msgstr "Spara"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/app-window.ui:555 src/app-window.ui:700
 msgid "Stop the current scan"
-msgstr "Stoppa den aktuella bildinläsningen"
+msgstr "Stoppa den aktuella skanningen"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/app-window.ui:556 src/app-window.ui:697
 msgid "Stop"
 msgstr "Stoppa"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "Rotera sidan åt vänster (motsols)"
-
-#. Label on rotate page left (anti-clockwise) item
-#: data/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
-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
-msgid "Rotate Right"
-msgstr "Rotera åt höger"
-
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
-msgid "Crop the selected page"
-msgstr "Beskär den valda sidan"
-
-#: data/simple-scan.ui:781
-msgid "Crop"
-msgstr "Beskär"
-
-#: ../src/ui.vala:1849
-msgid "Preferences"
-msgstr "Inställningar"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1048
-msgid "Scan S_ource:"
-msgstr "Inläsnings_källa:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1079
-msgid "_Text Resolution:"
-msgstr "_Textupplösning:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1095
-msgid "_Photo Resolution:"
-msgstr "_Fotoupplösning:"
-
-#. Label beside scan side combo box
-#: data/simple-scan.ui:1139
-msgid "Scan Side:"
-msgstr "Inläsningssida:"
-
-#. Label beside page size combo box
-#: data/simple-scan.ui:1169
-msgid "Page Size:"
-msgstr "Sidstorlek:"
-
-#. Label beside brightness scale
-#: data/simple-scan.ui:1199
-msgid "Brightness:"
-msgstr "Ljusstyrka:"
-
-#. Label beside contrast scale
-#: data/simple-scan.ui:1229
-msgid "Contrast:"
-msgstr "Kontrast:"
-
-#. Label beside quality scale
-#: data/simple-scan.ui:1260
-msgid "Quality:"
-msgstr "Kvalitet:"
-
-#: data/simple-scan.desktop.in:4
-msgid "Document Scanner"
-msgstr "Dokumentskanner"
+#. Label shown when searching for scanners
+#: src/app-window.ui:611
+msgid "Searching for Scanners…"
+msgstr "Söker efter bildläsare…"
 
-#: data/simple-scan.desktop.in:5
-msgid "Scan Documents"
-msgstr "Läs in dokument"
+#: src/app-window.vala:237 src/app-window.vala:1380
+msgid "_Close"
+msgstr "_Stäng"
 
-#: data/simple-scan.desktop.in:6
-msgid "scan;scanner;flatbed;adf;"
-msgstr "scan;scanner;flatbädd;adf;skan;skanner;"
+#. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
+#: src/app-window.vala:246
+#, c-format
+msgid "Username and password required to access “%s”"
+msgstr "Användarnamn och lösenord krävs för åtkomst till ”%s”"
 
-#: data/simple-scan.desktop.in:8
-msgid "scanner"
-msgstr ""
+#. Label shown when detected a scanner
+#: src/app-window.vala:266 src/app-window.vala:584
+msgid "Ready to Scan"
+msgstr "Redo att skanna"
 
-#: data/simple-scan.appdata.xml.in:8
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-"Ett väldigt lätt sätt att skanna både dokument och foton. Du kan beskära "
-"bort dåliga delar av ett foto, och rotera det om det är felvänt. Du kan "
-"skriva ut det du skannat in, exportera till pdf, eller spara dem i ett brett "
-"utbud av bildformat."
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: src/app-window.vala:273
+msgid "Additional software needed"
+msgstr "Ytterligare programvara behövs"
 
-#: data/simple-scan.appdata.xml.in:13
+#. Instructions to install driver software
+#: src/app-window.vala:275
 msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
-"Simple Scan använder ramverket SANE för att hantera de flesta skannrar som "
-"finns på marknaden."
-
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
-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
-msgid "Unable to connect to scanner"
-msgstr "Kan inte ansluta till bildläsare"
-
-#. Error display when unable to start scan
-#: ../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
-msgid "Error communicating with scanner"
-msgstr "Fel i kommunikation med bildläsare"
-
-#. Help string for command line --version flag
-#: ../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
-msgid "Print debugging messages"
-msgstr "Skriv ut felsökningsmeddelanden"
-
-#: ../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
-msgid "Failed to scan"
-msgstr "Misslyckades med att läsa in"
-
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
-msgid "[DEVICE...] - Scanning utility"
-msgstr "[ENHET...] - Bildinläsningsverktyg"
-
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
-#, c-format
-msgid "Run '%s --help' to see a full list of available command line options."
+"You need to <a href=\"install-firmware\">install driver software</a> for "
+"your scanner."
 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
-msgid "_Close"
-msgstr "_Stäng"
-
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../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\""
+"Du behöver <a href=\"install-firmware\">installera drivrutiner</a> för din "
+"bildläsare."
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/app-window.vala:281
 msgid "No scanners detected"
-msgstr "Inga bildinläsare hittades"
+msgstr "Ingen bildläsare hittades"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/app-window.vala:283
 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
-msgid "Additional software needed"
-msgstr "Ytterligare programvara behövs"
-
-#. Instructions to install driver software
-#: ../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
-msgid "Save As..."
-msgstr "Spara som..."
+#: src/app-window.vala:298
+msgid "Save As…"
+msgstr "Spara som…"
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/app-window.vala:301 src/app-window.vala:471 src/app-window.vala:552
 msgid "_Cancel"
 msgstr "_Avbryt"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/app-window.vala:302 src/app-window.vala:553
 msgid "_Save"
 msgstr "_Spara"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/app-window.vala:310
 msgid "Scanned Document.pdf"
-msgstr "Inläst dokument.pdf"
+msgstr "Skannat dokument.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#. Save dialog: Filter name to show only supported image files
+#: src/app-window.vala:316
 msgid "Image Files"
 msgstr "Bildfiler"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/app-window.vala:326
 msgid "All Files"
 msgstr "Alla filer"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/app-window.vala:335
 msgid "PDF (multi-page document)"
 msgstr "PDF (flersidigt dokument)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/app-window.vala:341
 msgid "JPEG (compressed)"
 msgstr "JPEG (komprimerad)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/app-window.vala:347
 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
+#. Save dialog: Label for sabing in WEBP format
+#: src/app-window.vala:354
+msgid "WebP (compressed)"
+msgstr "WebP (komprimerad)"
+
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
+#: src/app-window.vala:364
 msgid "File format:"
 msgstr "Filformat:"
 
+#. Label in save dialog beside compression slider
+#: src/app-window.vala:376
+msgid "Compression:"
+msgstr "Komprimering:"
+
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/app-window.vala:470
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr "En fil med namnet ”%s” finns redan.  Vill du ersätta den?"
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/app-window.vala:473
+msgid "_Replace"
+msgstr "E_rsätt"
+
+#: src/app-window.vala:512
+msgid "Saving"
+msgstr "Sparar"
+
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/app-window.vala:527
 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
-msgid "If you don't save, changes will be permanently lost."
+#: src/app-window.vala:550
+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/app-window.vala:591
 msgid "Save current document?"
 msgstr "Spara aktuellt dokument?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/app-window.vala:593
 msgid "Discard Changes"
 msgstr "Förkasta ändringar"
 
+#. Label shown when scan started
+#: src/app-window.vala:692
+msgid "Contacting scanner…"
+msgstr "Kontaktar bildläsare…"
+
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/app-window.vala:800
 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/app-window.vala:812
 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/app-window.vala:990
 msgid "Combine sides"
 msgstr "Kombinera sidor"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/app-window.vala:1000
 msgid "Combine sides (reverse)"
 msgstr "Kombinera sidor (omvänt)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/app-window.vala:1010
 msgid "Reverse"
 msgstr "Omvänt"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/app-window.vala:1020
 msgid "Keep unchanged"
 msgstr "Behåll oförändrad"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/app-window.vala:1250
 msgid "Unable to open help file"
 msgstr "Kunde inte öppna hjälpfilen"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/app-window.vala:1271
 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 +553,16 @@ msgstr ""
 "med detta program. Om inte, se <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/app-window.vala:1274
 msgid "About Simple Scan"
-msgstr "Om Enkel bildinläsning"
+msgstr "Om Enkel bildläsning"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/app-window.vala:1277
 msgid "Simple document scanning tool"
-msgstr "Enkelt verktyg för inläsning av dokument"
+msgstr "Enkelt verktyg för att skanna dokument"
 
-#: ../src/ui.vala:1487
+#: src/app-window.vala:1286
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -570,209 +580,519 @@ msgstr ""
 "deactivatedaccount"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/app-window.vala:1308
 msgid "Save document before quitting?"
-msgstr "Spara dokumment innan du avslutar?"
+msgstr "Spara dokument innan du avslutar?"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:1310
 msgid "Quit without Saving"
 msgstr "Avsluta utan att spara"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/app-window.vala:1357
 msgid "You appear to have a Brother scanner."
-msgstr "Du verkar ha en skanner från Brother."
+msgstr "Du verkar ha en bildläsare från Brother."
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/app-window.vala:1359
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.brother.com\">Brother website</a>."
+"Drivers for this are available on the <a href=\"http://support.brother.com"
+"\">Brother website</a>."
 msgstr ""
 "Drivrutinerna finns på <a href=\"http://support.brother.com\">Brothers "
 "webbplats</a>."
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/app-window.vala:1363
 msgid "You appear to have a Samsung scanner."
-msgstr "Du verkar ha en skanner från Samsung."
+msgstr "Du verkar ha en bildläsare från Samsung."
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/app-window.vala:1365
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://samsung.com/support\">Samsung website</a>."
+"Drivers for this are available on the <a href=\"http://samsung.com/support"
+"\">Samsung website</a>."
 msgstr ""
 "Drivrutinerna finns på <a href=\"http://samsung.com/support\">Samsungs "
 "webbplats</a>."
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/app-window.vala:1369
 msgid "You appear to have an HP scanner."
-msgstr "Du verkar ha en skanner från HP."
+msgstr "Du verkar ha en bildläsare från HP."
 
 #. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/app-window.vala:1374
 msgid "You appear to have an Epson scanner."
-msgstr "Du verkar ha en skanner från Epson."
+msgstr "Du verkar ha en bildläsare från Epson."
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/app-window.vala:1376
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.epson.com\">Epson website</a>."
+"Drivers for this are available on the <a href=\"http://support.epson.com"
+"\">Epson website</a>."
 msgstr ""
 "Drivrutiner är tillgängliga på <a href=\"http://support.epson.com\">Epsons "
 "webbplats</a>."
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/app-window.vala:1380
 msgid "Install drivers"
 msgstr "Installera drivrutiner"
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/app-window.vala:1411
 msgid "Once installed you will need to restart Simple Scan."
-msgstr "Efter installation kan du behöva starta om Simple Scan."
+msgstr "Efter installation kan du behöva starta om Enkel bildläsning."
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
-msgid "Installing drivers..."
-msgstr "Installerar drivrutiner..."
+#: src/app-window.vala:1423
+msgid "Installing drivers…"
+msgstr "Installerar drivrutiner…"
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/app-window.vala:1431
 msgid "Drivers installed successfully!"
 msgstr "Drivrutinerna installerades!"
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/app-window.vala:1441
 #, 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/app-window.vala:1447
 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/app-window.vala:1454
+#, c-format
+msgid "You need to install the %s package."
+msgid_plural "You need to install the %s packages."
+msgstr[0] "Du behöver installera paketet %s."
+msgstr[1] "Du behöver installera paketen %s."
+
+#. Title of preferences dialog
+#: src/app-window.vala:1568 src/app-window.vala:1591
+#: src/preferences-dialog.ui:53
+msgid "Preferences"
+msgstr "Inställningar"
+
+#: src/app-window.vala:1572
+msgid "Keyboard Shortcuts"
+msgstr "Tangentbordsgenvägar"
+
+#: src/app-window.vala:1573
+msgid "Help"
+msgstr "Hjälp"
+
+#: src/app-window.vala:1574
+msgid "About"
+msgstr "Om"
+
+#: src/app-window.vala:1575
+msgid "Quit"
+msgstr "Avsluta"
+
+#: src/app-window.vala:1589
+msgid "Email"
+msgstr "E-post"
+
+#. Populate ActionBar (not supported in Glade)
+#. https://bugzilla.gnome.org/show_bug.cgi?id=769966
+#. Label on new document button
+#: src/app-window.vala:1599
+msgid "Start Again…"
+msgstr "Starta igen…"
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: src/app-window.vala:1616
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Rotera sidan åt vänster (motsols)"
+
+#. Tooltip for rotate right (clockwise) button
+#: src/app-window.vala:1623
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Rotera sidan åt höger (medsols)"
+
+#. Tooltip for crop button
+#: src/app-window.vala:1633
+msgid "Crop the selected page"
+msgstr "Beskär den valda sidan"
+
+#. Tooltip for delete button
+#: src/app-window.vala:1649
+msgid "Delete the selected page"
+msgstr "Radera den valda sidan"
+
+#. Text of button for cancelling save
+#: src/app-window.vala:1814
+msgid "Cancel"
+msgstr "Avbryt"
+
+#. Button to submit authorization dialog
+#: src/authorize-dialog.ui:25
+msgid "_Authorize"
+msgstr "A_uktorisera"
+
+#. Label beside username entry
+#: src/authorize-dialog.ui:99
+msgid "_Username for resource:"
+msgstr "_Användarnamn för källa:"
+
+#. Label beside password entry
+#: src/authorize-dialog.ui:112
+msgid "_Password:"
+msgstr "_Lösenord:"
+
+#: src/book.vala:331 src/book.vala:337
 #, c-format
-msgid "You need to install the %s package(s)."
-msgstr "Du behöver installera paket(en) %s."
+msgid "Unable to encode page %i"
+msgstr "Kunde inte koda sida %i"
+
+#: src/help-overlay.ui:12
+msgctxt "shortcut window"
+msgid "Scanning"
+msgstr "Skannar"
+
+#: src/help-overlay.ui:17
+msgctxt "shortcut window"
+msgid "Scan a single page"
+msgstr "Skanna in en enstaka sida"
+
+#: src/help-overlay.ui:24
+msgctxt "shortcut window"
+msgid "Scan all pages from document feeder"
+msgstr "Skanna in alla sidor från dokumentmataren"
+
+#: src/help-overlay.ui:31
+msgctxt "shortcut window"
+msgid "Scan continuously from a flatbed scanner"
+msgstr "Skanna kontinuerligt från en flatbäddsbildläsare"
+
+#: src/help-overlay.ui:38
+msgctxt "shortcut window"
+msgid "Stop scan in progress"
+msgstr "Stoppa pågående skanning"
+
+#: src/help-overlay.ui:46
+msgctxt "shortcut window"
+msgid "Document Modification"
+msgstr "Dokumentändring"
+
+#: src/help-overlay.ui:51
+msgctxt "shortcut window"
+msgid "Move page left"
+msgstr "Flytta sidan åt vänster"
+
+#: src/help-overlay.ui:58
+msgctxt "shortcut window"
+msgid "Move page right"
+msgstr "Flytta sidan åt höger"
+
+#: src/help-overlay.ui:65
+msgctxt "shortcut window"
+msgid "Rotate page to the left (anti-clockwise)"
+msgstr "Rotera sidan åt vänster (motsols)"
+
+#: src/help-overlay.ui:72
+msgctxt "shortcut window"
+msgid "Rotate page to the right (clockwise)"
+msgstr "Rotera sidan åt höger (medsols)"
+
+#: src/help-overlay.ui:79
+msgctxt "shortcut window"
+msgid "Delete page"
+msgstr "Ta bort sida"
+
+#: src/help-overlay.ui:87
+msgctxt "shortcut window"
+msgid "Document Management"
+msgstr "Dokumenthantering"
+
+#: src/help-overlay.ui:92
+msgctxt "shortcut window"
+msgid "Start new document"
+msgstr "Starta nytt dokument"
+
+#: src/help-overlay.ui:99
+msgctxt "shortcut window"
+msgid "Save scanned document"
+msgstr "Spara inläst dokument"
+
+#: src/help-overlay.ui:106
+msgctxt "shortcut window"
+msgid "Email scanned document"
+msgstr "E-posta inläst dokument"
+
+#: src/help-overlay.ui:113
+msgctxt "shortcut window"
+msgid "Print scanned document"
+msgstr "Skriv ut inläst dokument"
+
+#: src/help-overlay.ui:120
+msgctxt "shortcut window"
+msgid "Copy current page to clipboard"
+msgstr "Kopiera aktuell sida till urklipp"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:113
+msgid "_Scanner"
+msgstr "_Bildläsare"
+
+#. Label beside scan side combo box
+#: src/preferences-dialog.ui:143
+msgid "Scan Sides"
+msgstr "Inläsningssida"
+
+#. Label beside page size combo box
+#: src/preferences-dialog.ui:160
+msgid "Page Size"
+msgstr "Sidstorlek"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:191
+msgid "Front"
+msgstr "Framsida"
+
+#. Preferences Dialog: Toggle button to select scanning on the back side of a page
+#: src/preferences-dialog.ui:206
+msgid "Back"
+msgstr "Baksida"
+
+#. Preferences Dialog: Toggle button to select scanning on both sides of a page
+#: src/preferences-dialog.ui:221
+msgid "Both"
+msgstr "Båda"
+
+#. Label beside page delay scale
+#: src/preferences-dialog.ui:260
+msgid "Delay"
+msgstr "Fördröjning"
+
+#. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
+#: src/preferences-dialog.ui:276
+msgid "Multiple pages from flatbed"
+msgstr "Flera sidor från flatbädd"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:295
+msgid "3"
+msgstr "3"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:310
+msgid "5"
+msgstr "5"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:326
+msgid "7"
+msgstr "7"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:342
+msgid "10"
+msgstr "10"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:358
+msgid "15"
+msgstr "15"
+
+#. Label after page delay radio buttons
+#: src/preferences-dialog.ui:385
+msgid "Seconds"
+msgstr "Sekunder"
+
+#. Preferences Dialog: Tab label for scanning settings
+#: src/preferences-dialog.ui:413
+msgid "Scanning"
+msgstr "Skanna"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:436
+msgid "_Text Resolution"
+msgstr "_Textupplösning"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:452
+msgid "_Photo Resolution"
+msgstr "_Fotoupplösning"
+
+#. Label beside brightness scale
+#: src/preferences-dialog.ui:505
+msgid "Brightness"
+msgstr "Ljusstyrka"
+
+#. Label beside contrast scale
+#: src/preferences-dialog.ui:521
+msgid "Contrast"
+msgstr "Kontrast"
+
+#. Preferences Dialog: Tab for quality settings
+#: src/preferences-dialog.ui:576
+msgid "Quality"
+msgstr "Kvalitet"
+
+#. Combo box value for automatic paper size
+#: src/preferences-dialog.vala:77
+msgid "Automatic"
+msgstr "Automatisk"
+
+#: src/preferences-dialog.vala:116
+msgid "Darker"
+msgstr "Mörkare"
+
+#: src/preferences-dialog.vala:118
+msgid "Lighter"
+msgstr "Ljusare"
+
+#: src/preferences-dialog.vala:126
+msgid "Less"
+msgstr "Lägre"
+
+#: src/preferences-dialog.vala:128
+msgid "More"
+msgstr "Högre"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/preferences-dialog.vala:440
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (standard)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/preferences-dialog.vala:443
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (utkast)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/preferences-dialog.vala:446
 #, 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/preferences-dialog.vala:449
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1835
-msgid "New Document"
-msgstr "Nytt dokument"
+#. Error displayed when no scanners to scan with
+#: src/scanner.vala:844
+msgid "No scanners available.  Please connect a scanner."
+msgstr "Inga bildläsare finns tillgängliga. Anslut en bildläsare."
 
-#: ../src/ui.vala:1840
-msgid "Document"
-msgstr "Dokument"
+#. Error displayed when cannot connect to scanner
+#: src/scanner.vala:874
+msgid "Unable to connect to scanner"
+msgstr "Kan inte ansluta till bildläsare"
 
-#: ../src/ui.vala:1844
-msgid "Email..."
-msgstr "E-post..."
+#. Error display when unable to start scan
+#: src/scanner.vala:1227
+msgid "Unable to start scan"
+msgstr "Kan inte starta bildläsare"
 
-#: ../src/ui.vala:1845
-msgid "Print..."
-msgstr "Skriv ut..."
+#. Error displayed when communication with scanner broken
+#: src/scanner.vala:1240 src/scanner.vala:1340
+msgid "Error communicating with scanner"
+msgstr "Fel i kommunikation med bildläsare"
 
-#: ../src/ui.vala:1853
-msgid "Help"
-msgstr "Hjälp"
+#. Help string for command line --version flag
+#: src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "Visa utgåvans version"
 
-#: ../src/ui.vala:1854
-msgid "About"
-msgstr "Om"
+#. Help string for command line --debug flag
+#: src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Skriv ut felsökningsmeddelanden"
 
-#: ../src/ui.vala:1855
-msgid "Quit"
-msgstr "Avsluta"
+#: 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 Enkel bildläsning"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
-msgid "Change _Scanner"
-msgstr "Byt _bildinläsare"
+#. Title of error dialog when scan failed
+#: src/simple-scan.vala:392
+msgid "Failed to scan"
+msgstr "Misslyckades med att skanna"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
-msgid "_Install Drivers"
-msgstr "_Installera drivrutiner"
+#. Attempt to inhibit the screensaver when scanning
+#: src/simple-scan.vala:407
+msgid "Scan in progress"
+msgstr "Inläsning pågår"
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
-msgid "Automatic"
-msgstr "Automatiskt"
+#. Arguments and description for --help text
+#: src/simple-scan.vala:584
+msgid "[DEVICE…] — Scanning utility"
+msgstr "[ENHET…] — Bildläsarverktyg"
 
-#: ../src/ui.vala:1947
-msgid "Darker"
-msgstr "Mörkare"
+#. Text printed out when an unknown command-line argument provided
+#: src/simple-scan.vala:595
+#, 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:1949
-msgid "Lighter"
-msgstr "Ljusare"
+#~ msgid "_Install Drivers"
+#~ msgstr "_Installera drivrutiner"
 
-#: ../src/ui.vala:1957
-msgid "Less"
-msgstr "Mindre"
+#~ msgid "Saving document…"
+#~ msgstr "Sparar dokument…"
 
-#: ../src/ui.vala:1959
-msgid "More"
-msgstr "Mer"
+#~ msgid "Saving page %d out of %d"
+#~ msgstr "Sparar sida %d av %d"
 
-#: ../src/ui.vala:1967
-msgid "Minimum"
-msgstr "Minimum"
+#~ msgid "Front and Back"
+#~ msgstr "Fram- och baksida"
 
-#: ../src/ui.vala:1969
-msgid "Maximum"
-msgstr "Maximum"
+#~ msgid "New"
+#~ msgstr "Nytt"
 
-#: ../src/ui.vala:2008
-msgid "Saving document..."
-msgstr "Sparar dokument..."
+#~ msgid "Rotate Left"
+#~ msgstr "Rotera åt vänster"
 
-#: ../src/ui.vala:2173
-#, c-format
-msgid "Saving page %d out of %d"
-msgstr "Sparar sida %d av %d"
+#~ msgid "Rotate Right"
+#~ msgstr "Rotera åt höger"
+
+#~ msgid "Crop"
+#~ msgstr "Beskär"
+
+#~ msgid "Scan S_ource:"
+#~ msgstr "Inläsnings_källa:"
+
+#~ msgid "New Document"
+#~ msgstr "Nytt dokument"
+
+#~ msgid "Document"
+#~ msgstr "Dokument"
+
+#~ msgid "Email…"
+#~ msgstr "E-post…"
+
+#~ msgid "Print…"
+#~ msgstr "Skriv ut…"
+
+#~ msgid "Minimum"
+#~ msgstr "Minimum"
+
+#~ msgid "Maximum"
+#~ msgstr "Maximum"
+
+#~ msgid "Email..."
+#~ msgstr "E-post..."
 
 #~ msgid "4&#xD7;6"
 #~ msgstr "4&#xD7;6"
 
-#~ msgid "Device to scan from"
-#~ msgstr "Enhet att läsa in från"
-
 #~ msgid "Direction of scan"
 #~ msgstr "Riktning för inläsning"
 
-#, c-format
 #~ msgid ""
 #~ "Usage:\n"
 #~ "  %s [DEVICE...] - Scanning utility"
@@ -789,15 +1109,6 @@ msgstr "Sparar sida %d av %d"
 #~ msgid "Height of scanned image in pixels"
 #~ msgstr "Höjd för den inlästa bilden i bildpunkter"
 
-#~ msgid "SANE device to acquire images from."
-#~ msgstr "SANE-enhet att hämta in bilder från."
-
-#~ msgid "Resolution for text scans"
-#~ msgstr "Upplösning för textinläsningar"
-
-#~ msgid "Resolution for photo scans"
-#~ msgstr "Upplösning för fotoinläsningar"
-
 #~ msgid "Resolution of last scanned image"
 #~ msgstr "Upplösning för senaste inlästa bild"
 
@@ -816,7 +1127,6 @@ msgstr "Sparar sida %d av %d"
 #~ msgid "TRUE if the application window is maximized"
 #~ msgstr "TRUE om programfönstret är maximerat"
 
-#, c-format
 #~ msgid ""
 #~ "Help Options:\n"
 #~ "  -d, --debug                     Print debugging messages\n"
@@ -832,7 +1142,6 @@ msgstr "Sparar sida %d av %d"
 #~ "  --help-all                      Visa alla hjälpflaggor\n"
 #~ "  --help-gtk                      Visa GTK+-flaggor"
 
-#, c-format
 #~ msgid ""
 #~ "GTK+ Options:\n"
 #~ "  --class=CLASS                   Program class as used by the window "
@@ -854,51 +1163,31 @@ msgstr "Sparar sida %d av %d"
 #~ "  --gtk-module=MODULER            Läs in ytterligare GTK+-moduler\n"
 #~ "  --g-fatal-warnings              Gör alla varningar ödesdigra"
 
-#~ msgid "Type of document being scanned"
-#~ msgstr "Typ av dokument som ska läsas in"
-
-#~ msgid "Scanned Document"
-#~ msgstr "Inläst dokument"
-
 #~ msgid ""
 #~ "The height of scanned image in pixels. This value is updated to what the "
 #~ "last scanned page was."
 #~ msgstr ""
-#~ "Höjd för den inlästa bilden i bildpunkter.  Detta värde uppdateras till vad "
-#~ "som senaste inlästa bilden använde."
+#~ "Höjd för den inlästa bilden i bildpunkter.  Detta värde uppdateras till "
+#~ "vad som senaste inlästa bilden använde."
 
 #~ msgid ""
-#~ "The direction of the scanner across the scanned page. It can be one of the "
-#~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+#~ "The direction of the scanner across the scanned page. It can be one of "
+#~ "the following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-"
+#~ "left'"
 #~ msgstr ""
 #~ "Riktningen för bildläsaren över den inlästa sidan. Det kan vara en av "
-#~ "följande: \"top-to-bottom\" \"bottom-to-top\" \"left-to-right\" \"right-to-"
-#~ "left\""
+#~ "följande: \"top-to-bottom\" \"bottom-to-top\" \"left-to-right\" \"right-"
+#~ "to-left\""
 
 #~ msgid "The resolution in dots-per-inch of the previously scanned image."
 #~ msgstr "Upplösningen i punkter per tum för den föregående inlästa bilden."
 
-#~ msgid "The resolution in dots-per-inch to use when scanning text."
-#~ msgstr "Upplösning i punkter per tum att använda när text läses in."
-
-#~ msgid "The resolution in dots-per-inch to use when scanning photos."
-#~ msgstr "Upplösningen i punkter per tum att använda när foton läses in."
-
-#~ msgid ""
-#~ "The directory to save files to. Defaults to the documents directory if unset."
-#~ msgstr ""
-#~ "Katalogen att spara filer i. Standardvärdet är dokumentkatalogen om den inte "
-#~ "är inställd."
-
-#~ msgid "Directory to save files to"
-#~ msgstr "Katalog att spara filer i"
-
 #~ msgid ""
-#~ "The width of scanned image in pixels. This value is updated to what the last "
-#~ "scanned page was."
+#~ "The width of scanned image in pixels. This value is updated to what the "
+#~ "last scanned page was."
 #~ msgstr ""
-#~ "Bredd för den inlästa bilden i bildpunkter.  Detta värde uppdateras till vad "
-#~ "som senaste inlästa bilden använde."
+#~ "Bredd för den inlästa bilden i bildpunkter.  Detta värde uppdateras till "
+#~ "vad som senaste inlästa bilden använde."
 
 #~ msgid ""
 #~ "Type of document being scanned. 'text' for text documents, 'photo' for "
@@ -910,60 +1199,11 @@ msgstr "Sparar sida %d av %d"
 #~ "efterbehandling."
 
 #~ msgid ""
-#~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
-#~ msgstr ""
-#~ "Sidan att läsa in. Det kan vara en av följande: \"both\" \"front\" \"back\""
-
-#~ msgid "Page side to scan"
-#~ msgstr "Sida att läsa in"
-
-#~ msgid ""
-#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
-#~ msgstr ""
-#~ "Höjd på pappret i tiondels millimeter (eller 0 för automatisk "
-#~ "pappersidentifiering)."
-
-#~ msgid "Height of paper in tenths of a mm"
-#~ msgstr "Höjd på pappret i tiondels millimeter"
-
-#~ msgid ""
-#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
+#~ "The page side to scan. It can be one of the following: 'both' 'front' "
+#~ "'back'"
 #~ msgstr ""
-#~ "Bredd på pappret i tiondels millimeter (eller 0 för automatisk "
-#~ "pappersidentifiering)."
-
-#~ msgid "Width of paper in tenths of a mm"
-#~ msgstr "Bredd på pappret i tiondels millimeter"
-
-#~ msgid "The page side to scan."
-#~ msgstr "Papprets sida att läsa in."
-
-#~ msgid ""
-#~ "Type of document being scanned. This setting decides on the scan resolution, "
-#~ "colors and post-processing."
-#~ msgstr ""
-#~ "Typ av dokument att läsa in. Denna inställning bestämmer inläsningens "
-#~ "upplösning, färger och efterbehandling."
+#~ "Sidan att läsa in. Det kan vara en av följande: \"both\" \"front\" \"back"
+#~ "\""
 
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "Riktningen för bildläsaren över den inlästa sidan."
-
-#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
-#~ msgstr "Inställningen av kontrast från -100 till 100 (0 betyder ingen)."
-
-#~ msgid "Contrast of scan"
-#~ msgstr "Kontrasten på skanningen"
-
-#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
-#~ msgstr "Instöllningen av ljusstyrkan från -100 till 100 (0 betyder ingen)."
-
-#~ msgid "Brightness of scan"
-#~ msgstr "Ljusstyrka i skanningen"
-
-#~ msgid "Quality value to use for JPEG compression."
-#~ msgstr "Kvalitets värde i JPEG kompression"
-
-#~ msgid "Quality value to use for JPEG compression"
-#~ msgstr "Kvalitets värde i JPEG kompression"
diff --git a/po/ta.gmo b/po/ta.gmo
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..72741ae 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -7,296 +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"
+"POT-Creation-Date: 2017-04-16 08:54-0400\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"
+"Language: ta\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-25 06:10+0000\n"
+"X-Generator: Launchpad (build 18361)\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
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: 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 "(_C) தனிப்பயன்"
 
 #. 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 ""
 
-#: ../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 ""
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: 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 ""
 
@@ -308,7 +322,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 +330,207 @@ 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:844
 msgid "No scanners available.  Please connect a scanner."
 msgstr ""
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:874
 msgid "Unable to connect to scanner"
 msgstr ""
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1227
 msgid "Unable to start scan"
 msgstr ""
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: 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
+#: 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:332 src/ui.vala:1655 src/ui.vala:1935
 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:341
 #, 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:389
 msgid "No scanners detected"
 msgstr ""
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:391
 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:396
 msgid "Additional software needed"
 msgstr ""
 
 #. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:398
 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: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 ""
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:522
 msgid "Scanned Document.pdf"
 msgstr ""
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:528
 msgid "Image Files"
 msgstr ""
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:534
 msgid "All Files"
 msgstr ""
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:543
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:549
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:555
 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: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:650
+#: src/ui.vala:698
 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:721
 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:763
 msgid "Save current document?"
 msgstr ""
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:765
 msgid "Discard Changes"
 msgstr ""
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:1056
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1068
 msgid "Unable to open image preview application"
 msgstr ""
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1270
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1280
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1290
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1300
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1504
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: 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"
@@ -522,16 +547,16 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1528
 msgid "About Simple Scan"
 msgstr ""
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1531
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1540
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -541,189 +566,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:1562
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1564
 msgid "Quit without Saving"
 msgstr ""
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1632
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1634
 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:1638
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1640
 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:1644
 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:1649
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1651
 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:1655
 msgid "Install drivers"
 msgstr ""
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1686
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1698
 msgid "Installing drivers..."
 msgstr ""
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1706
 msgid "Drivers installed successfully!"
 msgstr ""
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1716
 #, 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:1722
 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:1729
 #, 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:1833
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1836
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1839
 #, 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: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 ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1937
 msgid "Change _Scanner"
 msgstr ""
 
 #. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1939
 msgid "_Install Drivers"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: 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/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..c78c501 100644
--- a/po/te.po
+++ b/po/te.po
@@ -7,296 +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"
+"POT-Creation-Date: 2017-04-16 08:54-0400\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"
+"Language: te\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-25 06:10+0000\n"
+"X-Generator: Launchpad (build 18361)\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: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 "పత్రం (_D)"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/simple-scan.ui:266
 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:279 src/simple-scan.ui:1343 src/simple-scan.ui:1402
 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:289 src/simple-scan.ui:1352 src/simple-scan.ui:1411
 msgid "All Pages From _Feeder"
 msgstr "ఫీడర్ నుండి అన్ని పేజీలు(_F)"
 
+#. 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 "స్కాన్ ఆపు(_S)"
 
-#: 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
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: 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 "ఈమెయిల్(_E)"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:436
 msgid "_Page"
 msgstr "పేజీ(_P)"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:446
 msgid "Rotate _Left"
 msgstr "ఎడమవైపు తిప్పు (_L)"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:456
 msgid "Rotate _Right"
 msgstr "కుడివైపు తిప్పు(_R)"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:466
 msgid "_Crop"
 msgstr "క్రాప్ చేయి(_C)"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:476
 msgid "_None"
 msgstr "ఏదీకాదు(_N)"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:487
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:498
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:509
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:520
 msgid "_Letter"
 msgstr "లెటర్ (_L)"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:531
 msgid "Le_gal"
 msgstr "లీగల్ (_g)"
 
 #. 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 "మలచుకొను(_C)"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:571
 msgid "_Rotate Crop"
 msgstr "క్రాప్‌చేసినదానిని తిప్పు(_R)"
 
 #. 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 "సహాయం (_H)"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:638
 msgid "_Contents"
 msgstr "విషయసూచిక(_C)"
 
 #. 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 "పత్రాన్ని ఫైలులో దాచు"
 
-#: ../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 "అంచులుసవరించు"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: 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 "స్కాన్ మూలం (_o):"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1085
 msgid "_Text Resolution:"
 msgstr "పాఠ విభాజకత (_T)"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1101
 msgid "_Photo Resolution:"
 msgstr "ఫొటో విభాజకత(_P)"
 
 #. 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 "పత్రాలు స్కాన్ చేయు"
 
@@ -308,7 +322,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 +330,208 @@ 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:844
 msgid "No scanners available.  Please connect a scanner."
 msgstr "ఏ స్కానర్‌లు అందుబాటులోలేవు. దయచేసి ఒక స్కానర్‌ను అనుసంధానించండి."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:874
 msgid "Unable to connect to scanner"
 msgstr "స్కానర్‌కు అనుసంధానించలేకపోతోంది"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1227
 msgid "Unable to start scan"
 msgstr "స్కాన్ ప్రారంభించుట వీలుకాలేదు"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: 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
+#: 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:332 src/ui.vala:1655 src/ui.vala:1935
 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:341
 #, 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:389
 msgid "No scanners detected"
 msgstr "ఏ స్కానర్‌లు కనిపెట్టబడలేదు"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:391
 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:396
 msgid "Additional software needed"
 msgstr ""
 
 #. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:398
 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: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 ""
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:522
 msgid "Scanned Document.pdf"
 msgstr "స్కాన్‌చేయబడిన పత్రం.pdf"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:528
 msgid "Image Files"
 msgstr "బొమ్మ ఫైళ్లు"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:534
 msgid "All Files"
 msgstr "అన్ని ఫైళ్ళు"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:543
 msgid "PDF (multi-page document)"
 msgstr "PDF (బహుళ-పేజి పత్రం)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:549
 msgid "JPEG (compressed)"
 msgstr "JPEG (కుదించిన)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:555
 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: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:650
+#: src/ui.vala:698
 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:721
 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:763
 msgid "Save current document?"
 msgstr "ప్రస్తుత పత్రాన్ని దాచాలా?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:765
 msgid "Discard Changes"
 msgstr "మార్పులు వదలివేయి"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:1056
 msgid "Unable to save image for preview"
 msgstr "మునుజూపు కొరకు బొమ్మను భద్రపరుచులేకపోతున్నది"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1068
 msgid "Unable to open image preview application"
 msgstr "బొమ్మ మునుజూపు అనువర్తనం తెరచుట వీలుకాలేదు"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1270
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1280
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1290
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1300
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1504
 msgid "Unable to open help file"
 msgstr "సహాయ ఫైలు తెరువలేకపోయింది"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: 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"
@@ -534,16 +559,16 @@ msgstr ""
 " లేనిచో చూడండి <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1528
 msgid "About Simple Scan"
 msgstr "సింపుల్ స్కాన్ గురించి"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1531
 msgid "Simple document scanning tool"
 msgstr "సులభంగా పత్ర స్కానింగ్‌చేయు సాధనం"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1540
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -553,189 +578,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:1562
 msgid "Save document before quitting?"
 msgstr "నిష్క్రమించేముందు పత్రాన్ని దాచాలా?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1564
 msgid "Quit without Saving"
 msgstr "దాచకుండా నిష్క్రమించు"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1632
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1634
 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:1638
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1640
 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:1644
 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:1649
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1651
 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:1655
 msgid "Install drivers"
 msgstr ""
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1686
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1698
 msgid "Installing drivers..."
 msgstr ""
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1706
 msgid "Drivers installed successfully!"
 msgstr ""
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1716
 #, 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:1722
 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:1729
 #, 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:1833
 #, 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:1836
 #, 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:1839
 #, 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:1842
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../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 ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1937
 msgid "Change _Scanner"
 msgstr "స్కానర్‌ను మార్చు(_S)"
 
 #. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1939
 msgid "_Install Drivers"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: 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/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..5b3c946 100644
--- a/po/th.po
+++ b/po/th.po
@@ -7,308 +7,322 @@ 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-04-16 08:54-0400\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"
+"Language: th\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-25 06:10+0000\n"
+"X-Generator: Launchpad (build 18361)\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 "Simple Scan"
 
 #. 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
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/simple-scan.ui:352 src/ui.vala:1247 src/ui.vala:1891
 msgid "Reorder Pages"
-msgstr ""
+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 "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:498
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:509
 msgid "A_6"
 msgstr "A_6"
 
 #. 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 "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:542
 msgid "4×6"
-msgstr ""
+msgstr "4×6"
 
 #. 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 "บันทึกเอกสารเป็นแฟ้ม"
 
-#: ../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 "ตัด"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: 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 ""
+msgstr "ความสว่าง:"
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1235
 msgid "Contrast:"
-msgstr ""
+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 ""
+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 +330,207 @@ 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:844
 msgid "No scanners available.  Please connect a scanner."
 msgstr "เครื่องสแกนไม่สามารถใช้ได้ โปรดเชื่อมต่อเครื่องสแกน"
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:874
 msgid "Unable to connect to scanner"
 msgstr "ไม่สามารถเชื่อมต่อเครื่องสแกน"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1227
 msgid "Unable to start scan"
 msgstr "ไม่สามารถเริ่มต้นการสแกน"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: 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
+#: 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:332 src/ui.vala:1655 src/ui.vala:1935
 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:341
 #, 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:389
 msgid "No scanners detected"
 msgstr "ไม่พบเครื่องสแกน"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:391
 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:396
 msgid "Additional software needed"
-msgstr ""
+msgstr "ต้องติดตั้งซอฟต์แวร์เพิ่มเติม"
 
 #. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:398
 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: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 ""
+msgstr "_ยกเลิก"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:514 src/ui.vala:724
 msgid "_Save"
-msgstr ""
+msgstr "_บันทึก"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:522
 msgid "Scanned Document.pdf"
 msgstr "สแกน Document.pdf แล้ว"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:528
 msgid "Image Files"
 msgstr "แฟ้มภาพ"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:534
 msgid "All Files"
 msgstr "แฟ้มทั้งหมด"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:543
 msgid "PDF (multi-page document)"
 msgstr "PDF (เอกสารหลายหน้า)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:549
 msgid "JPEG (compressed)"
 msgstr "JPEG (บีบอัดแล้ว)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:555
 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: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:650
+#: src/ui.vala:698
 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:721
 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:763
 msgid "Save current document?"
 msgstr "บันทึกเอกสารปัจจุบัน"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:765
 msgid "Discard Changes"
 msgstr "ยกเลิกการเปลี่ยนแปลง"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:1056
 msgid "Unable to save image for preview"
 msgstr "ไม่สามารถบัญทึกรูปภาพตัวอย่าง"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1068
 msgid "Unable to open image preview application"
 msgstr "ไม่สามารถเปิดโปรแกรมแสดงภาพได้"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1270
 msgid "Combine sides"
-msgstr ""
+msgstr "รวมด้านข้าง"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1280
 msgid "Combine sides (reverse)"
-msgstr ""
+msgstr "รวมด้านข้าง (ย้อนกลับ)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1290
 msgid "Reverse"
-msgstr ""
+msgstr "ย้อนกลับ"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1300
 msgid "Keep unchanged"
-msgstr ""
+msgstr "ปล่อยให้ไม่มีการเปลี่ยนแปลงต่อไป"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1504
 msgid "Unable to open help file"
 msgstr "ไม่สามารถเปิดแฟ้มเอกสารวิธีใช้"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: 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"
@@ -534,16 +559,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:1528
 msgid "About Simple Scan"
 msgstr "เกี่ยวกับ Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1531
 msgid "Simple document scanning tool"
 msgstr "เครื่องมือสแกนเอกสารอย่างง่าย"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1540
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -556,192 +581,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:1562
 msgid "Save document before quitting?"
 msgstr "บันทึกเอกสารก่อนปิดหรือไม่?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1564
 msgid "Quit without Saving"
 msgstr "ปิดโดยไม่บันทึก"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1632
 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:1634
 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:1638
 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:1640
 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:1644
 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:1649
 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:1651
 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:1655
 msgid "Install drivers"
-msgstr ""
+msgstr "ติดตั้งไดรเวอร์"
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1686
 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:1698
 msgid "Installing drivers..."
-msgstr ""
+msgstr "กำลังติดตั้งไดรเวอร์..."
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1706
 msgid "Drivers installed successfully!"
-msgstr ""
+msgstr "ติดตั้งไดรเวอร์สำเร็จแลัว!"
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1716
 #, 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:1722
 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:1729
 #, 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:1833
 #, 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:1836
 #, 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:1839
 #, 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:1842
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1885
 msgid "New Document"
-msgstr ""
+msgstr "เอกสารใหม่"
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1890
 msgid "Document"
-msgstr ""
+msgstr "เอกสาร"
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1893
 msgid "Email..."
-msgstr ""
+msgstr "อีเมล..."
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1894
 msgid "Print..."
-msgstr ""
+msgstr "พิมพ์..."
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1902
 msgid "Help"
-msgstr ""
+msgstr "วิธีใช้"
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1903
 msgid "About"
-msgstr ""
+msgstr "เกี่ยวกับ"
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1904
 msgid "Quit"
-msgstr ""
+msgstr "เลิก"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1937
 msgid "Change _Scanner"
 msgstr "เ_ปลี่ยนเครื่องสแกน"
 
 #. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1939
 msgid "_Install Drivers"
-msgstr ""
+msgstr "_ติดตั้งไดรเวอร์"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1945
 msgid "Automatic"
 msgstr "อัตโนมัติ"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1995
 msgid "Darker"
-msgstr ""
+msgstr "มืดลงกว่าเดิม"
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1997
 msgid "Lighter"
-msgstr ""
+msgstr "สว่างขึ้นกว่าเดิม"
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:2005
 msgid "Less"
-msgstr ""
+msgstr "น้อยลง"
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:2007
 msgid "More"
-msgstr ""
+msgstr "มากขึ้น"
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:2015
 msgid "Minimum"
-msgstr ""
+msgstr "ขั้นต่ำ"
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:2017
 msgid "Maximum"
-msgstr ""
+msgstr "สูงสุด"
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2068
 msgid "Saving document..."
-msgstr ""
+msgstr "กำลังบันทึกเอกสาร..."
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2242
 #, 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..c5e50d1 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,515 +1,531 @@
 # Turkish translation for simple-scan
 # Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
 # This file is distributed under the same license as the simple-scan package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
+# Emin Tufan Çetin <etcetin@gmail.com>, 2017.
+# Muhammet Kara <muhammetk@gmail.com>, 2017.
 #
 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"
-"Language-Team: Turkish <tr@li.org>\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
+"product=simple-scan&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-08-07 02:27+0000\n"
+"PO-Revision-Date: 2017-08-13 15:04+0300\n"
+"Last-Translator: Muhammet Kara <muhammetk@gmail.com>\n"
+"Language-Team: Turkish <gnometurk@gnome.org>\n"
+"Language: tr\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-25 06:10+0000\n"
+"X-Generator: Gtranslator 2.91.7\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#. Button to submit authorization dialog
-#: data/simple-scan.ui:24
-msgid "_Authorize"
-msgstr "_Yetkilendir"
+#: data/org.gnome.SimpleScan.gschema.xml:11
+msgid "Device to scan from"
+msgstr "Tarama yapılacak aygıt"
 
-#. Label beside username entry
-#: data/simple-scan.ui:102
-msgid "_Username for resource:"
-msgstr "Kaynak için _kullanıcı adı:"
+#: data/org.gnome.SimpleScan.gschema.xml:12
+msgid "SANE device to acquire images from."
+msgstr "Görüntülerin alınacağı SANE aygıtı"
 
-#. Label beside password entry
-#: data/simple-scan.ui:117
-msgid "_Password:"
-msgstr "_Parola:"
+#: data/org.gnome.SimpleScan.gschema.xml:20
+msgid "Type of document being scanned"
+msgstr "Taranacak belgenin türü"
+
+#: data/org.gnome.SimpleScan.gschema.xml:21
+msgid ""
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+msgstr ""
+"Taranacak belgenin türü. Bu ayar tarama niteliği, renkler ve rötuşa göre "
+"belirlenir."
 
-#. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
-msgid "Front and Back"
-msgstr "Ön ve Arka taraf"
+#: data/org.gnome.SimpleScan.gschema.xml:25
+msgid "Width of paper in tenths of a mm"
+msgstr "Ondabirlik mm türünden kağıdın genişliği"
 
-#. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
-msgid "Front"
-msgstr "Ön taraf"
+#: data/org.gnome.SimpleScan.gschema.xml:26
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"Ondabirlik mm türünden kağıdın genişliği (ya da kendiliğinden kağıt sezimi "
+"için 0)."
 
-#. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
-msgid "Back"
-msgstr "Arka taraf"
+#: data/org.gnome.SimpleScan.gschema.xml:30
+msgid "Height of paper in tenths of a mm"
+msgstr "Ondabirlik mm türünden kağıdın yüksekliği"
+
+#: data/org.gnome.SimpleScan.gschema.xml:31
+msgid ""
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"Ondabirlik mm türünden kağıdın yüksekliği (ya da kendiliğinden kağıt sezimi "
+"için 0)."
+
+#: data/org.gnome.SimpleScan.gschema.xml:35
+msgid "Brightness of scan"
+msgstr "Tarama parlaklığı"
+
+#: data/org.gnome.SimpleScan.gschema.xml:36
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr "-100ʼden 100ʼe (0 hiçbiri) parlaklık ayarlaması."
+
+#: data/org.gnome.SimpleScan.gschema.xml:40
+msgid "Contrast of scan"
+msgstr "Tarama karşıtlığı"
+
+#: data/org.gnome.SimpleScan.gschema.xml:41
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr "-100ʼden 100ʼe (0 hiçbiri) karşıtlık ayarlaması"
+
+#: data/org.gnome.SimpleScan.gschema.xml:45
+msgid "Resolution for text scans"
+msgstr "Metin taramaları için çözünürlük"
+
+#: data/org.gnome.SimpleScan.gschema.xml:46
+msgid "The resolution in dots-per-inch to use when scanning text."
+msgstr ""
+"Metin tararken kullanılacak inç başına nokta sayısı türünden çözünürlük."
+
+#: data/org.gnome.SimpleScan.gschema.xml:50
+msgid "Resolution for photo scans"
+msgstr "Fotoğraf taramaları için çözünürlük"
+
+#: data/org.gnome.SimpleScan.gschema.xml:51
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr ""
+"Fotoğrafları tararken kullanılacak inç başına nokta sayısı türünden "
+"çözünürlük."
+
+#: data/org.gnome.SimpleScan.gschema.xml:55
+msgid "Page side to scan"
+msgstr "Taranacak sayfa yüzü"
+
+#: data/org.gnome.SimpleScan.gschema.xml:56
+msgid "The page side to scan."
+msgstr "Taranacak sayfa yüzü."
+
+#: data/org.gnome.SimpleScan.gschema.xml:60
+msgid "Directory to save files to"
+msgstr "Dosyaların kaydedileceği dizin"
+
+#: data/org.gnome.SimpleScan.gschema.xml:61
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+"Dosyaların kaydedileceği dizin. Ayarlanmadıysa, belgeler dizini "
+"varsayılandır."
+
+#: data/org.gnome.SimpleScan.gschema.xml:66
+msgid "Quality value to use for JPEG compression"
+msgstr "JPEG sıkıştırması için kalite değeri"
+
+#: data/org.gnome.SimpleScan.gschema.xml:67
+msgid "Quality value to use for JPEG compression."
+msgstr "JPEG sıkıştırması için kalite değeri"
+
+#: data/org.gnome.SimpleScan.gschema.xml:72
+msgid "Delay in millisecond between pages"
+msgstr "Sayfalar arasındaki gecikmenin milisaniye türünden değeri"
+
+#: data/org.gnome.SimpleScan.gschema.xml:73
+msgid "Delay in millisecond between pages."
+msgstr "Sayfalar arasındaki gecikmenin milisaniye türünden değeri."
 
 #. 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
+#. Set HeaderBar title here because Glade doesn't keep it translated
+#. https://bugzilla.gnome.org/show_bug.cgi?id=782753
+#. Title of scan window
+#: data/simple-scan.appdata.xml.in:6 data/simple-scan.desktop.in:3
+#: src/app-window.ui:76 src/app-window.vala:1560
 msgid "Simple Scan"
 msgstr "Basit Tarama"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
-msgid "_Document"
-msgstr "_Belge"
+#: data/simple-scan.appdata.xml.in:7 data/simple-scan.desktop.in:5
+msgid "Scan Documents"
+msgstr "Belgeleri Tara"
 
-#. Scan menu item
-#: data/simple-scan.ui:260
-msgid "Sc_an"
-msgstr "T_ara"
+#: 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 "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+"Hem belge hem fotoğraf taramanın çok kolay bir yolu. Bir fotoğrafın kötü "
+"tarafını kırpabilir ve eğer yanlış yönde ise onu döndürebilirsiniz. "
+"Taramalarınızı yazdırabilir, pdfʼye aktarabilir veya resim biçimlerinde "
+"kaydedebilirsiniz."
+
+#: data/simple-scan.appdata.xml.in:14
+msgid "Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+"Basit Tarama mevcut birçok tarayıcı desteği için SANE altyapısını kullanır."
+
+#: data/simple-scan.desktop.in:4
+msgid "Document Scanner"
+msgstr "Belge Tarayıcı"
 
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: data/simple-scan.desktop.in:7
+msgid "scan;scanner;flatbed;adf;"
+msgstr "tara;tarayıcı;flatbed;düz yatak;adf;"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: data/simple-scan.desktop.in:10
+msgid "scanner"
+msgstr "scanner"
+
+#. Toolbar scan menu item to scan a single page from the scanner
 #. 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/app-window.ui:22 src/app-window.ui:123 src/app-window.ui:820
 msgid "Single _Page"
-msgstr "_Tek Sayfa"
+msgstr "Tek _Sayfa"
 
+#. Toolbar scan menu item to scan all pages from a document feeder
 #. 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/app-window.ui:31 src/app-window.ui:133 src/app-window.ui:829
 msgid "All Pages From _Feeder"
-msgstr "Kaynaktaki Tüm _Sayfalar"
+msgstr "_Kaynaktaki Tüm Sayfalar"
 
-#. Menu entry to stop current scan
-#: data/simple-scan.ui:294
-msgid "_Stop Scan"
-msgstr "_Taramayı Durdur"
+#. Toolbar scan menu item to scan continuously from the flatbed
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/app-window.ui:40 src/app-window.ui:143 src/app-window.ui:838
+msgid "_Multiple Pages From Flatbed"
+msgstr "Düz Yataktan _Çoklu Sayfa"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:853
 msgid "Text"
 msgstr "Metin"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:863
 msgid "Photo"
 msgstr "Fotoğraf"
 
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: src/app-window.ui:91
+msgid "_Document"
+msgstr "_Belge"
+
+#. Scan menu item
+#: src/app-window.ui:110
+msgid "Sc_an"
+msgstr "T_ara"
+
+#. Menu entry to stop current scan
+#: src/app-window.ui:154
+msgid "_Stop Scan"
+msgstr "_Taramayı Durdur"
+
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/app-window.ui:196 src/app-window.vala:967 src/app-window.vala:1590
 msgid "Reorder Pages"
 msgstr "Sayfaları Yeniden Sırala"
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/app-window.ui:215
 msgid "_Email"
 msgstr "_E-posta"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/app-window.ui:280
 msgid "_Page"
 msgstr "_Sayfa"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/app-window.ui:290
 msgid "Rotate _Left"
 msgstr "_Sola Döndür"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/app-window.ui:300
 msgid "Rotate _Right"
-msgstr "Sa_ğa Çevir"
+msgstr "Sa_ğa Döndür"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/app-window.ui:310
 msgid "_Crop"
 msgstr "_Kırp"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/app-window.ui:320
 msgid "_None"
 msgstr "_Hiçbiri"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/app-window.ui:331
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/app-window.ui:342
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/app-window.ui:353
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/app-window.ui:364
 msgid "_Letter"
 msgstr "_Harf"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/app-window.ui:375
 msgid "Le_gal"
 msgstr "Ya_sal"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/app-window.ui:386
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/app-window.ui:397
 msgid "_Custom"
 msgstr "_Özel"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/app-window.ui:415
 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/app-window.ui:428
 msgid "Move Left"
 msgstr "Sola Taşı"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/app-window.ui:437
 msgid "Move Right"
 msgstr "Sağa Taşı"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/app-window.ui:474
 msgid "_Help"
 msgstr "_Yardım"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/app-window.ui:482
 msgid "_Contents"
 msgstr "_İçindekiler"
 
-#. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
-msgid "Start a new document"
-msgstr "Yeni bir belge başlat"
-
-#: data/simple-scan.ui:675
-msgid "New"
-msgstr "Yeni"
-
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/app-window.ui:520 src/app-window.ui:720
 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/app-window.ui:522 src/app-window.ui:716
 msgid "Scan"
 msgstr "Tara"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/app-window.ui:538 src/app-window.ui:787
 msgid "Save document to a file"
 msgstr "Belgeyi bir dosyaya kaydet"
 
-#: ../src/ui.vala:1842
+#: src/app-window.ui:540
 msgid "Save"
 msgstr "Kaydet"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/app-window.ui:555 src/app-window.ui:700
 msgid "Stop the current scan"
 msgstr "Geçerli taramayı durdur"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/app-window.ui:556 src/app-window.ui:697
 msgid "Stop"
 msgstr "Durdur"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "Sayfayı sola döndür (saat yönünün tersine)"
-
-#. Label on rotate page left (anti-clockwise) item
-#: data/simple-scan.ui:750
-msgid "Rotate Left"
-msgstr "Sola Döndür"
+#. Label shown when searching for scanners
+#: src/app-window.ui:611
+msgid "Searching for Scanners…"
+msgstr "Tarayıcılar aranıyor…"
 
-#. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
-msgid "Rotate the page to the right (clockwise)"
-msgstr "Sayfayı sağa döndür (saat yönünde)"
-
-#. Label on rotate page right (clockwise) item
-#: data/simple-scan.ui:765
-msgid "Rotate Right"
-msgstr "Sağa Döndür"
-
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
-msgid "Crop the selected page"
-msgstr "Seçili sayfayı kırp"
-
-#: data/simple-scan.ui:781
-msgid "Crop"
-msgstr "Kırp"
-
-#: ../src/ui.vala:1849
-msgid "Preferences"
-msgstr "Tercihler"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1048
-msgid "Scan S_ource:"
-msgstr "Ta_rama Kaynağı:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1079
-msgid "_Text Resolution:"
-msgstr "_Metin Çözünürlüğü:"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1095
-msgid "_Photo Resolution:"
-msgstr "_Fotoğraf Çözünürlüğü:"
-
-#. Label beside scan side combo box
-#: data/simple-scan.ui:1139
-msgid "Scan Side:"
-msgstr "Taranacak taraf:"
-
-#. Label beside page size combo box
-#: data/simple-scan.ui:1169
-msgid "Page Size:"
-msgstr "Sayfa Boyutu:"
-
-#. Label beside brightness scale
-#: data/simple-scan.ui:1199
-msgid "Brightness:"
-msgstr "Parlaklık:"
-
-#. Label beside contrast scale
-#: data/simple-scan.ui:1229
-msgid "Contrast:"
-msgstr "Karşıtlık:"
-
-#. Label beside quality scale
-#: data/simple-scan.ui:1260
-msgid "Quality:"
-msgstr "Kalite:"
-
-#: data/simple-scan.desktop.in:4
-msgid "Document Scanner"
-msgstr "Belge Tarayıcı"
-
-#: data/simple-scan.desktop.in:5
-msgid "Scan Documents"
-msgstr "Belgeleri Tara"
+#: src/app-window.vala:237 src/app-window.vala:1380
+msgid "_Close"
+msgstr "_Kapat"
 
-#: data/simple-scan.desktop.in:6
-msgid "scan;scanner;flatbed;adf;"
-msgstr "tara;tarayıcı;flatbed;adf;"
+#. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
+#: src/app-window.vala:246
+#, c-format
+msgid "Username and password required to access “%s”"
+msgstr "“%s” kaynağına erişmek için kullanıcı adı ve parola gerekiyor"
 
-#: data/simple-scan.desktop.in:8
-msgid "scanner"
-msgstr ""
+#. Label shown when detected a scanner
+#: src/app-window.vala:266 src/app-window.vala:584
+msgid "Ready to Scan"
+msgstr "Taramaya hazır"
 
-#: data/simple-scan.appdata.xml.in:8
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: src/app-window.vala:273
+msgid "Additional software needed"
+msgstr "Ek yazılım gerekiyor"
 
-#: data/simple-scan.appdata.xml.in:13
+#. Instructions to install driver software
+#: src/app-window.vala:275
 msgid ""
-"Simple Scan uses the SANE framework to support most existing scanners."
+"You need to <a href=\"install-firmware\">install driver software</a> for "
+"your scanner."
 msgstr ""
-"Basit Tarayıcı mevcut bir çok tarayıcı desteği için SANE altyapısını "
-"kullanır."
-
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
-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
-msgid "Unable to connect to scanner"
-msgstr "Tarayıcıya bağlanılamadı"
-
-#. Error display when unable to start scan
-#: ../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
-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
-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
-msgid "Print debugging messages"
-msgstr "Hata ayıklama iletilerini yazdır"
-
-#: ../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
-msgid "Failed to scan"
-msgstr "Tarama başarısız oldu"
-
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
-msgid "[DEVICE...] - Scanning utility"
-msgstr "[AYGIT...] - Tarama uygulaması"
-
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
-#, 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
-msgid "_Close"
-msgstr "_Kapat"
-
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../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"
+"Tarayıcınız için <a href=\"install-firmware\">sürücü yazılımını kurmanız</a> "
+"gerekir."
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/app-window.vala:281
 msgid "No scanners detected"
 msgstr "Tarayıcı bulunamadı"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/app-window.vala:283
 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
-msgid "Additional software needed"
-msgstr "Ek yazılıma ihtiyaç var"
-
-#. Instructions to install driver software
-#: ../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
-msgid "Save As..."
-msgstr "Farklı Kaydet..."
+#: src/app-window.vala:298
+msgid "Save As…"
+msgstr "Farklı Kaydet…"
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/app-window.vala:301 src/app-window.vala:471 src/app-window.vala:552
 msgid "_Cancel"
 msgstr "_Vazgeç"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/app-window.vala:302 src/app-window.vala:553
 msgid "_Save"
 msgstr "_Kaydet"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/app-window.vala:310
 msgid "Scanned Document.pdf"
 msgstr "Taranan Belge.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#. Save dialog: Filter name to show only supported image files
+#: src/app-window.vala:316
 msgid "Image Files"
 msgstr "Resim Dosyaları"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/app-window.vala:326
 msgid "All Files"
 msgstr "Tüm Dosyalar"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/app-window.vala:335
 msgid "PDF (multi-page document)"
 msgstr "PDF (çok sayfalı belge)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/app-window.vala:341
 msgid "JPEG (compressed)"
 msgstr "JPEG (sıkıştırılmış)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/app-window.vala:347
 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
+#. Save dialog: Label for sabing in WEBP format
+#: src/app-window.vala:354
+msgid "WebP (compressed)"
+msgstr "WebP (sıkıştırılmış)"
+
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
+#: src/app-window.vala:364
 msgid "File format:"
 msgstr "Dosya biçimi:"
 
+#. Label in save dialog beside compression slider
+#: src/app-window.vala:376
+msgid "Compression:"
+msgstr "Sıkıştırma:"
+
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/app-window.vala:470
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr "“%s” adında bir dosya zaten var.  Değiştirmek ister misiniz?"
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/app-window.vala:473
+msgid "_Replace"
+msgstr "_Değiştir"
+
+#: src/app-window.vala:512
+msgid "Saving"
+msgstr "Kaydediliyor"
+
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/app-window.vala:527
 msgid "Failed to save file"
 msgstr "Dosya kaydedilemedi"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
-msgid "If you don't save, changes will be permanently lost."
-msgstr "Eğer kaydetmezseniz, değişiklikler tamamen kaybedilecek."
+#: src/app-window.vala:550
+msgid "If you don’t save, changes will be permanently lost."
+msgstr "Eğer kaydetmezseniz, değişiklikler kalıcı olarak kaybedilecek."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:708
+#: src/app-window.vala:591
 msgid "Save current document?"
-msgstr "Mevcut belgeyi kaydet?"
+msgstr "Geçerli belgeyi kaydet?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/app-window.vala:593
 msgid "Discard Changes"
 msgstr "Değişiklikleri Geri Al"
 
+#. Label shown when scan started
+#: src/app-window.vala:692
+msgid "Contacting scanner…"
+msgstr "Tarayıcıyla iletişim kuruluyor…"
+
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/app-window.vala:800
 msgid "Unable to save image for preview"
-msgstr "Görüntü, önizleme için kaydedilemiyor"
+msgstr "Görüntü, ön izleme için kaydedilemiyor"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/app-window.vala:812
 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/app-window.vala:990
 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/app-window.vala:1000
 msgid "Combine sides (reverse)"
 msgstr "Yüzleri birleştir (ters)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/app-window.vala:1010
 msgid "Reverse"
 msgstr "Tersine çevir"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/app-window.vala:1020
 msgid "Keep unchanged"
 msgstr "Değiştirmeden bırak"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/app-window.vala:1250
 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/app-window.vala:1271
 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"
@@ -531,23 +547,23 @@ msgstr ""
 "Bu program HERHANGİ GARANTİSİ OLMAKSIZIN; hatta TİCARETE UYGUNLUK veya BELLİ "
 "BİR AMACA UYGUNLUK garantisi bile olmaksızın, kullanışlı olması umularak "
 "dağıtıldı.\n"
-"Daha fazla bilgi için GNU Genel Kamu Lisansı'na bakın.\n"
+"Daha fazla bilgi için GNU Genel Kamu Lisansıʼna bakın.\n"
 "\n"
-"Bu program ile birlikte GNU Genel Kamu Lisansı'nın bir kopyasını almış "
+"Bu program ile birlikte GNU Genel Kamu Lisansıʼnın bir kopyasını almış "
 "olmalısınız.\n"
 "Eğer almadıysanız bile şuraya bakınız: <http://www.gnu.org/licenses/>"
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/app-window.vala:1274
 msgid "About Simple Scan"
 msgstr "Basit Tarama Hakkında"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/app-window.vala:1277
 msgid "Simple document scanning tool"
 msgstr "Basit bir belge tarama aracı"
 
-#: ../src/ui.vala:1487
+#: src/app-window.vala:1286
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -570,206 +586,520 @@ msgstr ""
 "  kulkke https://launchpad.net/~kulkke\n"
 "  mandza https://launchpad.net/~filmovi\n"
 "  ubuntuki https://launchpad.net/~aleverzurumlu\n"
-"  İbrahim Çelik https://launchpad.net/~ibrahimcelik89"
+"  İbrahim Çelik https://launchpad.net/~ibrahimcelik89\n"
+"\n"
+"GNOME Türkiye Çeviri Takımı:\n"
+"  Emin Tufan Çetin <etcetin@gmail.com>"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/app-window.vala:1308
 msgid "Save document before quitting?"
 msgstr "Çıkmadan önce belgeyi kaydet?"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:1310
 msgid "Quit without Saving"
 msgstr "Kaydetmeden Çık"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/app-window.vala:1357
 msgid "You appear to have a Brother scanner."
-msgstr "Bir Brother tarayıcıya sahip olduğunuz görünüyor."
+msgstr "Bir Brother tarayıcınız olduğu görünüyor."
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/app-window.vala:1359
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.brother.com\">Brother website</a>."
+"Drivers for this are available on the <a href=\"http://support.brother.com"
+"\">Brother website</a>."
 msgstr ""
-"Bunun sürücüleri <a href=\"http://support.brother.com\">Brother "
-"websitesinde</a> mevcuttur."
+"Bunun sürücüleri <a href=\"http://support.brother.com\">Brother web "
+"sitesinde</a> bulunabilir."
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/app-window.vala:1363
 msgid "You appear to have a Samsung scanner."
-msgstr "Bir Samsung tarayıcıya sahip olduğunuz görünüyor."
+msgstr "Bir Samsung tarayıcınız olduğu görünüyor."
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/app-window.vala:1365
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://samsung.com/support\">Samsung website</a>."
+"Drivers for this are available on the <a href=\"http://samsung.com/support"
+"\">Samsung website</a>."
 msgstr ""
-"Bunun sürücüleri <a href=\"http://samsung.com/support\">Samsung "
-"websitesinde</a> mevcuttur."
+"Bunun sürücüleri <a href=\"http://samsung.com/support\">Samsung web "
+"sitesinde</a> bulunabilir."
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/app-window.vala:1369
 msgid "You appear to have an HP scanner."
-msgstr "Bir HP tarayıcıya sahip olduğunuz görünüyor."
+msgstr "Bir HP tarayıcınız olduğu görünüyor."
 
 #. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/app-window.vala:1374
 msgid "You appear to have an Epson scanner."
-msgstr "Bir Epson tarayıcıya sahip olduğunuz görünüyor."
+msgstr "Bir Epson tarayıcınız olduğu görünüyor."
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/app-window.vala:1376
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.epson.com\">Epson website</a>."
+"Drivers for this are available on the <a href=\"http://support.epson.com"
+"\">Epson website</a>."
 msgstr ""
-"Bunun sürücüleri <a href=\"http://samsung.com/support\">Epson "
-"websitesinde</a> mevcuttur."
+"Bunun sürücüleri <a href=\"http://samsung.com/support\">Epson web sitesinde</"
+"a> bulunabilir."
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/app-window.vala:1380
 msgid "Install drivers"
 msgstr "Sürücüleri kur"
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/app-window.vala:1411
 msgid "Once installed you will need to restart Simple Scan."
-msgstr "Yükledikten sonra Basit Tarama'yı yeniden başlatmanız gerekiyor."
+msgstr "Yükledikten sonra Basit Taramaʼyı yeniden başlatmanız gerekiyor."
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
-msgid "Installing drivers..."
-msgstr "Sürücüler kuruluyor..."
+#: src/app-window.vala:1423
+msgid "Installing drivers…"
+msgstr "Sürücüler kuruluyor…"
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/app-window.vala:1431
 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/app-window.vala:1441
 #, c-format
 msgid "Failed to install drivers (error code %d)."
-msgstr "Sürücülerin kurulumu başarısız oldu (error code %d)."
+msgstr "Sürücülerin kurulumu başarısız oldu (hata kodu %d)."
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/app-window.vala:1447
 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/app-window.vala:1454
 #, c-format
-msgid "You need to install the %s package(s)."
-msgstr "%s paket kurulmasına ihtiyacınız var."
+msgid "You need to install the %s package."
+msgid_plural "You need to install the %s packages."
+msgstr[0] "%s paket kurmanız gerekiyor."
+
+#. Title of preferences dialog
+#: src/app-window.vala:1568 src/app-window.vala:1591
+#: src/preferences-dialog.ui:53
+msgid "Preferences"
+msgstr "Tercihler"
+
+#: src/app-window.vala:1572
+msgid "Keyboard Shortcuts"
+msgstr "Klavye Kısayolları"
+
+#: src/app-window.vala:1573
+msgid "Help"
+msgstr "Yardım"
+
+#: src/app-window.vala:1574
+msgid "About"
+msgstr "Hakkında"
+
+#: src/app-window.vala:1575
+msgid "Quit"
+msgstr "Çık"
+
+#: src/app-window.vala:1589
+msgid "Email"
+msgstr "E-posta"
+
+#. Populate ActionBar (not supported in Glade)
+#. https://bugzilla.gnome.org/show_bug.cgi?id=769966
+#. Label on new document button
+#: src/app-window.vala:1599
+msgid "Start Again…"
+msgstr "Yeniden Başlat…"
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: src/app-window.vala:1616
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Sayfayı sola döndür (saat yönünün tersine)"
+
+#. Tooltip for rotate right (clockwise) button
+#: src/app-window.vala:1623
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Sayfayı sağa döndür (saat yönünde)"
+
+#. Tooltip for crop button
+#: src/app-window.vala:1633
+msgid "Crop the selected page"
+msgstr "Seçili sayfayı kırp"
+
+#. Tooltip for delete button
+#: src/app-window.vala:1649
+msgid "Delete the selected page"
+msgstr "Seçili sayfayı sil"
+
+#. Text of button for cancelling save
+#: src/app-window.vala:1814
+msgid "Cancel"
+msgstr "Vazgeç"
+
+#. Button to submit authorization dialog
+#: src/authorize-dialog.ui:25
+msgid "_Authorize"
+msgstr "_Yetkilendir"
+
+#. Label beside username entry
+#: src/authorize-dialog.ui:99
+msgid "_Username for resource:"
+msgstr "Kaynak için _kullanıcı adı:"
+
+#. Label beside password entry
+#: src/authorize-dialog.ui:112
+msgid "_Password:"
+msgstr "_Parola:"
+
+#: src/book.vala:331 src/book.vala:337
+#, c-format
+msgid "Unable to encode page %i"
+msgstr "%i. sayfa kodlanamıyor"
+
+#: src/help-overlay.ui:12
+msgctxt "shortcut window"
+msgid "Scanning"
+msgstr "Tarama"
+
+#: src/help-overlay.ui:17
+msgctxt "shortcut window"
+msgid "Scan a single page"
+msgstr "Tek bir sayfa tara"
+
+#: src/help-overlay.ui:24
+msgctxt "shortcut window"
+msgid "Scan all pages from document feeder"
+msgstr "Belge besleyicisinden tüm sayfaları tara"
+
+#: src/help-overlay.ui:31
+msgctxt "shortcut window"
+msgid "Scan continuously from a flatbed scanner"
+msgstr "Düz yatak tarayıcıdan sürekli tara"
+
+#: src/help-overlay.ui:38
+msgctxt "shortcut window"
+msgid "Stop scan in progress"
+msgstr "Süren taramayı durdur"
+
+#: src/help-overlay.ui:46
+msgctxt "shortcut window"
+msgid "Document Modification"
+msgstr "Belge Değiştirme"
+
+#: src/help-overlay.ui:51
+msgctxt "shortcut window"
+msgid "Move page left"
+msgstr "Sayfayı sola taşı"
+
+#: src/help-overlay.ui:58
+msgctxt "shortcut window"
+msgid "Move page right"
+msgstr "Sayfayı sağa taşı"
+
+#: src/help-overlay.ui:65
+msgctxt "shortcut window"
+msgid "Rotate page to the left (anti-clockwise)"
+msgstr "Sayfayı sola döndür (saat yönünün tersine)"
+
+#: src/help-overlay.ui:72
+msgctxt "shortcut window"
+msgid "Rotate page to the right (clockwise)"
+msgstr "Sayfayı sağa döndür (saat yönünde)"
+
+#: src/help-overlay.ui:79
+msgctxt "shortcut window"
+msgid "Delete page"
+msgstr "Sayfayı sil"
+
+#: src/help-overlay.ui:87
+msgctxt "shortcut window"
+msgid "Document Management"
+msgstr "Belge Yönetimi"
+
+#: src/help-overlay.ui:92
+msgctxt "shortcut window"
+msgid "Start new document"
+msgstr "Yeni belge başlat"
+
+#: src/help-overlay.ui:99
+msgctxt "shortcut window"
+msgid "Save scanned document"
+msgstr "Taranmış belgeyi kaydet"
+
+#: src/help-overlay.ui:106
+msgctxt "shortcut window"
+msgid "Email scanned document"
+msgstr "Taranmış belgeyi e-postala"
+
+#: src/help-overlay.ui:113
+msgctxt "shortcut window"
+msgid "Print scanned document"
+msgstr "Taranmış belgeyi yazdır"
+
+#: src/help-overlay.ui:120
+msgctxt "shortcut window"
+msgid "Copy current page to clipboard"
+msgstr "Geçerli sayfayı panoya kopyala"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:113
+msgid "_Scanner"
+msgstr "_Tarayıcı"
+
+#. Label beside scan side combo box
+#: src/preferences-dialog.ui:143
+msgid "Scan Sides"
+msgstr "Tarama Yüzleri"
+
+#. Label beside page size combo box
+#: src/preferences-dialog.ui:160
+msgid "Page Size"
+msgstr "Sayfa Boyutu"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:191
+msgid "Front"
+msgstr "Ön"
+
+#. Preferences Dialog: Toggle button to select scanning on the back side of a page
+#: src/preferences-dialog.ui:206
+msgid "Back"
+msgstr "Arka"
+
+#. Preferences Dialog: Toggle button to select scanning on both sides of a page
+#: src/preferences-dialog.ui:221
+msgid "Both"
+msgstr "Her İkisi"
+
+#. Label beside page delay scale
+#: src/preferences-dialog.ui:260
+msgid "Delay"
+msgstr "Gecikme"
+
+#. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
+#: src/preferences-dialog.ui:276
+#| msgid "Multiple page from flatbed"
+msgid "Multiple pages from flatbed"
+msgstr "Düz yataktan çoklu sayfa"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:295
+msgid "3"
+msgstr "3"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:310
+msgid "5"
+msgstr "5"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:326
+msgid "7"
+msgstr "7"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:342
+msgid "10"
+msgstr "10"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:358
+msgid "15"
+msgstr "15"
+
+#. Label after page delay radio buttons
+#: src/preferences-dialog.ui:385
+msgid "Seconds"
+msgstr "Saniye"
+
+#. Preferences Dialog: Tab label for scanning settings
+#: src/preferences-dialog.ui:413
+msgid "Scanning"
+msgstr "Tarama"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:436
+msgid "_Text Resolution"
+msgstr "_Metin Çözünürlüğü"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:452
+msgid "_Photo Resolution"
+msgstr "_Fotoğraf Çözünürlüğü"
+
+#. Label beside brightness scale
+#: src/preferences-dialog.ui:505
+msgid "Brightness"
+msgstr "Parlaklık"
+
+#. Label beside contrast scale
+#: src/preferences-dialog.ui:521
+msgid "Contrast"
+msgstr "Karşıtlık"
+
+#. Preferences Dialog: Tab for quality settings
+#: src/preferences-dialog.ui:576
+msgid "Quality"
+msgstr "Nitelik"
+
+#. Combo box value for automatic paper size
+#: src/preferences-dialog.vala:77
+msgid "Automatic"
+msgstr "Kendiliğinden"
+
+#: src/preferences-dialog.vala:116
+msgid "Darker"
+msgstr "Daha koyu"
+
+#: src/preferences-dialog.vala:118
+msgid "Lighter"
+msgstr "Daha açık"
+
+#: src/preferences-dialog.vala:126
+msgid "Less"
+msgstr "Daha az"
+
+#: src/preferences-dialog.vala:128
+msgid "More"
+msgstr "Daha çok"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/preferences-dialog.vala:440
 #, c-format
 msgid "%d dpi (default)"
-msgstr "%d dpi (varsayılan)"
+msgstr "%d dpi (öntanımlı)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/preferences-dialog.vala:443
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (taslak)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/preferences-dialog.vala:446
 #, 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/preferences-dialog.vala:449
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1835
-msgid "New Document"
-msgstr "Yeni Belge"
+#. Error displayed when no scanners to scan with
+#: src/scanner.vala:844
+msgid "No scanners available.  Please connect a scanner."
+msgstr "Kullanılabilir tarayıcı yok. Lütfen bir tarayıcı bağlayın."
 
-#: ../src/ui.vala:1840
-msgid "Document"
-msgstr "Belge"
+#. Error displayed when cannot connect to scanner
+#: src/scanner.vala:874
+msgid "Unable to connect to scanner"
+msgstr "Tarayıcıya bağlanılamadı"
 
-#: ../src/ui.vala:1844
-msgid "Email..."
-msgstr "E-Posta..."
+#. Error display when unable to start scan
+#: src/scanner.vala:1227
+msgid "Unable to start scan"
+msgstr "Tarama başlatılamadı"
 
-#: ../src/ui.vala:1845
-msgid "Print..."
-msgstr "Yazdır..."
+#. Error displayed when communication with scanner broken
+#: src/scanner.vala:1240 src/scanner.vala:1340
+msgid "Error communicating with scanner"
+msgstr "Tarayıcı ile iletişim kurulamıyor"
 
-#: ../src/ui.vala:1853
-msgid "Help"
-msgstr "Yardım"
+#. Help string for command line --version flag
+#: src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "Dağıtım sürümünü göster"
 
-#: ../src/ui.vala:1854
-msgid "About"
-msgstr "Hakkında"
+#. Help string for command line --debug flag
+#: src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Hata ayıklama iletilerini yazdır"
 
-#: ../src/ui.vala:1855
-msgid "Quit"
-msgstr "Çık"
+#: 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"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
-msgid "Change _Scanner"
-msgstr "_Tarayıcı Değiştir"
+#. Title of error dialog when scan failed
+#: src/simple-scan.vala:392
+msgid "Failed to scan"
+msgstr "Tarama başarısız oldu"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
-msgid "_Install Drivers"
-msgstr "Sürücüleri _Kur"
+#. Attempt to inhibit the screensaver when scanning
+#: src/simple-scan.vala:407
+msgid "Scan in progress"
+msgstr "Tarama sürüyor"
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
-msgid "Automatic"
-msgstr "Otomatik"
+#. Arguments and description for --help text
+#: src/simple-scan.vala:584
+msgid "[DEVICE…] — Scanning utility"
+msgstr "[AYGIT…] — Tarama uygulaması"
 
-#: ../src/ui.vala:1947
-msgid "Darker"
-msgstr "Daha Koyu"
+#. Text printed out when an unknown command-line argument provided
+#: src/simple-scan.vala:595
+#, 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:1949
-msgid "Lighter"
-msgstr "Daha Açık"
+#~ msgid "Saving document…"
+#~ msgstr "Belge kaydediliyor…"
 
-#: ../src/ui.vala:1957
-msgid "Less"
-msgstr "Daha Az"
+#~ msgid "Saving page %d out of %d"
+#~ msgstr "Kaydedilen sayfa: %d / %d"
 
-#: ../src/ui.vala:1959
-msgid "More"
-msgstr "Daha Fazla"
+#~ msgid "Front and Back"
+#~ msgstr "Ön ve Arka taraf"
 
-#: ../src/ui.vala:1967
-msgid "Minimum"
-msgstr "En Az"
+#~ msgid "New"
+#~ msgstr "Yeni"
 
-#: ../src/ui.vala:1969
-msgid "Maximum"
-msgstr "En Çok"
+#~ msgid "Rotate Left"
+#~ msgstr "Sola Döndür"
 
-#: ../src/ui.vala:2008
-msgid "Saving document..."
-msgstr "Belge kaydediliyor..."
+#~ msgid "Rotate Right"
+#~ msgstr "Sağa Döndür"
 
-#: ../src/ui.vala:2173
-#, c-format
-msgid "Saving page %d out of %d"
-msgstr "Kaydedilen sayfa: %d / %d"
+#~ msgid "Crop"
+#~ msgstr "Kırp"
+
+#~ msgid "Scan S_ource:"
+#~ msgstr "Ta_rama Kaynağı:"
+
+#~ msgid "New Document"
+#~ msgstr "Yeni Belge"
+
+#~ msgid "Document"
+#~ msgstr "Belge"
+
+#~ msgid "Email..."
+#~ msgstr "E-Posta..."
+
+#~ msgid "Print..."
+#~ msgstr "Yazdır..."
+
+#~ msgid "_Install Drivers"
+#~ msgstr "Sürücüleri _Kur"
+
+#~ msgid "Minimum"
+#~ msgstr "En Az"
+
+#~ msgid "Maximum"
+#~ msgstr "En Çok"
 
 #~ msgid "4&#xD7;6"
 #~ msgstr "4&#xD7;6"
 
-#, c-format
 #~ msgid ""
 #~ "Usage:\n"
 #~ "  %s [DEVICE...] - Scanning utility"
@@ -777,7 +1107,6 @@ msgstr "Kaydedilen sayfa: %d / %d"
 #~ "Usage:\n"
 #~ "  %s [AYGIT...] - Tarama aracı"
 
-#, c-format
 #~ msgid ""
 #~ "GTK+ Options:\n"
 #~ "  --class=CLASS                   Program class as used by the window "
@@ -790,10 +1119,10 @@ msgstr "Kaydedilen sayfa: %d / %d"
 #~ "  --g-fatal-warnings              Make all warnings fatal"
 #~ msgstr ""
 #~ "GTK+ Seçenekleri: \n"
-#~ "  --class=SINIF                   Pencere yöneticisi tarafından kullanılan "
-#~ "program sınıfı\n"
-#~ "  --name=İSİM                     Pencere yöneticisi tarafından kullanılacak "
-#~ "program ismi\n"
+#~ "  --class=SINIF                   Pencere yöneticisi tarafından "
+#~ "kullanılan program sınıfı\n"
+#~ "  --name=İSİM                     Pencere yöneticisi tarafından "
+#~ "kullanılacak program ismi\n"
 #~ " --screen=EKRAN                  Kullanılacak X ekranı\n"
 #~ "  --sync                          X çağrılarını eş zamanlı yapar\n"
 #~ " --gtk-module=MODULLER          Tüm ek GTK+ modullerini yükler\n"
@@ -814,7 +1143,6 @@ msgstr "Kaydedilen sayfa: %d / %d"
 #~ msgid "Window width in pixels"
 #~ msgstr "Pencerenin piksel cinsinden genişliği"
 
-#, c-format
 #~ msgid ""
 #~ "Help Options:\n"
 #~ "  -d, --debug                     Print debugging messages\n"
@@ -830,30 +1158,19 @@ msgstr "Kaydedilen sayfa: %d / %d"
 #~ "  -help-all Tüm yardım seçeneklerini göster\n"
 #~ "  --help-gtk GTK+ seçeneklerini göster"
 
-#~ msgid "Device to scan from"
-#~ msgstr "Tarama yapılacak aygıt"
-
 #~ msgid "Direction of scan"
 #~ msgstr "Tarama yönü"
 
-#~ msgid "Resolution for text scans"
-#~ msgstr "Metin taramaları için çözünürlük"
-
-#~ msgid "Resolution for photo scans"
-#~ msgstr "Fotoğraf taramaları için çözünürlük"
-
-#~ msgid "Directory to save files to"
-#~ msgstr "Dosyaların kaydedileceği dizin"
-
 #~ msgid "Height of scanned image in pixels"
 #~ msgstr "Taranan görüntünün piksel cinsinden yüksekliği"
 
 #~ msgid ""
-#~ "The direction of the scanner across the scanned page. It can be one of the "
-#~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+#~ "The direction of the scanner across the scanned page. It can be one of "
+#~ "the following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-"
+#~ "left'"
 #~ msgstr ""
-#~ "Tarayıcının taranan sayfa boyunca yönü. Şunlardan biri olabilir: 'yukarıdan "
-#~ "aşağıya' 'aşağıdan yukarıya' 'soldan sağa' 'sağdan sola'"
+#~ "Tarayıcının taranan sayfa boyunca yönü. Şunlardan biri olabilir: "
+#~ "'yukarıdan aşağıya' 'aşağıdan yukarıya' 'soldan sağa' 'sağdan sola'"
 
 #~ msgid ""
 #~ "The height of scanned image in pixels. This value is updated to what the "
@@ -862,41 +1179,21 @@ msgstr "Kaydedilen sayfa: %d / %d"
 #~ "Taranan görüntünün piksel cinsinden yüksekliği. Bu değer en son taranan "
 #~ "sayfaya göre güncellenir."
 
-#~ msgid "SANE device to acquire images from."
-#~ msgstr "Görüntülerin alınacağı SANE aygıtı"
-
-#~ msgid "The resolution in dots-per-inch to use when scanning text."
-#~ msgstr ""
-#~ "Metin tararken kullanılacak inç başına nokta sayısı cinsinden çözünürlük."
-
 #~ msgid "The resolution in dots-per-inch of the previously scanned image."
 #~ msgstr ""
-#~ "Bir önceki taranan görüntünün inç başına nokta sayısı cinsinden çözünürlüğü."
+#~ "Bir önceki taranan görüntünün inç başına nokta sayısı cinsinden "
+#~ "çözünürlüğü."
 
 #~ msgid "Resolution of last scanned image"
 #~ msgstr "En son taranan görüntünün çözünürlüğü"
 
-#~ msgid "The resolution in dots-per-inch to use when scanning photos."
-#~ msgstr ""
-#~ "Fotoğrafları tararken kullanılacak inç başına nokta sayısı cinsinden "
-#~ "çözünürlük."
-
 #~ msgid ""
-#~ "The directory to save files to. Defaults to the documents directory if unset."
-#~ msgstr ""
-#~ "Dosyaların kaydedileceği dizin. Ayarlanmadıysa, belgeler dizini "
-#~ "varsayılandır."
-
-#~ msgid ""
-#~ "The width of scanned image in pixels. This value is updated to what the last "
-#~ "scanned page was."
+#~ "The width of scanned image in pixels. This value is updated to what the "
+#~ "last scanned page was."
 #~ msgstr ""
 #~ "Taranan görüntünün piksel cinsinden genişliği. Bu değer en son taranan "
 #~ "sayfaya göre güncellenir."
 
-#~ msgid "Type of document being scanned"
-#~ msgstr "Taranacak belgenin türü"
-
 #~ msgid ""
 #~ "Type of document being scanned. 'text' for text documents, 'photo' for "
 #~ "photos. This setting decides on the scan resolution, colors and post-"
@@ -906,71 +1203,18 @@ msgstr "Kaydedilen sayfa: %d / %d"
 #~ "'fotoğraf'. Bu ayar tarama çözünürlüğünü, renkleri ve  tarama sonrası "
 #~ "işlemleri belirler."
 
-#~ msgid "Scanned Document"
-#~ msgstr "Taranmış Belge"
-
 #~ msgid "Select File _Type"
 #~ msgstr "Dosya _Türünü Seç"
 
-#~ msgid "Page side to scan"
-#~ msgstr "Taranacak sayfa tarafı"
-
-#~ msgid ""
-#~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
-#~ msgstr ""
-#~ "Taranacak sayfa tarafı. Şu seçeneklerden biri olabilir: 'her iki taraf' 'ön "
-#~ "taraf' 'arka taraf'"
-
 #~ msgid ""
-#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
+#~ "The page side to scan. It can be one of the following: 'both' 'front' "
+#~ "'back'"
 #~ msgstr ""
-#~ "Ondabirlik mm cinsinden kağıdın yüksekliği ( ya da otomatik kağıt tespiti "
-#~ "için 0)."
-
-#~ msgid "Height of paper in tenths of a mm"
-#~ msgstr "Ondabirlik mm cinsinden kağıdın yüksekliği"
-
-#~ msgid ""
-#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
-#~ msgstr ""
-#~ "Ondabirlik mm cinsinden kağıdın genişliği ( ya da otomatik kağıt tespiti "
-#~ "için 0)."
-
-#~ msgid "Width of paper in tenths of a mm"
-#~ msgstr "Ondabirlik mm cinsinden kağıdın genişliği"
+#~ "Taranacak sayfa tarafı. Şu seçeneklerden biri olabilir: 'her iki taraf' "
+#~ "'ön taraf' 'arka taraf'"
 
 #~ msgid "TRUE if the application window is maximized"
 #~ msgstr "Uygulama penceresi ekranı kapladığında DOĞRU (TRUE)"
 
-#~ msgid ""
-#~ "Type of document being scanned. This setting decides on the scan resolution, "
-#~ "colors and post-processing."
-#~ msgstr ""
-#~ "Taranacak belge türü. Bu ayar tarama kalitesi, renkler ve son işlemlere göre "
-#~ "belirlenir."
-
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "Tarayıcının taranmış sayfa boyunca yönü."
-
-#~ msgid "The page side to scan."
-#~ msgstr "Taranacak sayfa yüzü."
-
-#~ msgid "Brightness of scan"
-#~ msgstr "Tarama parlaklığı"
-
-#~ msgid "Quality value to use for JPEG compression."
-#~ msgstr "JPEG sıkıştırması için kalite değeri"
-
-#~ msgid "Quality value to use for JPEG compression"
-#~ msgstr "JPEG sıkıştırması için kalite değeri"
-
-#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
-#~ msgstr "-100'den 100'e (0 hiçbiri) karşıtlık ayarlaması"
-
-#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
-#~ msgstr "-100'den 100'e (0 hiçbiri) parlaklık ayarlaması"
-
-#~ msgid "Contrast of scan"
-#~ msgstr "Tarama karşıtlığı"
diff --git a/po/ug.gmo b/po/ug.gmo
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..90d5fd4 100644
--- a/po/ug.po
+++ b/po/ug.po
@@ -7,299 +7,313 @@ 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-04-16 08:54-0400\n"
 "PO-Revision-Date: 2012-08-07 01:17+0000\n"
 "Last-Translator: Sahran <Unknown>\n"
 "Language-Team: Uyghur Computer Science Association <ubuntu-l10n-"
 "ug@lists.launchpad.net>\n"
+"Language: ug\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-25 06:10+0000\n"
+"X-Generator: Launchpad (build 18361)\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: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 "پۈتۈك(_D)"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/simple-scan.ui:266
 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:279 src/simple-scan.ui:1343 src/simple-scan.ui:1402
 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:289 src/simple-scan.ui:1352 src/simple-scan.ui:1411
 msgid "All Pages From _Feeder"
 msgstr "كىرگۈزۈلگەن ھەممە بەتلەر(_F)"
 
+#. 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 "شويلىلاشنى توختات(_S)"
 
-#: 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
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: 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 "ئېلخەت(_E)"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:436
 msgid "_Page"
 msgstr "بەت(_P)"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:446
 msgid "Rotate _Left"
 msgstr "سولغا چۆرگىلەت(_L)"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:456
 msgid "Rotate _Right"
 msgstr "ئوڭغا چۆرگىلەت(_R)"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:466
 msgid "_Crop"
 msgstr "قىرقى(_C)"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:476
 msgid "_None"
 msgstr "يوق(_N)"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:487
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:498
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:509
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:520
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:531
 msgid "Le_gal"
 msgstr "US Legal(_G)"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:542
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:553
 msgid "_Custom"
 msgstr "ئىختىيارى(_C)"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:571
 msgid "_Rotate Crop"
 msgstr "قىرقىغاننى چۆرگىلەت(_R)"
 
 #. 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 "ياردەم(_H)"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:638
 msgid "_Contents"
 msgstr "مەزمۇنلار(_C)"
 
 #. 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 "پۈتۈكنى ھۆججەتكە ساقلايدۇ"
 
-#: ../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 "قىرقى"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: 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 "شويلىلاش مەنبەسى(_O):"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1085
 msgid "_Text Resolution:"
 msgstr "تېكىست ئېنىقلىقى(_T):"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1101
 msgid "_Photo Resolution:"
 msgstr "سۈرەت ئېنىقلىقى(_P):"
 
 #. 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 "پۈتۈك شويلىلاش"
 
@@ -311,7 +325,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 +333,209 @@ 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:844
 msgid "No scanners available.  Please connect a scanner."
 msgstr "شويلىلىغۇچ مەۋجۇت ئەمەس. شويلىلىغۇچنى چېتىڭ."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:874
 msgid "Unable to connect to scanner"
 msgstr "شويلىلىغۇچقا باغلانغىلى بولمىدى"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1227
 msgid "Unable to start scan"
 msgstr "شويلىلاشنى باشلىغىلى بولمىدى"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: 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
+#: 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:332 src/ui.vala:1655 src/ui.vala:1935
 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:341
 #, 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:389
 msgid "No scanners detected"
 msgstr "شويلىلىغۇچ تېپىلمىدى"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:391
 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:396
 msgid "Additional software needed"
 msgstr "باشقا يۇمشاق دېتاللار زۆرۈر"
 
 #. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:398
 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: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 "ئەمەلدىن قالدۇر(_C)"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:514 src/ui.vala:724
 msgid "_Save"
 msgstr "ساقلا(_S)"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:522
 msgid "Scanned Document.pdf"
 msgstr "شويلىلانغان Document.pdf"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:528
 msgid "Image Files"
 msgstr "سۈرەت ھۆججەتلىرى"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:534
 msgid "All Files"
 msgstr "بارلىق ھۆججەتلەر"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:543
 msgid "PDF (multi-page document)"
 msgstr "PDF (كۆپ بەتلىك پۈتۈكلەر)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:549
 msgid "JPEG (compressed)"
 msgstr "JPEG (پرېسلانغان)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:555
 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: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:650
+#: src/ui.vala:698
 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:721
 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:763
 msgid "Save current document?"
 msgstr "ھازىرقى پۈتۈكنى ساقلىسۇنمۇ؟"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:765
 msgid "Discard Changes"
 msgstr "ئۆزگەرتىشنى تاشلىۋەت"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:1056
 msgid "Unable to save image for preview"
 msgstr "ئالدىن كۆرىدىغان رەسىمنى ساقلىغىلى بولمىدى."
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1068
 msgid "Unable to open image preview application"
 msgstr "رەسىمنى ئالدىن كۆرۈش پروگراممىسىنى قوزغاتقىلى بولمىدى"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1270
 msgid "Combine sides"
 msgstr "تەرەپلەرنى بىرىكتۈرۈش"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1280
 msgid "Combine sides (reverse)"
 msgstr "تەرەپلەرنى بىرىكتۈرۈش(ئەسكىچە)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1290
 msgid "Reverse"
 msgstr "ئەكسىچە"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1300
 msgid "Keep unchanged"
 msgstr "ئۆزگەرمىسۇن"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1504
 msgid "Unable to open help file"
 msgstr "ياردەم ھۆججىتىنى ئاچقىلى بولمىدى"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: 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"
@@ -541,16 +566,16 @@ msgstr ""
 "<http://www.gnu.org/licenses/> دا تاپالايسىز."
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1528
 msgid "About Simple Scan"
 msgstr "«ئاددىي شويلىلاش» ھەققىدە"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1531
 msgid "Simple document scanning tool"
 msgstr "ئاددىي پۈتۈك شويلىلاش قورالى"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1540
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -564,189 +589,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:1562
 msgid "Save document before quitting?"
 msgstr "ئاخىرلاشتۇرۇشتىن ئاۋۋال ھازىرقى پۈتۈكنى ساقلىسۇنمۇ؟"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1564
 msgid "Quit without Saving"
 msgstr "ساقلىماي ئاخىرلاشتۇر"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1632
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1634
 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:1638
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1640
 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:1644
 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:1649
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1651
 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:1655
 msgid "Install drivers"
 msgstr "قوزغاتقۇلارنى ئورنىتىش"
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1686
 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:1698
 msgid "Installing drivers..."
 msgstr "قوزغاتقۇلارنى ئورنىتىۋاتىدۇ…"
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1706
 msgid "Drivers installed successfully!"
 msgstr "قوزغاتقۇلار مۇۋەپپەقىيەتلىك ئورنىتىلدى"
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1716
 #, 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:1722
 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:1729
 #, 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:1833
 #, 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:1836
 #, 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:1839
 #, 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:1842
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../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 "ئاخىرلاشتۇر"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1937
 msgid "Change _Scanner"
 msgstr "شويلىلىغۇچنى ئالماشتۇرۇڭ(_S)"
 
 #. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1939
 msgid "_Install Drivers"
 msgstr "قوزغاتقۇلارنى ئورنات(_I)"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: 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 "ساقلاۋاتقىنى %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..aa96b20 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,296 +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"
+"POT-Creation-Date: 2017-04-16 08:54-0400\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"
+"Language: uk\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-25 06:10+0000\n"
+"X-Generator: Launchpad (build 18361)\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
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: 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 "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:498
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:509
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:520
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:531
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:542
 msgid "4×6"
 msgstr "4×6"
 
 #. 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 "Зберегти документ до файла"
 
-#: ../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 "Обрізати"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: 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 +323,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 +336,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 +344,206 @@ msgstr ""
 "SANE."
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:844
 msgid "No scanners available.  Please connect a scanner."
 msgstr ""
 "Не вдалося виявити жодного сканера. Будь ласка, з’єднайте сканер з "
 "комп’ютером."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:874
 msgid "Unable to connect to scanner"
 msgstr "Не вдалося з’єднатися зі сканером"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1227
 msgid "Unable to start scan"
 msgstr "Не вдалося розпочати сканування"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: 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
+#: 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:332 src/ui.vala:1655 src/ui.vala:1935
 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:341
 #, 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:389
 msgid "No scanners detected"
 msgstr "Сканерів не виявлено"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:391
 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:396
 msgid "Additional software needed"
 msgstr "Потрібне додаткове програмне забезпечення"
 
 #. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:398
 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: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 "З_берегти"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:522
 msgid "Scanned Document.pdf"
 msgstr "Сканований документ.pdf"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:528
 msgid "Image Files"
 msgstr "Файли зображень"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:534
 msgid "All Files"
 msgstr "Всі файли"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:543
 msgid "PDF (multi-page document)"
 msgstr "PDF (багатосторінковий документ)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:549
 msgid "JPEG (compressed)"
 msgstr "JPEG (стиснений)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:555
 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: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:650
+#: src/ui.vala:698
 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:721
 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:763
 msgid "Save current document?"
 msgstr "Зберегти поточний документ?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:765
 msgid "Discard Changes"
 msgstr "Відкинути зміни"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:1056
 msgid "Unable to save image for preview"
 msgstr "Не вдалося зберегти зображення для попереднього перегляду"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1068
 msgid "Unable to open image preview application"
 msgstr "Не вдалося запустити програму для перегляду зображення"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1270
 msgid "Combine sides"
 msgstr "З’єднувати збоку"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1280
 msgid "Combine sides (reverse)"
 msgstr "З’єднувати збоку (у зворотному порядку)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1290
 msgid "Reverse"
 msgstr "У зворотному порядку"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1300
 msgid "Keep unchanged"
 msgstr "Не змінювати"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1504
 msgid "Unable to open help file"
 msgstr "Не вдалося відкрити файл довідки"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: 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"
@@ -547,16 +572,16 @@ msgstr ""
 "<http://www.gnu.org/licenses/>, щоб дізнатися про подальші дії."
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1528
 msgid "About Simple Scan"
 msgstr "Про «Просте сканування»"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1531
 msgid "Simple document scanning tool"
 msgstr "Інструмент для спрощення сканування документів"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1540
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -567,22 +592,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:1562
 msgid "Save document before quitting?"
 msgstr "Зберегти документ перед виходом?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1564
 msgid "Quit without Saving"
 msgstr "Вийти без збереження"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1632
 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:1634
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
@@ -591,12 +616,12 @@ msgstr ""
 "Brother</a>."
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1638
 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:1640
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
@@ -605,17 +630,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:1644
 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:1649
 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:1651
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
@@ -624,138 +649,138 @@ msgstr ""
 "сайті Epson</a>."
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1655
 msgid "Install drivers"
 msgstr "Встановлення драйверів"
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1686
 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:1698
 msgid "Installing drivers..."
 msgstr "Встановлюємо драйвери…"
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1706
 msgid "Drivers installed successfully!"
 msgstr "Драйвери успішно встановлено!"
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1716
 #, 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:1722
 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:1729
 #, 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:1833
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d т/д (типова)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1836
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d т/д (чернетка)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1839
 #, 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:1842
 #, c-format
 msgid "%d dpi"
 msgstr "%d т/д"
 
-#: ../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 "Вийти"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1937
 msgid "Change _Scanner"
 msgstr "З_мінити сканер"
 
 #. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1939
 msgid "_Install Drivers"
 msgstr "_Встановити драйвери"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: 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 "Зберігаємо сторінку %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..c348bff 100644
--- a/po/ur.po
+++ b/po/ur.po
@@ -7,296 +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"
+"POT-Creation-Date: 2017-04-16 08:54-0400\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"
+"Language: ur\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-25 06:10+0000\n"
+"X-Generator: Launchpad (build 18361)\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
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: 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 "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:498
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:509
 msgid "A_6"
 msgstr "A_6"
 
 #. 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 ""
 
-#: ../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 ""
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: 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 ""
 
@@ -308,7 +322,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 +330,207 @@ 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:844
 msgid "No scanners available.  Please connect a scanner."
 msgstr ""
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:874
 msgid "Unable to connect to scanner"
 msgstr ""
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1227
 msgid "Unable to start scan"
 msgstr ""
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: 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
+#: 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:332 src/ui.vala:1655 src/ui.vala:1935
 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:341
 #, 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:389
 msgid "No scanners detected"
 msgstr ""
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:391
 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:396
 msgid "Additional software needed"
 msgstr ""
 
 #. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:398
 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: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 ""
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:522
 msgid "Scanned Document.pdf"
 msgstr ""
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:528
 msgid "Image Files"
 msgstr ""
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:534
 msgid "All Files"
 msgstr ""
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:543
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:549
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:555
 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: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:650
+#: src/ui.vala:698
 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:721
 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:763
 msgid "Save current document?"
 msgstr ""
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:765
 msgid "Discard Changes"
 msgstr ""
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:1056
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1068
 msgid "Unable to open image preview application"
 msgstr ""
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1270
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1280
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1290
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1300
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1504
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: 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"
@@ -522,16 +547,16 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1528
 msgid "About Simple Scan"
 msgstr ""
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1531
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1540
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -540,189 +565,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:1562
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1564
 msgid "Quit without Saving"
 msgstr ""
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1632
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1634
 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:1638
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1640
 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:1644
 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:1649
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1651
 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:1655
 msgid "Install drivers"
 msgstr ""
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1686
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1698
 msgid "Installing drivers..."
 msgstr ""
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1706
 msgid "Drivers installed successfully!"
 msgstr ""
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1716
 #, 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:1722
 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:1729
 #, 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:1833
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/ui.vala:1836
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1839
 #, 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: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 ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1937
 msgid "Change _Scanner"
 msgstr ""
 
 #. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1939
 msgid "_Install Drivers"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: 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/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..e919374 100644
--- a/po/uz.po
+++ b/po/uz.po
@@ -7,296 +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"
+"POT-Creation-Date: 2017-04-16 08:54-0400\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"
+"Language: uz\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-25 06:10+0000\n"
+"X-Generator: Launchpad (build 18361)\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:231 src/simple-scan.ui:815 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:247
 msgid "_Document"
 msgstr "_Dokument"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/simple-scan.ui:266
 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: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 "Matn"
 
-#: 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 "Rasm"
 
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: 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 "_Email"
 
 #. 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 "Chapga burish"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:456
 msgid "Rotate _Right"
 msgstr "_O'nga burish"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:466
 msgid "_Crop"
 msgstr "_Kesish"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:476
 msgid "_None"
 msgstr "_Yoʻq"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:487
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:498
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:509
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:520
 msgid "_Letter"
 msgstr "_Xat"
 
 #. 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 "_Yordam"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:638
 msgid "_Contents"
 msgstr "_Tarkibi"
 
 #. 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 "Yangi"
 
 #. 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 "Skan qilish"
 
 #. 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 ""
 
-#: ../src/ui.vala:1842
+#: src/simple-scan.ui:715 src/ui.vala:1892
 msgid "Save"
 msgstr "Saqlash"
 
 #. 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 "Toʻxtatish"
 
 #. 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 "Chapga burish"
 
 #. 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 "O'nga burish"
 
-#: 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 "Kesish"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: 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 ""
 
@@ -308,7 +322,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 +330,209 @@ 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:844
 msgid "No scanners available.  Please connect a scanner."
 msgstr ""
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:874
 msgid "Unable to connect to scanner"
 msgstr ""
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1227
 msgid "Unable to start scan"
 msgstr ""
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: 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
+#: 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:332 src/ui.vala:1655 src/ui.vala:1935
 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:341
 #, 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:389
 msgid "No scanners detected"
 msgstr ""
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:391
 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:396
 msgid "Additional software needed"
 msgstr ""
 
 #. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:398
 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: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 ""
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:522
 msgid "Scanned Document.pdf"
 msgstr ""
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:528
 msgid "Image Files"
 msgstr ""
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:534
 msgid "All Files"
 msgstr "Hamma fayllar"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:543
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:549
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:555
 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: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:650
+#: src/ui.vala:698
 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:721
 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:763
 msgid "Save current document?"
 msgstr ""
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:765
 msgid "Discard Changes"
 msgstr ""
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:1056
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1068
 msgid "Unable to open image preview application"
 msgstr ""
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1270
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1280
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1290
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1300
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1504
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: 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"
@@ -524,205 +549,205 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1528
 msgid "About Simple Scan"
 msgstr "Simple Scan haqida"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1531
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1540
 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:1562
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1564
 msgid "Quit without Saving"
 msgstr "Saqlamasdan chiqib ketish"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1632
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1634
 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:1638
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1640
 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:1644
 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:1649
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1651
 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:1655
 msgid "Install drivers"
 msgstr ""
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1686
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1698
 msgid "Installing drivers..."
 msgstr ""
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1706
 msgid "Drivers installed successfully!"
 msgstr ""
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1716
 #, 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:1722
 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:1729
 #, 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:1833
 #, 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:1836
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/ui.vala:1839
 #, 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: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 ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1937
 msgid "Change _Scanner"
 msgstr "_Skaner almashrirish"
 
 #. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1939
 msgid "_Install Drivers"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1945
 msgid "Automatic"
 msgstr "Avtomatik"
 
-#: ../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/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..8c44872 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,298 +7,312 @@ 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-04-16 08:54-0400\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"
+"Language: vi\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-25 06:10+0000\n"
+"X-Generator: Launchpad (build 18361)\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:231 src/simple-scan.ui:815 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:247
 msgid "_Document"
 msgstr "_Tài liệu"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/simple-scan.ui:266
 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:279 src/simple-scan.ui:1343 src/simple-scan.ui:1402
 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:289 src/simple-scan.ui:1352 src/simple-scan.ui:1411
 msgid "All Pages From _Feeder"
 msgstr "Tất cả trang từ _Khay (Feeder)"
 
+#. 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 ""
+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:326 src/simple-scan.ui:1376 src/simple-scan.ui:1435
 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:336 src/simple-scan.ui:1386 src/simple-scan.ui:1445
 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: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 ""
+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:436
 msgid "_Page"
 msgstr "_Trang"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:446
 msgid "Rotate _Left"
 msgstr "Xoay _trái"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:456
 msgid "Rotate _Right"
 msgstr "Xoay _Phải"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:466
 msgid "_Crop"
 msgstr "_Xén"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:476
 msgid "_None"
 msgstr "_Không có"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:487
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:498
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:509
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:520
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:531
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. 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 "Tự _chọn"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:571
 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:584
 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:593
 msgid "Move Right"
-msgstr ""
+msgstr "Sang phải"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/simple-scan.ui:630
 msgid "_Help"
 msgstr "_Trợ giúp"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:638
 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:680 src/simple-scan.ui:891
 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:681
 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:695 src/simple-scan.ui:842
 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:697 src/simple-scan.ui:843
 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:713 src/simple-scan.ui:870
 msgid "Save document to a file"
-msgstr ""
+msgstr "Ghi tài liệu ra tệp"
 
-#: ../src/ui.vala:1842
+#: src/simple-scan.ui:715 src/ui.vala:1892
 msgid "Save"
-msgstr ""
+msgstr "Lưu"
 
 #. 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 ""
+msgstr "Dừng quét hình"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/simple-scan.ui:731 src/simple-scan.ui:831
 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:755 src/simple-scan.ui:942
 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:756
 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:770 src/simple-scan.ui:920
 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:771
 msgid "Rotate Right"
-msgstr ""
+msgstr "Xoay phải"
 
-#: 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 ""
+msgstr "Xén trang đã chọn"
 
-#: data/simple-scan.ui:781
+#: src/simple-scan.ui:787
 msgid "Crop"
-msgstr ""
+msgstr "Xén"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: src/simple-scan.ui:1003 src/ui.vala:1898
 msgid "Preferences"
 msgstr "Tùy thích"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1048
+#: src/simple-scan.ui:1054
 msgid "Scan S_ource:"
 msgstr "Quét _Nguồn:"
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1085
 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:1101
 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:1145
 msgid "Scan Side:"
-msgstr ""
+msgstr "Quét mặt:"
 
 #. Label beside page size combo box
-#: data/simple-scan.ui:1169
+#: src/simple-scan.ui:1175
 msgid "Page Size:"
-msgstr ""
+msgstr "Cỡ trang:"
 
 #. Label beside brightness scale
-#: data/simple-scan.ui:1199
+#: src/simple-scan.ui:1205
 msgid "Brightness:"
 msgstr "Độ sáng:"
 
 #. Label beside contrast scale
-#: data/simple-scan.ui:1229
+#: src/simple-scan.ui:1235
 msgid "Contrast:"
 msgstr "Độ tương phản:"
 
 #. Label beside quality scale
-#: data/simple-scan.ui:1260
+#: src/simple-scan.ui:1266
 msgid "Quality:"
 msgstr "Chất lượng:"
 
+#. 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 ""
+msgstr "Quét tài liệu"
 
 #: data/simple-scan.desktop.in:6
 msgid "scan;scanner;flatbed;adf;"
@@ -308,7 +322,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 +330,209 @@ 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:844
 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:874
 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:1227
 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:1240 src/scanner.vala:1340
 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:332 src/ui.vala:1655 src/ui.vala:1935
 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:341
 #, 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:389
 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:391
 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:396
 msgid "Additional software needed"
 msgstr ""
 
 #. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:398
 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:510
 msgid "Save As..."
 msgstr "Lưu thành..."
 
-#: ../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 ""
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:522
 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:528
 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:534
 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:543
 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:549
 msgid "JPEG (compressed)"
-msgstr ""
+msgstr "JPEG (nén)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:555
 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: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:650
+#: src/ui.vala:698
 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:721
 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:763
 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:765
 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:1056
 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:1068
 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:1270
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1280
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1290
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1300
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1504
 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: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"
@@ -536,16 +561,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:1528
 msgid "About Simple Scan"
 msgstr "Về Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1531
 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:1540
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -554,189 +579,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:1562
 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:1564
 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:1632
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1634
 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:1638
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1640
 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:1644
 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:1649
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1651
 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:1655
 msgid "Install drivers"
 msgstr ""
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1686
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1698
 msgid "Installing drivers..."
 msgstr ""
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1706
 msgid "Drivers installed successfully!"
 msgstr ""
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1716
 #, 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:1722
 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:1729
 #, 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:1833
 #, 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:1836
 #, 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:1839
 #, 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:1842
 #, c-format
 msgid "%d dpi"
-msgstr ""
+msgstr "%d dpi"
 
-#: ../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 ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1937
 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:1939
 msgid "_Install Drivers"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1945
 msgid "Automatic"
-msgstr ""
+msgstr "Tự động"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1995
 msgid "Darker"
 msgstr "Tối hơn"
 
-#: ../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/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..954864b 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,514 +1,305 @@
 # Chinese (Simplified) translation for simple-scan
 # Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
 # This file is distributed under the same license as the simple-scan package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
+# Mingcong Bai <jeffbai@aosc.xyz>, 2017.
 #
 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-20 08:05+0000\n"
-"Last-Translator: Dennis Kuang <Unknown>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-10-21 20:32+0800\n"
+"PO-Revision-Date: 2017-09-02 01:35+0800\n"
+"Last-Translator: Mingcong Bai <jeffbai@aosc.xyz>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
+"Language: zh_CN\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"
-"Language: zh_CN\n"
+"X-Launchpad-Export-Date: 2017-04-25 06:10+0000\n"
+"X-Generator: Poedit 2.0.2\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#. Button to submit authorization dialog
-#: data/simple-scan.ui:24
-msgid "_Authorize"
-msgstr "认证(_A)"
+#: ../data/org.gnome.SimpleScan.gschema.xml.h:1
+msgid "Device to scan from"
+msgstr "扫描设备"
 
-#. Label beside username entry
-#: data/simple-scan.ui:102
-msgid "_Username for resource:"
-msgstr "资源用户名(_U)："
+#: ../data/org.gnome.SimpleScan.gschema.xml.h:2
+msgid "SANE device to acquire images from."
+msgstr "从 SANE 设备获取图像。"
 
-#. Label beside password entry
-#: data/simple-scan.ui:117
-msgid "_Password:"
-msgstr "密码(_P)："
+#: ../data/org.gnome.SimpleScan.gschema.xml.h:3
+msgid "Type of document being scanned"
+msgstr "扫描文档的类型"
 
-#. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
-msgid "Front and Back"
-msgstr "正面和背面"
+#: ../data/org.gnome.SimpleScan.gschema.xml.h:4
+msgid ""
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+msgstr "要扫描的文件类型。此设置将决定扫描的分辨率、色彩和预处理。"
 
-#. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
-msgid "Front"
-msgstr "正面"
+#: ../data/org.gnome.SimpleScan.gschema.xml.h:5
+msgid "Width of paper in tenths of a mm"
+msgstr "纸张的宽度 (以 0.1mm 计)"
 
-#. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
-msgid "Back"
-msgstr "背面"
+#: ../data/org.gnome.SimpleScan.gschema.xml.h:6
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr "纸张的宽度 (以 0.1mm 计，0 代表自动检查纸张)"
 
-#. Title of scan window
-#: data/simple-scan.ui:225 data/simple-scan.ui:809
-#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
-msgid "Simple Scan"
-msgstr "扫描易"
+#: ../data/org.gnome.SimpleScan.gschema.xml.h:7
+msgid "Height of paper in tenths of a mm"
+msgstr "纸张的高度 (以 0.1mm 计)"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
-msgid "_Document"
-msgstr "文档(_D)"
-
-#. Scan menu item
-#: data/simple-scan.ui:260
-msgid "Sc_an"
-msgstr "扫描(_A)"
-
-#. Scan menu item to scan a single page from the scanner
-#. Toolbar scan menu item to scan a single page from the scanner
-#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
-msgid "Single _Page"
-msgstr "单页(_P)"
-
-#. Scan menu item to scan all pages from a document feeder
-#. Toolbar scan menu item to scan all pages from a document feeder
-#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
-msgid "All Pages From _Feeder"
-msgstr "传送来的所有页面(_F)"
-
-#. Menu entry to stop current scan
-#: data/simple-scan.ui:294
-msgid "_Stop Scan"
-msgstr "停止扫描(_S)"
-
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
-msgid "Text"
-msgstr "文本"
-
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
-msgid "Photo"
-msgstr "照片"
+#: ../data/org.gnome.SimpleScan.gschema.xml.h:8
+msgid ""
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr "纸张的高度 (以 0.1mm 计，0 代表自动检查纸张)"
 
-#. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
-msgid "Reorder Pages"
-msgstr "重新排序页面"
+#: ../data/org.gnome.SimpleScan.gschema.xml.h:9
+msgid "Brightness of scan"
+msgstr "扫描亮度"
 
-#. Label on email menu item
-#: data/simple-scan.ui:367
-msgid "_Email"
-msgstr "电子邮件(_E)"
-
-#. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
-msgid "_Page"
-msgstr "页面(_P)"
-
-#. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
-msgid "Rotate _Left"
-msgstr "向左旋转(_L)"
-
-#. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
-msgid "Rotate _Right"
-msgstr "向右旋转(_R)"
-
-#. Label for page crop submenu
-#: data/simple-scan.ui:460
-msgid "_Crop"
-msgstr "剪裁(_C)"
-
-#. Radio button for no crop
-#: data/simple-scan.ui:470
-msgid "_None"
-msgstr "无(_N)"
-
-#. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
-msgid "A_4"
-msgstr "A_4"
-
-#. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
-msgid "A_5"
-msgstr "A_5"
-
-#. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
-msgid "A_6"
-msgstr "A_6"
-
-#. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
-msgid "_Letter"
-msgstr "信件(_L)"
-
-#. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
-msgid "Le_gal"
-msgstr "法定(_G)"
-
-#. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
-msgid "4×6"
-msgstr "4×6"
-
-#. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
-msgid "_Custom"
-msgstr "自定义(_C)"
-
-#. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
-msgid "_Rotate Crop"
-msgstr "旋转剪裁(_R)"
-
-#. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
-msgid "Move Left"
-msgstr "左移"
-
-#. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
-msgid "Move Right"
-msgstr "右移"
-
-#. Label on help menu
-#: data/simple-scan.ui:624
-msgid "_Help"
-msgstr "帮助(_H)"
-
-#. Help|Contents menu
-#: data/simple-scan.ui:632
-msgid "_Contents"
-msgstr "内容(_C)"
-
-#. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
-msgid "Start a new document"
-msgstr "开始一个新的文档"
-
-#: data/simple-scan.ui:675
-msgid "New"
-msgstr "新建"
-
-#. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
-msgid "Scan a single page from the scanner"
-msgstr "从扫描仪扫描一个单页"
-
-#. Label on scan toolbar item
-#: data/simple-scan.ui:691 data/simple-scan.ui:837
-msgid "Scan"
-msgstr "扫描"
-
-#. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
-msgid "Save document to a file"
-msgstr "将文档保存为文件"
-
-#: ../src/ui.vala:1842
-msgid "Save"
-msgstr "保存"
-
-#. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
-msgid "Stop the current scan"
-msgstr "停止当前扫描"
-
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
-msgid "Stop"
-msgstr "停止"
+#: ../data/org.gnome.SimpleScan.gschema.xml.h:10
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr "从 -100 到 100 的亮度调节（0 为不作调节）"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "左旋页面 (逆时针)"
+#: ../data/org.gnome.SimpleScan.gschema.xml.h:11
+msgid "Contrast of scan"
+msgstr "扫描对比度"
 
-#. Label on rotate page left (anti-clockwise) item
-#: data/simple-scan.ui:750
-msgid "Rotate Left"
-msgstr "逆时针旋转"
+#: ../data/org.gnome.SimpleScan.gschema.xml.h:12
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr "从 -100 到 100 的对比度调节（0 为不作调节）"
 
-#. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
-msgid "Rotate the page to the right (clockwise)"
-msgstr "右旋页面 (顺时针)"
+#: ../data/org.gnome.SimpleScan.gschema.xml.h:13
+msgid "Resolution for text scans"
+msgstr "文本扫描分辨率"
 
-#. Label on rotate page right (clockwise) item
-#: data/simple-scan.ui:765
-msgid "Rotate Right"
-msgstr "顺时针旋转"
+#: ../data/org.gnome.SimpleScan.gschema.xml.h:14
+msgid "The resolution in dots-per-inch to use when scanning text."
+msgstr "上次扫描文档的分辨率 (点/英寸)。"
 
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
-msgid "Crop the selected page"
-msgstr "裁剪选中的页面"
+#: ../data/org.gnome.SimpleScan.gschema.xml.h:15
+msgid "Resolution for photo scans"
+msgstr "照片扫描分辨率"
 
-#: data/simple-scan.ui:781
-msgid "Crop"
-msgstr "剪裁"
+#: ../data/org.gnome.SimpleScan.gschema.xml.h:16
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr "扫描照片时使用的分辨率 (点/英寸)。"
 
-#: ../src/ui.vala:1849
-msgid "Preferences"
-msgstr "首选项"
+#: ../data/org.gnome.SimpleScan.gschema.xml.h:17
+msgid "Page side to scan"
+msgstr "扫描纸张的哪面"
 
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1048
-msgid "Scan S_ource:"
-msgstr "扫描来源(_O)："
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1079
-msgid "_Text Resolution:"
-msgstr "文字分辨率(_T)："
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1095
-msgid "_Photo Resolution:"
-msgstr "图像分辨率(_P)："
-
-#. Label beside scan side combo box
-#: data/simple-scan.ui:1139
-msgid "Scan Side:"
-msgstr "扫描页面："
-
-#. Label beside page size combo box
-#: data/simple-scan.ui:1169
-msgid "Page Size:"
-msgstr "页面大小："
-
-#. Label beside brightness scale
-#: data/simple-scan.ui:1199
-msgid "Brightness:"
-msgstr "亮度："
-
-#. Label beside contrast scale
-#: data/simple-scan.ui:1229
-msgid "Contrast:"
-msgstr "对比度："
-
-#. Label beside quality scale
-#: data/simple-scan.ui:1260
-msgid "Quality:"
-msgstr "质量："
-
-#: data/simple-scan.desktop.in:4
-msgid "Document Scanner"
-msgstr "文档扫描仪"
-
-#: data/simple-scan.desktop.in:5
-msgid "Scan Documents"
-msgstr "扫描文档"
-
-#: data/simple-scan.desktop.in:6
-msgid "scan;scanner;flatbed;adf;"
-msgstr "scan;scanner;flatbed;adf;扫描;扫描仪;"
-
-#: data/simple-scan.desktop.in:8
-msgid "scanner"
-msgstr ""
+#: ../data/org.gnome.SimpleScan.gschema.xml.h:18
+msgid "The page side to scan."
+msgstr "要扫描的页面。"
 
-#: data/simple-scan.appdata.xml.in:8
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-"一个非常简单的方法来同时扫描文档和照片。如果图片显示有误，您可以根据需要通过裁剪、旋转等方式调整照片。您也可以打印扫描件、导出 PDF "
-"格式、或者保存为图片。"
+#: ../data/org.gnome.SimpleScan.gschema.xml.h:19
+msgid "Directory to save files to"
+msgstr "保存文件的文件夹："
 
-#: data/simple-scan.appdata.xml.in:13
+#: ../data/org.gnome.SimpleScan.gschema.xml.h:20
 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
-msgid "No scanners available.  Please connect a scanner."
-msgstr "没有可用的扫描仪。请连接一个扫描仪。"
-
-#. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
-msgid "Unable to connect to scanner"
-msgstr "无法连接到扫描仪"
-
-#. Error display when unable to start scan
-#: ../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
-msgid "Error communicating with scanner"
-msgstr "与扫描仪通信错误"
-
-#. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
-msgid "Show release version"
-msgstr "显示版本信息"
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr "用于保存文件的文件夹。如果不设置，默认使用 文档 文件夹。"
 
-#. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
-msgid "Print debugging messages"
-msgstr "显示调试信息"
+#: ../data/org.gnome.SimpleScan.gschema.xml.h:21
+msgid "Quality value to use for JPEG compression"
+msgstr "JPEG 压缩质量"
 
-#: ../src/simple-scan.vala:26
-msgid "Fix PDF files generated with older versions of Simple Scan"
-msgstr "修复旧版扫描易生成的 PDF 文件"
+#: ../data/org.gnome.SimpleScan.gschema.xml.h:22
+msgid "Quality value to use for JPEG compression."
+msgstr "JPEG 压缩质量"
 
-#. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:391
-msgid "Failed to scan"
-msgstr "扫描失败"
+#: ../data/org.gnome.SimpleScan.gschema.xml.h:23
+msgid "Delay in millisecond between pages"
+msgstr "每页间延迟的毫秒数"
 
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
-msgid "[DEVICE...] - Scanning utility"
-msgstr "[设备...] - 扫描工具"
+#: ../data/org.gnome.SimpleScan.gschema.xml.h:24
+msgid "Delay in millisecond between pages."
+msgstr "每页间延迟的毫秒数。"
 
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
-#, c-format
-msgid "Run '%s --help' to see a full list of available command line options."
-msgstr "运行“%s --help”来查看可用命令行选项的完整列表。"
-
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: ../src/app-window.vala:237 ../src/app-window.vala:1380
 msgid "_Close"
 msgstr "关闭(_C)"
 
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
+#. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
+#: ../src/app-window.vala:246
 #, c-format
-msgid "Username and password required to access '%s'"
-msgstr "使用“%s”需要用户名和密码"
+msgid "Username and password required to access “%s”"
+msgstr "访问“%s”需要用户名和密码"
+
+#. Label shown when detected a scanner
+#: ../src/app-window.vala:266 ../src/app-window.vala:584
+msgid "Ready to Scan"
+msgstr "扫描准备就绪"
+
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/app-window.vala:273
+msgid "Additional software needed"
+msgstr "需要安装其他软件"
+
+#. Instructions to install driver software
+#: ../src/app-window.vala:275
+msgid ""
+"You need to <a href=\"install-firmware\">install driver software</a> for "
+"your scanner."
+msgstr "您需要为您的扫描仪 <a href=\"install-firmware\"></a> 安装驱动软件。"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: ../src/app-window.vala:281
 msgid "No scanners detected"
 msgstr "没有发现扫描仪"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: ../src/app-window.vala:283
 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
-msgid "Additional software needed"
-msgstr "需要安装其他软件"
-
-#. Instructions to install driver software
-#: ../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
-msgid "Save As..."
-msgstr "保存为..."
+#: ../src/app-window.vala:298
+msgid "Save As…"
+msgstr "保存为…"
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: ../src/app-window.vala:301 ../src/app-window.vala:471
+#: ../src/app-window.vala:552
 msgid "_Cancel"
 msgstr "取消(_C)"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: ../src/app-window.vala:302 ../src/app-window.vala:553
 msgid "_Save"
 msgstr "保存(_S)"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: ../src/app-window.vala:310
 msgid "Scanned Document.pdf"
 msgstr "扫描的文件.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#. Save dialog: Filter name to show only supported image files
+#: ../src/app-window.vala:316
 msgid "Image Files"
 msgstr "图像文件"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: ../src/app-window.vala:326
 msgid "All Files"
 msgstr "所有文件"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: ../src/app-window.vala:335
 msgid "PDF (multi-page document)"
-msgstr "PDF (多页文档)"
+msgstr "PDF（多页文档）"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: ../src/app-window.vala:341
 msgid "JPEG (compressed)"
-msgstr "JPEG (压缩)"
+msgstr "JPEG（压缩）"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: ../src/app-window.vala:347
 msgid "PNG (lossless)"
-msgstr "PNG (无损)"
+msgstr "PNG（无损）"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#. Save dialog: Label for sabing in WEBP format
+#: ../src/app-window.vala:354
+msgid "WebP (compressed)"
+msgstr "WebP（压缩）"
+
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
+#: ../src/app-window.vala:364
 msgid "File format:"
 msgstr "文件格式："
 
+#. Label in save dialog beside compression slider
+#: ../src/app-window.vala:376
+msgid "Compression:"
+msgstr "压缩模式："
+
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: ../src/app-window.vala:470
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr "文件“%s”已存在。要替换该文件吗？"
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: ../src/app-window.vala:473
+msgid "_Replace"
+msgstr "替换(_R)"
+
+#: ../src/app-window.vala:512
+msgid "Saving"
+msgstr "正在保存"
+
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: ../src/app-window.vala:527
 msgid "Failed to save file"
 msgstr "保存文件错误"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
-msgid "If you don't save, changes will be permanently lost."
+#: ../src/app-window.vala:550
+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/app-window.vala:591
 msgid "Save current document?"
 msgstr "保存当前文档？"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: ../src/app-window.vala:593
 msgid "Discard Changes"
 msgstr "放弃更改"
 
+#. Label shown when scan started
+#: ../src/app-window.vala:692
+msgid "Contacting scanner…"
+msgstr "正在访问扫描仪…"
+
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: ../src/app-window.vala:800
 msgid "Unable to save image for preview"
 msgstr "无法保存用以预览的图像"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: ../src/app-window.vala:812
 msgid "Unable to open image preview application"
 msgstr "无法打开图像预览软件"
 
+#. Title of dialog to reorder pages
+#: ../src/app-window.vala:967 ../src/app-window.vala:1590
+msgid "Reorder Pages"
+msgstr "重新排序页面"
+
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: ../src/app-window.vala:990
 msgid "Combine sides"
 msgstr "合并页"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: ../src/app-window.vala:1000
 msgid "Combine sides (reverse)"
 msgstr "合并页(反向)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: ../src/app-window.vala:1010
 msgid "Reverse"
 msgstr "反向"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: ../src/app-window.vala:1020
 msgid "Keep unchanged"
 msgstr "保持不变"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: ../src/app-window.vala:1250
 msgid "Unable to open help file"
 msgstr "无法打开帮助文件"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: ../src/app-window.vala:1271
 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,18 +325,20 @@ msgstr ""
 "<http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: ../src/app-window.vala:1274
 msgid "About Simple Scan"
 msgstr "关于扫描易"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: ../src/app-window.vala:1277
 msgid "Simple document scanning tool"
 msgstr "简易的文件扫描工具"
 
-#: ../src/ui.vala:1487
+#: ../src/app-window.vala:1286
 msgid "translator-credits"
 msgstr ""
+"Mingcong Bai <jeffbai@aosc.xyz>, 2017.\n"
+"\n"
 "Launchpad Contributions:\n"
 "  Alexey Kotlyarov https://launchpad.net/~koterpillar\n"
 "  Aron Xu https://launchpad.net/~happyaron\n"
@@ -565,197 +358,574 @@ msgstr ""
 "  zixue.liu https://launchpad.net/~zixue"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: ../src/app-window.vala:1308
 msgid "Save document before quitting?"
 msgstr "退出前保存文档？"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#. Text in dialog warning when a document is about to be lost
+#: ../src/app-window.vala:1310
 msgid "Quit without Saving"
 msgstr "退出且不保存"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: ../src/app-window.vala:1357
 msgid "You appear to have a Brother scanner."
 msgstr "您似乎有一个 Brother 扫描仪。"
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: ../src/app-window.vala:1359
 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>获得。"
+"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/app-window.vala:1363
 msgid "You appear to have a Samsung scanner."
 msgstr "您似乎有一个 Samsung 扫描仪。"
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: ../src/app-window.vala:1365
 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>获得。"
+"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/app-window.vala:1369
 msgid "You appear to have an HP scanner."
 msgstr "您似乎有一个 HP 扫描仪。"
 
 #. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: ../src/app-window.vala:1374
 msgid "You appear to have an Epson scanner."
 msgstr "您似乎有一个 Epson 扫描仪。"
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: ../src/app-window.vala:1376
 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>获得。"
+"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/app-window.vala:1380
 msgid "Install drivers"
 msgstr "安装驱动"
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: ../src/app-window.vala:1411
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "安装完成后，需要重新启动扫描易。"
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
-msgid "Installing drivers..."
-msgstr "安装驱动程序…"
+#: ../src/app-window.vala:1423
+msgid "Installing drivers…"
+msgstr "正在安装驱动程序…"
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: ../src/app-window.vala:1431
 msgid "Drivers installed successfully!"
 msgstr "成功安装驱动程序！"
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: ../src/app-window.vala:1441
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "无法安装驱动程序(错误码 %d)。"
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: ../src/app-window.vala:1447
 msgid "Failed to install drivers."
 msgstr "安装驱动失败。"
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: ../src/app-window.vala:1454
+#, c-format
+msgid "You need to install the %s package."
+msgid_plural "You need to install the %s packages."
+msgstr[0] "您需要安装 %s 软件包。"
+
+#. Set HeaderBar title here because Glade doesn't keep it translated
+#. https://bugzilla.gnome.org/show_bug.cgi?id=782753
+#. Title of scan window
+#: ../src/app-window.vala:1560
+msgid "Simple Scan"
+msgstr "扫描易"
+
+#: ../src/app-window.vala:1568 ../src/app-window.vala:1591
+msgid "Preferences"
+msgstr "首选项"
+
+#: ../src/app-window.vala:1572
+msgid "Keyboard Shortcuts"
+msgstr "键盘快捷键"
+
+#: ../src/app-window.vala:1573
+msgid "Help"
+msgstr "帮助"
+
+#: ../src/app-window.vala:1574
+msgid "About"
+msgstr "关于"
+
+#: ../src/app-window.vala:1575
+msgid "Quit"
+msgstr "退出"
+
+#: ../src/app-window.vala:1589
+msgid "Email"
+msgstr "电子邮件"
+
+#. Populate ActionBar (not supported in Glade)
+#. https://bugzilla.gnome.org/show_bug.cgi?id=769966
+#. Label on new document button
+#: ../src/app-window.vala:1599
+msgid "Start Again…"
+msgstr "重新扫描…"
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: ../src/app-window.vala:1616
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "左旋页面 (逆时针)"
+
+#. Tooltip for rotate right (clockwise) button
+#: ../src/app-window.vala:1623
+msgid "Rotate the page to the right (clockwise)"
+msgstr "右旋页面 (顺时针)"
+
+#. Tooltip for crop button
+#: ../src/app-window.vala:1633
+msgid "Crop the selected page"
+msgstr "裁剪选中的页面"
+
+#. Tooltip for delete button
+#: ../src/app-window.vala:1649
+msgid "Delete the selected page"
+msgstr "删除选中的页面"
+
+#. Text of button for cancelling save
+#: ../src/app-window.vala:1814
+msgid "Cancel"
+msgstr "取消"
+
+#: ../src/book.vala:331 ../src/book.vala:337
 #, c-format
-msgid "You need to install the %s package(s)."
-msgstr "您需要安装 %s 包。"
+msgid "Unable to encode page %i"
+msgstr "无法编码页面 %i"
+
+#. Combo box value for automatic paper size
+#: ../src/preferences-dialog.vala:77
+msgid "Automatic"
+msgstr "自动"
+
+#: ../src/preferences-dialog.vala:116
+msgid "Darker"
+msgstr "较深"
+
+#: ../src/preferences-dialog.vala:118
+msgid "Lighter"
+msgstr "稍浅"
+
+#: ../src/preferences-dialog.vala:126
+msgid "Less"
+msgstr "较少"
+
+#: ../src/preferences-dialog.vala:128
+msgid "More"
+msgstr "更多"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: ../src/preferences-dialog.vala:440
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (默认)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: ../src/preferences-dialog.vala:443
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (草稿)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: ../src/preferences-dialog.vala:446
 #, 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/preferences-dialog.vala:449
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1835
-msgid "New Document"
-msgstr "新文档"
+#. Error displayed when no scanners to scan with
+#: ../src/scanner.vala:844
+msgid "No scanners available.  Please connect a scanner."
+msgstr "没有可用的扫描仪。请连接一个扫描仪。"
 
-#: ../src/ui.vala:1840
-msgid "Document"
-msgstr "文档"
+#. Error displayed when cannot connect to scanner
+#: ../src/scanner.vala:874
+msgid "Unable to connect to scanner"
+msgstr "无法连接到扫描仪"
 
-#: ../src/ui.vala:1844
-msgid "Email..."
-msgstr "电子邮件..."
+#. Error display when unable to start scan
+#: ../src/scanner.vala:1227
+msgid "Unable to start scan"
+msgstr "无法开始扫描"
 
-#: ../src/ui.vala:1845
-msgid "Print..."
-msgstr "打印..."
+#. Error displayed when communication with scanner broken
+#: ../src/scanner.vala:1240 ../src/scanner.vala:1340
+msgid "Error communicating with scanner"
+msgstr "与扫描仪通信错误"
 
-#: ../src/ui.vala:1853
-msgid "Help"
-msgstr "帮助"
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "显示版本信息"
 
-#: ../src/ui.vala:1854
-msgid "About"
-msgstr "关于"
+#. Help string for command line --debug flag
+#: ../src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "显示调试信息"
 
-#: ../src/ui.vala:1855
-msgid "Quit"
-msgstr "退出"
+#: ../src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+msgstr "修复旧版扫描易生成的 PDF 文件"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
-msgid "Change _Scanner"
-msgstr "更换扫描仪(_S)"
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.vala:392
+msgid "Failed to scan"
+msgstr "扫描失败"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
-msgid "_Install Drivers"
-msgstr "安装驱动(_I)"
+#. Attempt to inhibit the screensaver when scanning
+#: ../src/simple-scan.vala:407
+msgid "Scan in progress"
+msgstr "正在扫描"
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
-msgid "Automatic"
-msgstr "自动"
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:584
+msgid "[DEVICE…] — Scanning utility"
+msgstr "[设备…] — 扫描工具"
 
-#: ../src/ui.vala:1947
-msgid "Darker"
-msgstr "较深"
+#. Text printed out when an unknown command-line argument provided
+#: ../src/simple-scan.vala:595
+#, c-format
+msgid "Run “%s --help” to see a full list of available command line options."
+msgstr "运行“%s --help”来查看可用命令行选项的完整列表。"
 
-#: ../src/ui.vala:1949
-msgid "Lighter"
-msgstr "稍浅"
+#~ msgid "Scan Documents"
+#~ msgstr "扫描文档"
 
-#: ../src/ui.vala:1957
-msgid "Less"
-msgstr "较少"
+#~ msgid ""
+#~ "A really easy way to scan both documents and photos. You can crop out the "
+#~ "bad parts of a photo and rotate it if it is the wrong way round. You can "
+#~ "print your scans, export them to pdf, or save them in a range of image "
+#~ "formats."
+#~ msgstr ""
+#~ "简单的文档和照片扫描软件。如果图片显示有误，您可以根据需要通过裁剪、旋转等"
+#~ "方式调整照片。您也可以打印扫描件、导出 PDF 格式、或者保存为图片。"
 
-#: ../src/ui.vala:1959
-msgid "More"
-msgstr "更多"
+#~ msgid ""
+#~ "Simple Scan uses the SANE framework to support most existing scanners."
+#~ msgstr "扫描易使用 SANE 框架支持大多数现有的扫描仪。"
 
-#: ../src/ui.vala:1967
-msgid "Minimum"
-msgstr "最小值"
+#~ msgid "Document Scanner"
+#~ msgstr "文档扫描仪"
 
-#: ../src/ui.vala:1969
-msgid "Maximum"
-msgstr "最大值"
+#~ msgid "scan;scanner;flatbed;adf;"
+#~ msgstr "scan;scanner;flatbed;adf;扫描;扫描仪;"
 
-#: ../src/ui.vala:2008
-msgid "Saving document..."
-msgstr "正在保存文档..."
+#~ msgid "scanner"
+#~ msgstr "扫描仪"
 
-#: ../src/ui.vala:2173
-#, c-format
-msgid "Saving page %d out of %d"
-msgstr "正在保存 %d/%d 页"
+#~ msgid "Single _Page"
+#~ msgstr "单页(_P)"
+
+#~ msgid "All Pages From _Feeder"
+#~ msgstr "传送来的所有页面(_F)"
+
+#~ msgid "_Multiple Pages From Flatbed"
+#~ msgstr "来自扫描床的多个页面(_M)"
+
+#~ msgid "Text"
+#~ msgstr "文本"
+
+#~ msgid "Photo"
+#~ msgstr "照片"
+
+#~ msgid "_Document"
+#~ msgstr "文档(_D)"
+
+#~ msgid "Sc_an"
+#~ msgstr "扫描(_A)"
+
+#~ msgid "_Stop Scan"
+#~ msgstr "停止扫描(_S)"
+
+#~ msgid "_Email"
+#~ msgstr "电子邮件(_E)"
+
+#~ msgid "_Page"
+#~ msgstr "页面(_P)"
+
+#~ msgid "Rotate _Left"
+#~ msgstr "向左旋转(_L)"
+
+#~ msgid "Rotate _Right"
+#~ msgstr "向右旋转(_R)"
+
+#~ msgid "_Crop"
+#~ msgstr "剪裁(_C)"
+
+#~ msgid "_None"
+#~ msgstr "无(_N)"
+
+#~ msgid "A_4"
+#~ msgstr "A_4"
+
+#~ msgid "A_5"
+#~ msgstr "A_5"
+
+#~ msgid "A_6"
+#~ msgstr "A_6"
+
+#~ msgid "_Letter"
+#~ msgstr "信件(_L)"
+
+#~ msgid "Le_gal"
+#~ msgstr "法定(_G)"
+
+#~ msgid "4×6"
+#~ msgstr "4×6"
+
+#~ msgid "_Custom"
+#~ msgstr "自定义(_C)"
+
+#~ msgid "_Rotate Crop"
+#~ msgstr "旋转剪裁(_R)"
+
+#~ msgid "Move Left"
+#~ msgstr "左移"
+
+#~ msgid "Move Right"
+#~ msgstr "右移"
+
+#~ msgid "_Help"
+#~ msgstr "帮助(_H)"
+
+#~ msgid "_Contents"
+#~ msgstr "内容(_C)"
+
+#~ msgid "Scan a single page from the scanner"
+#~ msgstr "从扫描仪扫描一个单页"
+
+#~ msgid "Scan"
+#~ msgstr "扫描"
+
+#~ msgid "Save document to a file"
+#~ msgstr "将文档保存为文件"
+
+#~ msgid "Save"
+#~ msgstr "保存"
+
+#~ msgid "Stop the current scan"
+#~ msgstr "停止当前扫描"
+
+#~ msgid "Stop"
+#~ msgstr "停止"
+
+#~ msgid "Searching for Scanners…"
+#~ msgstr "正在探测扫描仪…"
+
+#~ msgid "_Authorize"
+#~ msgstr "认证(_A)"
+
+#~ msgid "_Username for resource:"
+#~ msgstr "资源用户名(_U)："
+
+#~ msgid "_Password:"
+#~ msgstr "密码(_P)："
+
+#~ msgctxt "shortcut window"
+#~ msgid "Scanning"
+#~ msgstr "正在扫描"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Scan a single page"
+#~ msgstr "单页扫描"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Scan all pages from document feeder"
+#~ msgstr "扫描所有页面"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Scan continuously from a flatbed scanner"
+#~ msgstr "连续扫描平板扫描仪上的页面"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Stop scan in progress"
+#~ msgstr "中止正在进行的扫描"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Document Modification"
+#~ msgstr "修改文档"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Move page left"
+#~ msgstr "左移页面"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Move page right"
+#~ msgstr "右移页面"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Rotate page to the left (anti-clockwise)"
+#~ msgstr "逆时针旋转页面"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Rotate page to the right (clockwise)"
+#~ msgstr "顺时针旋转页面"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Delete page"
+#~ msgstr "删除页面"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Document Management"
+#~ msgstr "文档管理"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Start new document"
+#~ msgstr "创建新文档"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Save scanned document"
+#~ msgstr "保存已扫描的文档"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Email scanned document"
+#~ msgstr "使用电子邮件发送已扫描的文档"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Print scanned document"
+#~ msgstr "打印已扫描的文档"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Copy current page to clipboard"
+#~ msgstr "将当前页面复制到剪贴板"
+
+#~ msgid "_Scanner"
+#~ msgstr "扫描仪(_S)"
+
+#~ msgid "Scan Sides"
+#~ msgstr "扫描面"
+
+#~ msgid "Page Size"
+#~ msgstr "页面大小"
+
+#~ msgid "Front"
+#~ msgstr "正面"
+
+#~ msgid "Back"
+#~ msgstr "背面"
+
+#~ msgid "Both"
+#~ msgstr "双面"
+
+#~ msgid "Delay"
+#~ msgstr "延迟"
+
+#~ msgid "Multiple pages from flatbed"
+#~ msgstr "来自扫描床的多个页面"
+
+#~ msgid "3"
+#~ msgstr "3"
+
+#~ msgid "5"
+#~ msgstr "5"
+
+#~ msgid "7"
+#~ msgstr "7"
+
+#~ msgid "10"
+#~ msgstr "10"
+
+#~ msgid "15"
+#~ msgstr "15"
+
+#~ msgid "Seconds"
+#~ msgstr "秒"
+
+#~ msgid "Scanning"
+#~ msgstr "正在扫描"
+
+#~ msgid "_Text Resolution"
+#~ msgstr "文字分辨率(_T)"
+
+#~ msgid "_Photo Resolution"
+#~ msgstr "图像分辨率(_P)"
+
+#~ msgid "Brightness"
+#~ msgstr "亮度"
+
+#~ msgid "Contrast"
+#~ msgstr "对比度"
+
+#~ msgid "Quality"
+#~ msgstr "质量"
+
+#~ msgid "Front and Back"
+#~ msgstr "正面和背面"
+
+#~ msgid "New"
+#~ msgstr "新建"
+
+#~ msgid "Rotate Left"
+#~ msgstr "逆时针旋转"
+
+#~ msgid "Rotate Right"
+#~ msgstr "顺时针旋转"
+
+#~ msgid "Crop"
+#~ msgstr "剪裁"
+
+#~ msgid "Scan S_ource:"
+#~ msgstr "扫描来源(_O)："
+
+#~ msgid "New Document"
+#~ msgstr "新文档"
+
+#~ msgid "Document"
+#~ msgstr "文档"
+
+#~ msgid "Email..."
+#~ msgstr "电子邮件..."
+
+#~ msgid "Print..."
+#~ msgstr "打印..."
+
+#~ msgid "_Install Drivers"
+#~ msgstr "安装驱动(_I)"
+
+#~ msgid "Minimum"
+#~ msgstr "最小值"
+
+#~ msgid "Maximum"
+#~ msgstr "最大值"
+
+#~ msgid "Saving document..."
+#~ msgstr "正在保存文档..."
+
+#~ msgid "Saving page %d out of %d"
+#~ msgstr "正在保存 %d/%d 页"
 
 #~ msgid "4&#xD7;6"
 #~ msgstr "4&#xD7;6"
 
-#, c-format
 #~ msgid ""
 #~ "Usage:\n"
 #~ "  %s [DEVICE...] - Scanning utility"
@@ -769,7 +939,6 @@ msgstr "正在保存 %d/%d 页"
 #~ msgid "Files missing"
 #~ msgstr "文件丢失"
 
-#, c-format
 #~ msgid ""
 #~ "GTK+ Options:\n"
 #~ "  --class=CLASS                   Program class as used by the window "
@@ -789,27 +958,25 @@ msgstr "正在保存 %d/%d 页"
 #~ "  --gtk-module=MODULES  加载额外的 GTK+ 模块\n"
 #~ "  --g-fatal-warnings  将所有警告置为致命"
 
-#~ msgid "Device to scan from"
-#~ msgstr "扫描设备"
-
 #~ msgid "Direction of scan"
 #~ msgstr "扫描方向"
 
 #~ msgid ""
-#~ "The direction of the scanner across the scanned page. It can be one of the "
-#~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
-#~ msgstr "扫描仪扫描页面的方式。可以是如下几种：顶部到底部、底部到顶部、左边到右边，右边到左边"
-
-#~ msgid "Type of document being scanned"
-#~ msgstr "扫描文档的类型"
+#~ "The direction of the scanner across the scanned page. It can be one of "
+#~ "the following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-"
+#~ "left'"
+#~ msgstr ""
+#~ "扫描仪扫描页面的方式。可以是如下几种：顶部到底部、底部到顶部、左边到右边，"
+#~ "右边到左边"
 
 #~ msgid ""
 #~ "Type of document being scanned. 'text' for text documents, 'photo' for "
 #~ "photos. This setting decides on the scan resolution, colors and post-"
 #~ "processing."
-#~ msgstr "扫描文档的类型。“文本”适用于文本文档，“照片”适用于照片。这些设置将会决定扫描分辨率、色彩和预处理。"
+#~ msgstr ""
+#~ "扫描文档的类型。“文本”适用于文本文档，“照片”适用于照片。这些设置将会决定扫"
+#~ "描分辨率、色彩和预处理。"
 
-#, c-format
 #~ msgid ""
 #~ "Help Options:\n"
 #~ "  -d, --debug                     Print debugging messages\n"
@@ -831,27 +998,18 @@ msgstr "正在保存 %d/%d 页"
 #~ msgid "Select File _Type"
 #~ msgstr "选择文件类型(_T)"
 
-#~ msgid "Resolution for text scans"
-#~ msgstr "文本扫描分辨率"
-
-#~ msgid "Resolution for photo scans"
-#~ msgstr "照片扫描分辨率"
-
 #~ msgid "The resolution in dots-per-inch of the previously scanned image."
 #~ msgstr "上次扫描图片的分辨率 (点/英寸)。"
 
 #~ msgid "Resolution of last scanned image"
 #~ msgstr "上次扫描的图片分辨率"
 
-#~ msgid "The resolution in dots-per-inch to use when scanning text."
-#~ msgstr "上次扫描文档的分辨率 (点/英寸)。"
-
 #~ msgid "Height of scanned image in pixels"
 #~ msgstr "所扫描图像的的高度 (以像素计)"
 
 #~ msgid ""
-#~ "The width of scanned image in pixels. This value is updated to what the last "
-#~ "scanned page was."
+#~ "The width of scanned image in pixels. This value is updated to what the "
+#~ "last scanned page was."
 #~ msgstr "所扫描图像的宽度 (以像素计)。这是上次扫描的页面的值。"
 
 #~ msgid ""
@@ -859,79 +1017,19 @@ msgstr "正在保存 %d/%d 页"
 #~ "last scanned page was."
 #~ msgstr "所扫描图像的高度 (以像素计)。这是上次扫描的页面的值。"
 
-#~ msgid "SANE device to acquire images from."
-#~ msgstr "从 SANE 设备获取图像。"
-
-#~ msgid ""
-#~ "The directory to save files to. Defaults to the documents directory if unset."
-#~ msgstr "用于保存文件的文件夹。如果不设置，默认使用 文档 文件夹。"
-
-#~ msgid "Directory to save files to"
-#~ msgstr "保存文件的文件夹："
-
 #~ msgid "Window height in pixels"
 #~ msgstr "窗口高度 (像素)"
 
 #~ msgid "Window width in pixels"
 #~ msgstr "窗口宽度 (像素)"
 
-#~ msgid "The resolution in dots-per-inch to use when scanning photos."
-#~ msgstr "扫描照片时使用的分辨率 (点/英寸)。"
-
 #~ msgid "Width of scanned image in pixels"
 #~ msgstr "所扫描图像的宽度 (以像素计)。"
 
-#~ msgid "Scanned Document"
-#~ msgstr "扫描的文档"
-
 #~ msgid ""
-#~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+#~ "The page side to scan. It can be one of the following: 'both' 'front' "
+#~ "'back'"
 #~ msgstr "扫描纸张的哪面。可以是以下值：“正面” “背面” “均扫描”"
 
-#~ msgid ""
-#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
-#~ msgstr "纸张的宽度 (以 0.1mm 计，0 代表自动检查纸张)"
-
-#~ msgid "Page side to scan"
-#~ msgstr "扫描纸张的哪面"
-
-#~ msgid ""
-#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
-#~ msgstr "纸张的高度 (以 0.1mm 计，0 代表自动检查纸张)"
-
-#~ msgid "Height of paper in tenths of a mm"
-#~ msgstr "纸张的高度 (以 0.1mm 计)"
-
-#~ msgid "Width of paper in tenths of a mm"
-#~ msgstr "纸张的宽度 (以 0.1mm 计)"
-
-#~ msgid "The page side to scan."
-#~ msgstr "要扫描的页面。"
-
-#~ msgid ""
-#~ "Type of document being scanned. This setting decides on the scan resolution, "
-#~ "colors and post-processing."
-#~ msgstr "要扫描的文件类型。此设置将决定扫描的分辨率、色彩和预处理。"
-
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "扫描仪相对于被扫描页面的方向。"
-
-#~ msgid "Quality value to use for JPEG compression."
-#~ msgstr "JPEG 压缩质量"
-
-#~ msgid "Contrast of scan"
-#~ msgstr "扫描对比度"
-
-#~ msgid "Brightness of scan"
-#~ msgstr "扫描亮度"
-
-#~ msgid "Quality value to use for JPEG compression"
-#~ msgstr "JPEG 压缩质量"
-
-#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
-#~ msgstr "从 -100 到 100 的对比度调节（0 为不作调节）"
-
-#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
-#~ msgstr "从 -100 到 100 的亮度调节（0 为不作调节）"
diff --git a/po/zh_HK.gmo b/po/zh_HK.gmo
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..5b08c60 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -7,296 +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"
+"POT-Creation-Date: 2017-04-16 08:54-0400\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"
+"Language: zh_HK\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-25 06:10+0000\n"
+"X-Generator: Launchpad (build 18361)\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: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 "文件(_D)"
 
 #. Scan menu item
-#: data/simple-scan.ui:260
+#: src/simple-scan.ui:266
 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:279 src/simple-scan.ui:1343 src/simple-scan.ui:1402
 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:289 src/simple-scan.ui:1352 src/simple-scan.ui:1411
 msgid "All Pages From _Feeder"
 msgstr "來自進紙匣的所有頁面(_F)"
 
+#. 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 "停止掃描(_S)"
 
-#: 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
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: 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 "電子郵件(_E)"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/simple-scan.ui:436
 msgid "_Page"
 msgstr "頁面(_P)"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/simple-scan.ui:446
 msgid "Rotate _Left"
 msgstr "向左旋轉(_L)"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/simple-scan.ui:456
 msgid "Rotate _Right"
 msgstr "向右旋轉(_R)"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/simple-scan.ui:466
 msgid "_Crop"
 msgstr "裁切(_C)"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/simple-scan.ui:476
 msgid "_None"
 msgstr "無(_N)"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/simple-scan.ui:487
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/simple-scan.ui:498
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/simple-scan.ui:509
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/simple-scan.ui:520
 msgid "_Letter"
 msgstr "美規信紙(_Letter)"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/simple-scan.ui:531
 msgid "Le_gal"
 msgstr "美規長信紙(Le_gal)"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/simple-scan.ui:542
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/simple-scan.ui:553
 msgid "_Custom"
 msgstr "自訂(_C)"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/simple-scan.ui:571
 msgid "_Rotate Crop"
 msgstr "旋轉裁切區域(_R)"
 
 #. 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 "求助(_H)"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/simple-scan.ui:638
 msgid "_Contents"
 msgstr "內容(_C)"
 
 #. 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 "將文件儲存到檔案"
 
-#: ../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 "裁切"
 
-#: ../src/ui.vala:1849
+#. Title of preferences dialog
+#: 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 "掃描來源(_O)："
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1079
+#: src/simple-scan.ui:1085
 msgid "_Text Resolution:"
 msgstr "文字解像度(_T)："
 
 #. Label beside scan source combo box
-#: data/simple-scan.ui:1095
+#: src/simple-scan.ui:1101
 msgid "_Photo Resolution:"
 msgstr "相片解像度(_P)："
 
 #. 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 "掃描文件"
 
@@ -308,7 +322,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 +331,207 @@ 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:844
 msgid "No scanners available.  Please connect a scanner."
 msgstr "沒有可用的掃描器。請連接一部掃描器。"
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:874
 msgid "Unable to connect to scanner"
 msgstr "無法連接到掃描器"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1227
 msgid "Unable to start scan"
 msgstr "無法起始掃描"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: 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
+#: 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:332 src/ui.vala:1655 src/ui.vala:1935
 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:341
 #, 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:389
 msgid "No scanners detected"
 msgstr "未偵測到掃描器"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/ui.vala:391
 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:396
 msgid "Additional software needed"
 msgstr "需要額外軟件"
 
 #. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:398
 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: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 "取消(_C)"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:514 src/ui.vala:724
 msgid "_Save"
 msgstr "儲存(_S)"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:522
 msgid "Scanned Document.pdf"
 msgstr "已掃描的文件.pdf"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:528
 msgid "Image Files"
 msgstr "影像檔案"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:534
 msgid "All Files"
 msgstr "所有檔案"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:543
 msgid "PDF (multi-page document)"
 msgstr "PDF (多頁文件)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:549
 msgid "JPEG (compressed)"
 msgstr "JPEG (壓縮)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/ui.vala:555
 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: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:650
+#: src/ui.vala:698
 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:721
 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:763
 msgid "Save current document?"
 msgstr "是否儲存至目前文件？"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:765
 msgid "Discard Changes"
 msgstr "放棄變更"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:1056
 msgid "Unable to save image for preview"
 msgstr "無法儲存影像以供預覽"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1068
 msgid "Unable to open image preview application"
 msgstr "無法開啟影像預覽應用程式"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1270
 msgid "Combine sides"
 msgstr "合併邊緣"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1280
 msgid "Combine sides (reverse)"
 msgstr "合併邊緣 (反轉)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1290
 msgid "Reverse"
 msgstr "反轉"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1300
 msgid "Keep unchanged"
 msgstr "維持不變"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1504
 msgid "Unable to open help file"
 msgstr "無法開啟求助檔案。"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: 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"
@@ -529,16 +554,16 @@ msgstr ""
 "你應已收到附隨於本程式的GNU通用公共授權的副本；如果沒有，請參照 <http://www.gnu.org/licenses/>。"
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1528
 msgid "About Simple Scan"
 msgstr "關於簡易掃描"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1531
 msgid "Simple document scanning tool"
 msgstr "簡易文件掃描工具"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1540
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -548,22 +573,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:1562
 msgid "Save document before quitting?"
 msgstr "在結束前要儲存文件嗎？"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1564
 msgid "Quit without Saving"
 msgstr "直接退出而不儲存"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1632
 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:1634
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
@@ -571,12 +596,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:1638
 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:1640
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
@@ -584,155 +609,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:1644
 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:1649
 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:1651
 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:1655
 msgid "Install drivers"
 msgstr "安裝驅動程式"
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1686
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "一旦安裝，你將需要重新啟動簡易掃描。"
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1698
 msgid "Installing drivers..."
 msgstr "正在安裝驅動程式..."
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1706
 msgid "Drivers installed successfully!"
 msgstr "成功安裝驅動程式！"
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1716
 #, 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:1722
 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:1729
 #, 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:1833
 #, 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:1836
 #, 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:1839
 #, 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:1842
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../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 "退出"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1937
 msgid "Change _Scanner"
 msgstr "變更掃描器(_S)"
 
 #. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1939
 msgid "_Install Drivers"
 msgstr "安裝驅動程式(_I)"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: 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 "正在儲存 %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..5510e40 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6,507 +6,509 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-07-29 12:47+1200\n"
-"PO-Revision-Date: 2016-02-14 11:17+0000\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
+"product=simple-scan&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-08-13 21:51+0000\n"
+"PO-Revision-Date: 2017-08-24 13:23+0800\n"
 "Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
 "Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
+"Language: zh_TW\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-25 06:10+0000\n"
+"X-Generator: Poedit 1.8.13\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#. Button to submit authorization dialog
-#: data/simple-scan.ui:24
-msgid "_Authorize"
-msgstr "授權(_A)"
+#: data/org.gnome.SimpleScan.gschema.xml:11
+msgid "Device to scan from"
+msgstr "要從哪個裝置掃描"
 
-#. Label beside username entry
-#: data/simple-scan.ui:102
-msgid "_Username for resource:"
-msgstr "資源的使用者名稱(_U)："
+#: data/org.gnome.SimpleScan.gschema.xml:12
+msgid "SANE device to acquire images from."
+msgstr "取得影像用的 SANE 裝置。"
 
-#. Label beside password entry
-#: data/simple-scan.ui:117
-msgid "_Password:"
-msgstr "密碼(_P)："
+#: data/org.gnome.SimpleScan.gschema.xml:20
+msgid "Type of document being scanned"
+msgstr "掃描中文件的類型"
 
-#. Combo box label for scanning both sides of a page
-#: data/simple-scan.ui:188
-msgid "Front and Back"
-msgstr "正面與背面"
+#: data/org.gnome.SimpleScan.gschema.xml:21
+msgid ""
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+msgstr "掃描中文件的類型。這個設定值決定掃描的解析度、色彩、後製處理。"
 
-#. Combo box label for scanning the front side of a page
-#: data/simple-scan.ui:192
-msgid "Front"
-msgstr "正面"
+#: data/org.gnome.SimpleScan.gschema.xml:25
+msgid "Width of paper in tenths of a mm"
+msgstr "以 0.1 mm 為單位的紙張寬度"
 
-#. Combo box label for scanning the back side of a page
-#: data/simple-scan.ui:196
-msgid "Back"
-msgstr "背面"
+#: data/org.gnome.SimpleScan.gschema.xml:26
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr "以 0.1 mm 為單位的紙張寬度 (或 0 以作為自動紙張偵測)。"
+
+#: data/org.gnome.SimpleScan.gschema.xml:30
+msgid "Height of paper in tenths of a mm"
+msgstr "以 0.1 mm 為單位的紙張高度"
+
+#: data/org.gnome.SimpleScan.gschema.xml:31
+msgid ""
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr "以 0.1 mm 為單位的紙張高度 (或 0 以作為自動紙張偵測)。"
+
+#: data/org.gnome.SimpleScan.gschema.xml:35
+msgid "Brightness of scan"
+msgstr "掃描亮度"
+
+#: data/org.gnome.SimpleScan.gschema.xml:36
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr "調整亮度，由 -100 至 100 (0 代表無)。"
+
+#: data/org.gnome.SimpleScan.gschema.xml:40
+msgid "Contrast of scan"
+msgstr "掃描反差"
+
+#: data/org.gnome.SimpleScan.gschema.xml:41
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr "調整反差，由 -100 至 100 (0 代表無)。"
+
+#: data/org.gnome.SimpleScan.gschema.xml:45
+msgid "Resolution for text scans"
+msgstr "文字掃描的解析度"
+
+#: data/org.gnome.SimpleScan.gschema.xml:46
+msgid "The resolution in dots-per-inch to use when scanning text."
+msgstr "當掃描文字時使用的解析度，單位為 dpi。"
+
+#: data/org.gnome.SimpleScan.gschema.xml:50
+msgid "Resolution for photo scans"
+msgstr "相片掃描的解析度"
+
+#: data/org.gnome.SimpleScan.gschema.xml:51
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr "當掃描相片時使用的解析度，單位為 dpi。"
+
+#: data/org.gnome.SimpleScan.gschema.xml:55
+msgid "Page side to scan"
+msgstr "要掃描的頁面"
+
+#: data/org.gnome.SimpleScan.gschema.xml:56
+msgid "The page side to scan."
+msgstr "要掃描的頁面。"
+
+#: data/org.gnome.SimpleScan.gschema.xml:60
+msgid "Directory to save files to"
+msgstr "儲存檔案的目錄"
+
+#: data/org.gnome.SimpleScan.gschema.xml:61
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr "儲存檔案到何目錄。如果沒有預設值的話，設值會是「文件」目錄。"
+
+#: data/org.gnome.SimpleScan.gschema.xml:66
+msgid "Quality value to use for JPEG compression"
+msgstr "JPEG 壓縮品質"
+
+#: data/org.gnome.SimpleScan.gschema.xml:67
+msgid "Quality value to use for JPEG compression."
+msgstr "JPEG 壓縮品質。"
+
+#: data/org.gnome.SimpleScan.gschema.xml:72
+msgid "Delay in millisecond between pages"
+msgstr "每頁之間的延遲毫秒"
+
+#: data/org.gnome.SimpleScan.gschema.xml:73
+msgid "Delay in millisecond between pages."
+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
+#. Set HeaderBar title here because Glade doesn't keep it translated
+#. https://bugzilla.gnome.org/show_bug.cgi?id=782753
+#. Title of scan window
+#: data/simple-scan.appdata.xml.in:6 data/simple-scan.desktop.in:3
+#: src/app-window.ui:76 src/app-window.vala:1560
 msgid "Simple Scan"
-msgstr "掃描易"
+msgstr "簡易掃描"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
-#: data/simple-scan.ui:241
-msgid "_Document"
-msgstr "文件(_D)"
+#: data/simple-scan.appdata.xml.in:7 data/simple-scan.desktop.in:5
+msgid "Scan Documents"
+msgstr "掃描文件"
 
-#. Scan menu item
-#: data/simple-scan.ui:260
-msgid "Sc_an"
-msgstr "掃描(_A)"
+#: 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 "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+"您能輕易地掃描文件和相片。您可以裁剪相片的不良部分並將之旋轉至正確角度。您可"
+"以列印您的掃描檔，將掃描檔匯出成 pdf，或儲存為多種圖像檔案格式。"
+
+#: data/simple-scan.appdata.xml.in:14
+msgid "Simple Scan uses the SANE framework to support most existing scanners."
+msgstr "簡易掃描使用 SANE 框架以支援大部分現存掃描器。"
 
+#: data/simple-scan.desktop.in:4
+msgid "Document Scanner"
+msgstr "文件掃描"
+
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: data/simple-scan.desktop.in:7
+msgid "scan;scanner;flatbed;adf;"
+msgstr "scan;scanner;flatbed;adf;"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: data/simple-scan.desktop.in:10
+msgid "scanner"
+msgstr "scanner"
+
+#. Toolbar scan menu item to scan a single page from the scanner
 #. 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/app-window.ui:22 src/app-window.ui:123 src/app-window.ui:820
 msgid "Single _Page"
 msgstr "單一頁面(_P)"
 
+#. Toolbar scan menu item to scan all pages from a document feeder
 #. 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/app-window.ui:31 src/app-window.ui:133 src/app-window.ui:829
 msgid "All Pages From _Feeder"
-msgstr "來自進紙匣的所有頁面(_F)"
+msgstr "從饋紙器掃描所有頁面(_F)"
 
-#. Menu entry to stop current scan
-#: data/simple-scan.ui:294
-msgid "_Stop Scan"
-msgstr "停止掃描(_S)"
+#. Toolbar scan menu item to scan continuously from the flatbed
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/app-window.ui:40 src/app-window.ui:143 src/app-window.ui:838
+msgid "_Multiple Pages From Flatbed"
+msgstr "從平臺多頁掃描(_M)"
 
-#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
+#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:853
 msgid "Text"
 msgstr "文字"
 
-#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
+#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:863
 msgid "Photo"
 msgstr "相片"
 
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: src/app-window.ui:91
+msgid "_Document"
+msgstr "文件(_D)"
+
+#. Scan menu item
+#: src/app-window.ui:110
+msgid "Sc_an"
+msgstr "掃描(_A)"
+
+#. Menu entry to stop current scan
+#: src/app-window.ui:154
+msgid "_Stop Scan"
+msgstr "停止掃描(_S)"
+
+#. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../src/ui.vala:1183 ../src/ui.vala:1841
+#: src/app-window.ui:196 src/app-window.vala:967 src/app-window.vala:1590
 msgid "Reorder Pages"
 msgstr "重新排列頁面"
 
 #. Label on email menu item
-#: data/simple-scan.ui:367
+#: src/app-window.ui:215
 msgid "_Email"
 msgstr "電子郵件(_E)"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: data/simple-scan.ui:430
+#: src/app-window.ui:280
 msgid "_Page"
 msgstr "頁面(_P)"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: data/simple-scan.ui:440
+#: src/app-window.ui:290
 msgid "Rotate _Left"
 msgstr "向左旋轉(_L)"
 
 #. Menu item to rotate page to right (clockwise)
-#: data/simple-scan.ui:450
+#: src/app-window.ui:300
 msgid "Rotate _Right"
 msgstr "向右旋轉(_R)"
 
 #. Label for page crop submenu
-#: data/simple-scan.ui:460
+#: src/app-window.ui:310
 msgid "_Crop"
 msgstr "裁切(_C)"
 
 #. Radio button for no crop
-#: data/simple-scan.ui:470
+#: src/app-window.ui:320
 msgid "_None"
 msgstr "無(_N)"
 
 #. Radio button for cropping page to A4 size
-#: data/simple-scan.ui:481
+#: src/app-window.ui:331
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: data/simple-scan.ui:492
+#: src/app-window.ui:342
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: data/simple-scan.ui:503
+#: src/app-window.ui:353
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: data/simple-scan.ui:514
+#: src/app-window.ui:364
 msgid "_Letter"
 msgstr "美規信紙(_Letter)"
 
 #. Radio button for cropping to page to US legal size
-#: data/simple-scan.ui:525
+#: src/app-window.ui:375
 msgid "Le_gal"
 msgstr "美規長信紙(Le_gal)"
 
 #. Radio button for cropping page to 4x6 inch
-#: data/simple-scan.ui:536
+#: src/app-window.ui:386
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: data/simple-scan.ui:547
+#: src/app-window.ui:397
 msgid "_Custom"
 msgstr "自訂(_C)"
 
 #. Menu item to rotate the crop area
-#: data/simple-scan.ui:565
+#: src/app-window.ui:415
 msgid "_Rotate Crop"
 msgstr "旋轉裁切區域(_R)"
 
 #. Menu item to move the selected page to the left
-#: data/simple-scan.ui:578
+#: src/app-window.ui:428
 msgid "Move Left"
 msgstr "左移"
 
 #. Menu item to move the selected page to the right
-#: data/simple-scan.ui:587
+#: src/app-window.ui:437
 msgid "Move Right"
 msgstr "右移"
 
 #. Label on help menu
-#: data/simple-scan.ui:624
+#: src/app-window.ui:474
 msgid "_Help"
 msgstr "幫助(_H)"
 
 #. Help|Contents menu
-#: data/simple-scan.ui:632
+#: src/app-window.ui:482
 msgid "_Contents"
 msgstr "內容(_C)"
 
-#. Tooltip for new document button
-#: data/simple-scan.ui:674 data/simple-scan.ui:885
-msgid "Start a new document"
-msgstr "起始一份新文件"
-
-#: data/simple-scan.ui:675
-msgid "New"
-msgstr "新增"
-
 #. Tooltip for scan toolbar button
-#: data/simple-scan.ui:689 data/simple-scan.ui:836
+#: src/app-window.ui:520 src/app-window.ui:720
 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/app-window.ui:522 src/app-window.ui:716
 msgid "Scan"
 msgstr "掃描"
 
 #. Tooltip for save toolbar button
-#: data/simple-scan.ui:707 data/simple-scan.ui:864
+#: src/app-window.ui:538 src/app-window.ui:787
 msgid "Save document to a file"
 msgstr "將文件儲存至檔案"
 
-#: ../src/ui.vala:1842
+#: src/app-window.ui:540
 msgid "Save"
 msgstr "儲存"
 
 #. Tooltip for stop button
-#: data/simple-scan.ui:724 data/simple-scan.ui:824
+#: src/app-window.ui:555 src/app-window.ui:700
 msgid "Stop the current scan"
 msgstr "停止目前的掃描"
 
-#: data/simple-scan.ui:725 data/simple-scan.ui:825
+#: src/app-window.ui:556 src/app-window.ui:697
 msgid "Stop"
 msgstr "停止"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: data/simple-scan.ui:749 data/simple-scan.ui:936
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "將頁面向左旋轉 (逆時針方向)"
+#. Label shown when searching for scanners
+#: src/app-window.ui:611
+msgid "Searching for Scanners…"
+msgstr "正在搜尋掃描器…"
 
-#. Label on rotate page left (anti-clockwise) item
-#: data/simple-scan.ui:750
-msgid "Rotate Left"
-msgstr "向左旋轉"
-
-#. Tooltip for rotate right (clockwise) button
-#: data/simple-scan.ui:764 data/simple-scan.ui:914
-msgid "Rotate the page to the right (clockwise)"
-msgstr "將頁面向右旋轉 (順時針方向)"
-
-#. Label on rotate page right (clockwise) item
-#: data/simple-scan.ui:765
-msgid "Rotate Right"
-msgstr "向右旋轉"
-
-#: data/simple-scan.ui:779 data/simple-scan.ui:963
-msgid "Crop the selected page"
-msgstr "裁切所選的頁面"
-
-#: data/simple-scan.ui:781
-msgid "Crop"
-msgstr "裁切"
-
-#: ../src/ui.vala:1849
-msgid "Preferences"
-msgstr "偏好設定"
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1048
-msgid "Scan S_ource:"
-msgstr "掃描來源(_O)："
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1079
-msgid "_Text Resolution:"
-msgstr "文字解析度(_T)："
-
-#. Label beside scan source combo box
-#: data/simple-scan.ui:1095
-msgid "_Photo Resolution:"
-msgstr "相片解析度(_P)："
-
-#. Label beside scan side combo box
-#: data/simple-scan.ui:1139
-msgid "Scan Side:"
-msgstr "掃描面："
-
-#. Label beside page size combo box
-#: data/simple-scan.ui:1169
-msgid "Page Size:"
-msgstr "頁面大小："
-
-#. Label beside brightness scale
-#: data/simple-scan.ui:1199
-msgid "Brightness:"
-msgstr "亮度："
-
-#. Label beside contrast scale
-#: data/simple-scan.ui:1229
-msgid "Contrast:"
-msgstr "反差："
-
-#. Label beside quality scale
-#: data/simple-scan.ui:1260
-msgid "Quality:"
-msgstr "品質："
-
-#: data/simple-scan.desktop.in:4
-msgid "Document Scanner"
-msgstr "文件掃描"
-
-#: data/simple-scan.desktop.in:5
-msgid "Scan Documents"
-msgstr "掃描文件"
+#: src/app-window.vala:237 src/app-window.vala:1380
+msgid "_Close"
+msgstr "關閉(_C)"
 
-#: data/simple-scan.desktop.in:6
-msgid "scan;scanner;flatbed;adf;"
-msgstr "scan;scanner;flatbed;adf;"
+#. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
+#: src/app-window.vala:246
+#, c-format
+msgid "Username and password required to access “%s”"
+msgstr "若要存取「%s」則必須提供使用者名稱與密碼"
 
-#: data/simple-scan.desktop.in:8
-msgid "scanner"
-msgstr ""
+#. Label shown when detected a scanner
+#: src/app-window.vala:266 src/app-window.vala:584
+msgid "Ready to Scan"
+msgstr "準備掃描"
 
-#: data/simple-scan.appdata.xml.in:8
-msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
-msgstr ""
-"您能輕易地掃描文件和相片。您可以裁剪相片的不良部分並將之旋轉至正確角度。您可以列印您的掃描檔，將掃描檔匯出成 pdf，或儲存為多種圖像檔案格式。"
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: src/app-window.vala:273
+msgid "Additional software needed"
+msgstr "需要額外軟體"
 
-#: data/simple-scan.appdata.xml.in:13
+#. Instructions to install driver software
+#: src/app-window.vala:275
 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
-msgid "No scanners available.  Please connect a scanner."
-msgstr "沒有可用的掃描器。請連接一部掃描器。"
-
-#. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
-msgid "Unable to connect to scanner"
-msgstr "無法連接到掃描器"
-
-#. Error display when unable to start scan
-#: ../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
-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 "列印除錯訊息"
-
-#: ../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
-msgid "Failed to scan"
-msgstr "掃描失敗"
-
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
-msgid "[DEVICE...] - Scanning utility"
-msgstr "[裝置...] - 掃描公用程式"
-
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
-#, c-format
-msgid "Run '%s --help' to see a full list of available command line options."
-msgstr "執行「%s --help」來查看所有命令列可用選項的完整清單。"
-
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
-msgid "_Close"
-msgstr "關閉(_C)"
-
-#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:327
-#, c-format
-msgid "Username and password required to access '%s'"
-msgstr "要存取「%s」需要提供使用者名稱與密碼"
+"You need to <a href=\"install-firmware\">install driver software</a> for "
+"your scanner."
+msgstr "您需要為您的掃描器<a href=\"install-firmware\">安裝驅動程式</a>。"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:375
+#: src/app-window.vala:281
 msgid "No scanners detected"
 msgstr "沒有偵測到掃描器"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: src/app-window.vala:283
 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
-msgid "Additional software needed"
-msgstr "需要額外軟體"
-
-#. Instructions to install driver software
-#: ../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
-msgid "Save As..."
-msgstr "另存為..."
+#: src/app-window.vala:298
+msgid "Save As…"
+msgstr "另存為…"
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/app-window.vala:301 src/app-window.vala:471 src/app-window.vala:552
 msgid "_Cancel"
 msgstr "取消(_C)"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/app-window.vala:302 src/app-window.vala:553
 msgid "_Save"
 msgstr "儲存(_S)"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/app-window.vala:310
 msgid "Scanned Document.pdf"
 msgstr "掃描的文件.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#. Save dialog: Filter name to show only supported image files
+#: src/app-window.vala:316
 msgid "Image Files"
 msgstr "影像檔"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/app-window.vala:326
 msgid "All Files"
 msgstr "所有檔案"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/app-window.vala:335
 msgid "PDF (multi-page document)"
-msgstr "PDF (多頁文件)"
+msgstr "PDF（多頁文件）"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/app-window.vala:341
 msgid "JPEG (compressed)"
-msgstr "JPEG (壓縮)"
+msgstr "JPEG（壓縮）"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: src/app-window.vala:347
 msgid "PNG (lossless)"
-msgstr "PNG (無損)"
+msgstr "PNG（無損）"
+
+#. Save dialog: Label for sabing in WEBP format
+#: src/app-window.vala:354
+msgid "WebP (compressed)"
+msgstr "WebP（壓縮）"
 
-#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:557
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
+#: src/app-window.vala:364
 msgid "File format:"
 msgstr "檔案格式："
 
+#. Label in save dialog beside compression slider
+#: src/app-window.vala:376
+msgid "Compression:"
+msgstr "壓縮："
+
+#. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
+#: src/app-window.vala:470
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr "「%s」檔名已經存在。您是否希望取代該檔案？"
+
+#. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
+#: src/app-window.vala:473
+msgid "_Replace"
+msgstr "取代(_R)"
+
+#: src/app-window.vala:512
+msgid "Saving"
+msgstr "儲存"
+
 #. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: src/app-window.vala:527
 msgid "Failed to save file"
 msgstr "儲存檔案失敗"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:673
-msgid "If you don't save, changes will be permanently lost."
-msgstr "如果您不儲存，變更將會永久消失。"
+#: src/app-window.vala:550
+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/app-window.vala:591
 msgid "Save current document?"
 msgstr "是否儲存目前文件？"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/app-window.vala:593
 msgid "Discard Changes"
 msgstr "放棄變更"
 
+#. Label shown when scan started
+#: src/app-window.vala:692
+msgid "Contacting scanner…"
+msgstr "正在聯絡掃描器…"
+
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/app-window.vala:800
 msgid "Unable to save image for preview"
 msgstr "無法儲存影像以供預覽"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/app-window.vala:812
 msgid "Unable to open image preview application"
 msgstr "無法開啟影像預覽應用程式"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/app-window.vala:990
 msgid "Combine sides"
 msgstr "合併邊緣"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/app-window.vala:1000
 msgid "Combine sides (reverse)"
 msgstr "合併邊緣 (相反次序)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/app-window.vala:1010
 msgid "Reverse"
 msgstr "反轉"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/app-window.vala:1020
 msgid "Keep unchanged"
 msgstr "維持不變"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/app-window.vala:1250
 msgid "Unable to open help file"
 msgstr "無法開啟幫助文件檔案"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: src/app-window.vala:1271
 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"
@@ -521,24 +523,27 @@ 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 ""
-"本程式為自由軟體；您可依據自由軟體基金會所發表的 GNU "
-"通用公眾授權條款，對本程式再次發佈和/或修改；無論您依據的是本授權的第三版，或（依您的選擇而定）任何較新的版本。\n"
+"本程式為自由軟體；您可依據自由軟體基金會所發表的 GNU 通用公眾授權條款，對本程"
+"式再次發佈和/或修改；無論您依據的是本授權的第三版，或（依您的選擇而定）任何較"
+"新的版本。\n"
 "\n"
-"本程式發佈的目的是希望它有用，然而沒有任何保證；亦無對適售性或特定目的適用性所為的暗示性保證。詳情請參照 GNU 通用公眾授權。\n"
+"本程式發佈的目的是希望它有用，然而沒有任何保證；亦無對適售性或特定目的適用性"
+"所為的暗示性保證。詳情請參照 GNU 通用公眾授權。\n"
 "\n"
-"您應已收到附隨於本程式的 GNU 通用公眾授權的副本；如果沒有，請參照 <http://www.gnu.org/licenses/>。"
+"您應已收到附隨於本程式的 GNU 通用公眾授權的副本；如果沒有，請參照 <http://"
+"www.gnu.org/licenses/>。"
 
 #. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/app-window.vala:1274
 msgid "About Simple Scan"
-msgstr "關於「簡易掃描」"
+msgstr "關於《簡易掃描》"
 
 #. Description of program
-#: ../src/ui.vala:1478
+#: src/app-window.vala:1277
 msgid "Simple document scanning tool"
 msgstr "簡易文件掃描工具"
 
-#: ../src/ui.vala:1487
+#: src/app-window.vala:1286
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -552,228 +557,523 @@ msgstr ""
 "  tomoe_musashi https://launchpad.net/~musashi"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1509
+#: src/app-window.vala:1308
 msgid "Save document before quitting?"
 msgstr "在結束前要儲存文件嗎？"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#. Text in dialog warning when a document is about to be lost
+#: src/app-window.vala:1310
 msgid "Quit without Saving"
 msgstr "直接退出而不儲存"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/app-window.vala:1357
 msgid "You appear to have a Brother scanner."
 msgstr "您似乎有一台 Brother 掃描器。"
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/app-window.vala:1359
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://support.brother.com\">Brother website</a>."
+"Drivers for this are available on the <a href=\"http://support.brother.com"
+"\">Brother website</a>."
 msgstr ""
-"您可以在這裡找到這台掃描器的驅動程式：<a href=\"http://support.brother.com\">Brother 網站</a>。"
+"您可以在這裡找到這台掃描器的驅動程式：<a href=\"http://support.brother.com"
+"\">Brother 網站</a>。"
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/app-window.vala:1363
 msgid "You appear to have a Samsung scanner."
 msgstr "您似乎有一台 Samsung 掃描器。"
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/app-window.vala:1365
 msgid ""
-"Drivers for this are available on the <a "
-"href=\"http://samsung.com/support\">Samsung website</a>."
+"Drivers for this are available on the <a href=\"http://samsung.com/support"
+"\">Samsung website</a>."
 msgstr ""
-"您可以在這裡找到這台掃描器的驅動程式：<a href=\"http://samsung.com/support\">Samsung 網站</a>。"
+"您可以在這裡找到這台掃描器的驅動程式：<a href=\"http://samsung.com/support"
+"\">Samsung 網站</a>。"
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/app-window.vala:1369
 msgid "You appear to have an HP scanner."
 msgstr "您似乎有一台 HP 掃描器。"
 
 #. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/app-window.vala:1374
 msgid "You appear to have an Epson scanner."
 msgstr "您似乎有一台 Epson 掃描器。"
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/app-window.vala:1376
 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> 上找到。"
+"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/app-window.vala:1380
 msgid "Install drivers"
 msgstr "安裝驅動程式"
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/app-window.vala:1411
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "一旦安裝，您將需要重新啟動簡易掃描。"
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1645
-msgid "Installing drivers..."
+#: src/app-window.vala:1423
+msgid "Installing drivers…"
 msgstr "正在安裝驅動程式..."
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/app-window.vala:1431
 msgid "Drivers installed successfully!"
 msgstr "成功安裝驅動程式！"
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/app-window.vala:1441
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "驅動程式安裝失敗 (錯誤碼 %d)。"
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/app-window.vala:1447
 msgid "Failed to install drivers."
 msgstr "驅動程式安裝失敗。"
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/app-window.vala:1454
 #, c-format
-msgid "You need to install the %s package(s)."
-msgstr "要先安裝 %s 套件。"
+msgid "You need to install the %s package."
+msgid_plural "You need to install the %s packages."
+msgstr[0] "您得先安裝 %s 軟體包。"
+
+#. Title of preferences dialog
+#: src/app-window.vala:1568 src/app-window.vala:1591
+#: src/preferences-dialog.ui:53
+msgid "Preferences"
+msgstr "偏好設定"
+
+#: src/app-window.vala:1572
+msgid "Keyboard Shortcuts"
+msgstr "鍵盤捷徑鍵"
+
+#: src/app-window.vala:1573
+msgid "Help"
+msgstr "求助"
+
+#: src/app-window.vala:1574
+msgid "About"
+msgstr "關於"
+
+#: src/app-window.vala:1575
+msgid "Quit"
+msgstr "結束"
+
+#: src/app-window.vala:1589
+msgid "Email"
+msgstr "電子郵件"
+
+#. Populate ActionBar (not supported in Glade)
+#. https://bugzilla.gnome.org/show_bug.cgi?id=769966
+#. Label on new document button
+#: src/app-window.vala:1599
+msgid "Start Again…"
+msgstr "再次開始…"
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: src/app-window.vala:1616
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "將頁面向左旋轉 (逆時針方向)"
+
+#. Tooltip for rotate right (clockwise) button
+#: src/app-window.vala:1623
+msgid "Rotate the page to the right (clockwise)"
+msgstr "將頁面向右旋轉 (順時針方向)"
+
+#. Tooltip for crop button
+#: src/app-window.vala:1633
+msgid "Crop the selected page"
+msgstr "裁切所選的頁面"
+
+#. Tooltip for delete button
+#: src/app-window.vala:1649
+msgid "Delete the selected page"
+msgstr "刪除所選頁面"
+
+#. Text of button for cancelling save
+#: src/app-window.vala:1814
+msgid "Cancel"
+msgstr "取消"
+
+#. Button to submit authorization dialog
+#: src/authorize-dialog.ui:25
+msgid "_Authorize"
+msgstr "授權(_A)"
+
+#. Label beside username entry
+#: src/authorize-dialog.ui:99
+msgid "_Username for resource:"
+msgstr "資源的使用者名稱(_U)："
+
+#. Label beside password entry
+#: src/authorize-dialog.ui:112
+msgid "_Password:"
+msgstr "密碼(_P)："
+
+#: src/book.vala:331 src/book.vala:337
+#, c-format
+msgid "Unable to encode page %i"
+msgstr "無法編碼頁面 %i"
+
+#: src/help-overlay.ui:12
+msgctxt "shortcut window"
+msgid "Scanning"
+msgstr "掃描"
+
+#: src/help-overlay.ui:17
+msgctxt "shortcut window"
+msgid "Scan a single page"
+msgstr "掃描單一頁面"
+
+#: src/help-overlay.ui:24
+msgctxt "shortcut window"
+msgid "Scan all pages from document feeder"
+msgstr "從饋紙器掃描所有頁面"
+
+#: src/help-overlay.ui:31
+msgctxt "shortcut window"
+msgid "Scan continuously from a flatbed scanner"
+msgstr "從平臺式掃描器連續掃描"
+
+#: src/help-overlay.ui:38
+msgctxt "shortcut window"
+msgid "Stop scan in progress"
+msgstr "停止進行中的掃描"
+
+#: src/help-overlay.ui:46
+msgctxt "shortcut window"
+msgid "Document Modification"
+msgstr "文件修改"
+
+#: src/help-overlay.ui:51
+msgctxt "shortcut window"
+msgid "Move page left"
+msgstr "頁面左移"
+
+#: src/help-overlay.ui:58
+msgctxt "shortcut window"
+msgid "Move page right"
+msgstr "頁面右移"
+
+#: src/help-overlay.ui:65
+msgctxt "shortcut window"
+msgid "Rotate page to the left (anti-clockwise)"
+msgstr "將頁面向左旋轉（逆時針方向）"
+
+#: src/help-overlay.ui:72
+msgctxt "shortcut window"
+msgid "Rotate page to the right (clockwise)"
+msgstr "將頁面向右旋轉（順時針方向）"
+
+#: src/help-overlay.ui:79
+msgctxt "shortcut window"
+msgid "Delete page"
+msgstr "刪除頁面裁切所選的頁面"
+
+#: src/help-overlay.ui:87
+msgctxt "shortcut window"
+msgid "Document Management"
+msgstr "文件管理"
+
+#: src/help-overlay.ui:92
+msgctxt "shortcut window"
+msgid "Start new document"
+msgstr "起始新文件"
+
+#: src/help-overlay.ui:99
+msgctxt "shortcut window"
+msgid "Save scanned document"
+msgstr "儲存掃描的文件"
+
+#: src/help-overlay.ui:106
+msgctxt "shortcut window"
+msgid "Email scanned document"
+msgstr "寄送掃描的文件"
+
+#: src/help-overlay.ui:113
+msgctxt "shortcut window"
+msgid "Print scanned document"
+msgstr "列印掃描的文件"
+
+#: src/help-overlay.ui:120
+msgctxt "shortcut window"
+msgid "Copy current page to clipboard"
+msgstr "複製目前頁面到剪貼簿中"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:113
+msgid "_Scanner"
+msgstr "掃描器(_S)"
+
+#. Label beside scan side combo box
+#: src/preferences-dialog.ui:143
+msgid "Scan Sides"
+msgstr "掃描面"
+
+#. Label beside page size combo box
+#: src/preferences-dialog.ui:160
+msgid "Page Size"
+msgstr "頁面大小"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:191
+msgid "Front"
+msgstr "正面"
+
+#. Preferences Dialog: Toggle button to select scanning on the back side of a page
+#: src/preferences-dialog.ui:206
+msgid "Back"
+msgstr "背面"
+
+#. Preferences Dialog: Toggle button to select scanning on both sides of a page
+#: src/preferences-dialog.ui:221
+msgid "Both"
+msgstr "雙面"
+
+#. Label beside page delay scale
+#: src/preferences-dialog.ui:260
+msgid "Delay"
+msgstr "延遲"
+
+#. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
+#: src/preferences-dialog.ui:276
+msgid "Multiple pages from flatbed"
+msgstr "從平臺多頁掃描"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:295
+msgid "3"
+msgstr "3"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:310
+msgid "5"
+msgstr "5"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:326
+msgid "7"
+msgstr "7"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:342
+msgid "10"
+msgstr "10"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:358
+msgid "15"
+msgstr "15"
+
+#. Label after page delay radio buttons
+#: src/preferences-dialog.ui:385
+msgid "Seconds"
+msgstr "秒"
+
+#. Preferences Dialog: Tab label for scanning settings
+#: src/preferences-dialog.ui:413
+msgid "Scanning"
+msgstr "掃描"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:436
+msgid "_Text Resolution"
+msgstr "文字解析度(_T)"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:452
+msgid "_Photo Resolution"
+msgstr "相片解析度(_P)"
+
+#. Label beside brightness scale
+#: src/preferences-dialog.ui:505
+msgid "Brightness"
+msgstr "亮度"
+
+#. Label beside contrast scale
+#: src/preferences-dialog.ui:521
+msgid "Contrast"
+msgstr "對比"
+
+#. Preferences Dialog: Tab for quality settings
+#: src/preferences-dialog.ui:576
+msgid "Quality"
+msgstr "品質"
+
+#. Combo box value for automatic paper size
+#: src/preferences-dialog.vala:77
+msgid "Automatic"
+msgstr "自動"
+
+#: src/preferences-dialog.vala:116
+msgid "Darker"
+msgstr "較深"
+
+#: src/preferences-dialog.vala:118
+msgid "Lighter"
+msgstr "較淺"
+
+#: src/preferences-dialog.vala:126
+msgid "Less"
+msgstr "少"
+
+#: src/preferences-dialog.vala:128
+msgid "More"
+msgstr "多"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: src/preferences-dialog.vala:440
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (預設)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1787
+#: src/preferences-dialog.vala:443
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (草稿)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1790
+#: src/preferences-dialog.vala:446
 #, 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/preferences-dialog.vala:449
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1835
-msgid "New Document"
-msgstr "新文件"
+#. Error displayed when no scanners to scan with
+#: src/scanner.vala:844
+msgid "No scanners available.  Please connect a scanner."
+msgstr "沒有可用的掃描器。請連接一部掃描器。"
 
-#: ../src/ui.vala:1840
-msgid "Document"
-msgstr "文件"
+#. Error displayed when cannot connect to scanner
+#: src/scanner.vala:874
+msgid "Unable to connect to scanner"
+msgstr "無法連接到掃描器"
 
-#: ../src/ui.vala:1844
-msgid "Email..."
-msgstr "電子郵件..."
+#. Error display when unable to start scan
+#: src/scanner.vala:1227
+msgid "Unable to start scan"
+msgstr "無法起始掃描"
 
-#: ../src/ui.vala:1845
-msgid "Print..."
-msgstr "列印..."
+#. Error displayed when communication with scanner broken
+#: src/scanner.vala:1240 src/scanner.vala:1340
+msgid "Error communicating with scanner"
+msgstr "與掃描器溝通時發生錯誤"
 
-#: ../src/ui.vala:1853
-msgid "Help"
-msgstr "求助"
+#. Help string for command line --version flag
+#: src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "顯示發行版本"
 
-#: ../src/ui.vala:1854
-msgid "About"
-msgstr "關於"
+#. Help string for command line --debug flag
+#: src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "列印除錯訊息"
 
-#: ../src/ui.vala:1855
-msgid "Quit"
-msgstr "結束"
+#: src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+msgstr "修正由舊版本簡易掃描產生的 PDF 檔案"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
-msgid "Change _Scanner"
-msgstr "變更掃描器(_S)"
+#. Title of error dialog when scan failed
+#: src/simple-scan.vala:392
+msgid "Failed to scan"
+msgstr "掃描失敗"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
-msgid "_Install Drivers"
-msgstr "安裝驅動程式(_I)"
+#. Attempt to inhibit the screensaver when scanning
+#: src/simple-scan.vala:407
+msgid "Scan in progress"
+msgstr "掃描進行中"
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
-msgid "Automatic"
-msgstr "自動"
+#. Arguments and description for --help text
+#: src/simple-scan.vala:584
+msgid "[DEVICE…] — Scanning utility"
+msgstr "[裝置...] — 掃描公用程式"
 
-#: ../src/ui.vala:1947
-msgid "Darker"
-msgstr "較深"
+#. Text printed out when an unknown command-line argument provided
+#: src/simple-scan.vala:595
+#, c-format
+msgid "Run “%s --help” to see a full list of available command line options."
+msgstr "執行「%s --help」來查看所有命令列可用選項的完整清單。"
 
-#: ../src/ui.vala:1949
-msgid "Lighter"
-msgstr "較淺"
+#~ msgid "Front and Back"
+#~ msgstr "正面與背面"
 
-#: ../src/ui.vala:1957
-msgid "Less"
-msgstr "少"
+#~ msgid "New"
+#~ msgstr "新增"
 
-#: ../src/ui.vala:1959
-msgid "More"
-msgstr "多"
+#~ msgid "Rotate Left"
+#~ msgstr "向左旋轉"
 
-#: ../src/ui.vala:1967
-msgid "Minimum"
-msgstr "最小"
+#~ msgid "Rotate Right"
+#~ msgstr "向右旋轉"
 
-#: ../src/ui.vala:1969
-msgid "Maximum"
-msgstr "最大"
+#~ msgid "Crop"
+#~ msgstr "裁切"
 
-#: ../src/ui.vala:2008
-msgid "Saving document..."
-msgstr "正在儲存文件..."
+#~ msgid "Scan S_ource:"
+#~ msgstr "掃描來源(_O)："
 
-#: ../src/ui.vala:2173
-#, c-format
-msgid "Saving page %d out of %d"
-msgstr "正在儲存 %2$d 頁中的第 %1$d 頁"
+#~ msgid "New Document"
+#~ msgstr "新文件"
+
+#~ msgid "Document"
+#~ msgstr "文件"
+
+#~ msgid "Email..."
+#~ msgstr "電子郵件..."
+
+#~ msgid "Print..."
+#~ msgstr "列印..."
+
+#~ msgid "_Install Drivers"
+#~ msgstr "安裝驅動程式(_I)"
+
+#~ msgid "Minimum"
+#~ msgstr "最小"
+
+#~ msgid "Maximum"
+#~ msgstr "最大"
+
+#~ msgid "Saving document..."
+#~ msgstr "正在儲存文件..."
+
+#~ msgid "Saving page %d out of %d"
+#~ msgstr "正在儲存 %2$d 頁中的第 %1$d 頁"
 
 #~ msgid "4&#xD7;6"
 #~ msgstr "4&#xD7;6"
 
-#~ msgid "Device to scan from"
-#~ msgstr "要從哪個裝置掃描"
-
 #~ msgid "Direction of scan"
 #~ msgstr "掃描的方向"
 
-#~ msgid "Resolution for text scans"
-#~ msgstr "文字掃描的解析度"
-
-#~ msgid "Resolution for photo scans"
-#~ msgstr "相片掃描的解析度"
-
 #~ msgid "Resolution of last scanned image"
 #~ msgstr "上次掃描影像的解析度"
 
-#~ msgid "Directory to save files to"
-#~ msgstr "儲存檔案的目錄"
-
-#~ msgid "Type of document being scanned"
-#~ msgstr "掃描中文件的類型"
-
 #~ msgid "Window height in pixels"
 #~ msgstr "視窗高度，單位為像素"
 
 #~ msgid "Window width in pixels"
 #~ msgstr "視窗寬度，單位為像素"
 
-#~ msgid "Scanned Document"
-#~ msgstr "掃描的文件"
-
 #~ msgid "Select File _Type"
 #~ msgstr "選取檔案類型(_T)"
 
@@ -783,25 +1083,17 @@ msgstr "正在儲存 %2$d 頁中的第 %1$d 頁"
 #~ msgid "The resolution in dots-per-inch of the previously scanned image."
 #~ msgstr "之前掃描的影像其解析度，單位為 dpi。"
 
-#~ msgid "The resolution in dots-per-inch to use when scanning text."
-#~ msgstr "當掃描文字時使用的解析度，單位為 dpi。"
-
-#~ msgid "The resolution in dots-per-inch to use when scanning photos."
-#~ msgstr "當掃描相片時使用的解析度，單位為 dpi。"
-
 #~ msgid ""
 #~ "Type of document being scanned. 'text' for text documents, 'photo' for "
 #~ "photos. This setting decides on the scan resolution, colors and post-"
 #~ "processing."
-#~ msgstr "掃描中文件的類型。「文字」表示文字型文件，「相片」表示相片型文件。此設定值會決定掃描解析度、色彩，以及後製處理。"
-
-#~ msgid "SANE device to acquire images from."
-#~ msgstr "取得影像用的 SANE 裝置。"
+#~ msgstr ""
+#~ "掃描中文件的類型。「文字」表示文字型文件，「相片」表示相片型文件。此設定值"
+#~ "會決定掃描解析度、色彩，以及後製處理。"
 
 #~ msgid "TRUE if the application window is maximized"
 #~ msgstr "如果應用程式視窗最大化時為 TRUE"
 
-#, c-format
 #~ msgid ""
 #~ "Help Options:\n"
 #~ "  -d, --debug                     Print debugging messages\n"
@@ -817,7 +1109,6 @@ msgstr "正在儲存 %2$d 頁中的第 %1$d 頁"
 #~ "  --help-all 顯示所有求助選項\n"
 #~ "  --help-gtk 顯示 GTK+ 選項"
 
-#, c-format
 #~ msgid ""
 #~ "Usage:\n"
 #~ "  %s [DEVICE...] - Scanning utility"
@@ -825,7 +1116,6 @@ msgstr "正在儲存 %2$d 頁中的第 %1$d 頁"
 #~ "用法：\n"
 #~ "  %s [裝置...] - 掃瞄工具"
 
-#, c-format
 #~ msgid ""
 #~ "GTK+ Options:\n"
 #~ "  --class=CLASS                   Program class as used by the window "
@@ -851,78 +1141,35 @@ msgstr "正在儲存 %2$d 頁中的第 %1$d 頁"
 #~ msgid ""
 #~ "The height of scanned image in pixels. This value is updated to what the "
 #~ "last scanned page was."
-#~ msgstr "掃描影像的高度，單位為像素。此數值會根據最近一次掃描頁面的情況更新。"
+#~ msgstr ""
+#~ "掃描影像的高度，單位為像素。此數值會根據最近一次掃描頁面的情況更新。"
 
 #~ msgid ""
-#~ "The width of scanned image in pixels. This value is updated to what the last "
-#~ "scanned page was."
+#~ "The width of scanned image in pixels. This value is updated to what the "
+#~ "last scanned page was."
 #~ msgstr "掃描影像的寬度，單位為像素。此值會根據最近一次掃描頁面的情況更新。"
 
 #~ msgid "Width of scanned image in pixels"
 #~ msgstr "掃描影像的寬度，單位為像素"
 
 #~ msgid ""
-#~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
-#~ msgstr "要掃描的頁面。它可以是下列之一：「both」(兩者)、「front」(正面)、「back」(背面)"
-
-#~ msgid "Page side to scan"
-#~ msgstr "要掃描的頁面"
+#~ "The page side to scan. It can be one of the following: 'both' 'front' "
+#~ "'back'"
+#~ msgstr ""
+#~ "要掃描的頁面。它可以是下列之一：「both」(兩者)、「front」(正面)、「back」"
+#~ "(背面)"
 
 #~ msgid ""
-#~ "The direction of the scanner across the scanned page. It can be one of the "
-#~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+#~ "The direction of the scanner across the scanned page. It can be one of "
+#~ "the following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-"
+#~ "left'"
 #~ msgstr ""
-#~ "掃描器橫越掃描頁面的方向。它可以是下列之一：「top-to-bottom」(頂端到底部)、「bottom-to-top」(底部到頂端)、「left-to-"
-#~ "right」(左到右)、「right-to-left」(右到左)"
-
-#~ msgid "The page side to scan."
-#~ msgstr "要掃描的頁面。"
+#~ "掃描器橫越掃描頁面的方向。它可以是下列之一：「top-to-bottom」(頂端到底"
+#~ "部)、「bottom-to-top」(底部到頂端)、「left-to-right」(左到右)、「right-to-"
+#~ "left」(右到左)"
 
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "掃描器跨越掃描頁面的方向。"
 
-#~ msgid ""
-#~ "Type of document being scanned. This setting decides on the scan resolution, "
-#~ "colors and post-processing."
-#~ msgstr "掃描中文件的類型。這個設定值決定掃描的解析度、色彩、後製處理。"
-
-#~ msgid "Height of paper in tenths of a mm"
-#~ msgstr "以 0.1 mm 為單位的紙張高度"
-
-#~ msgid ""
-#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
-#~ msgstr "以 0.1 mm 為單位的紙張寬度 (或 0 以作為自動紙張偵測)。"
-
-#~ msgid ""
-#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
-#~ "detection)."
-#~ msgstr "以 0.1 mm 為單位的紙張高度 (或 0 以作為自動紙張偵測)。"
-
-#~ msgid "Width of paper in tenths of a mm"
-#~ msgstr "以 0.1 mm 為單位的紙張寬度"
-
 #~ msgid "Files missing"
 #~ msgstr "缺少檔案"
-
-#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
-#~ msgstr "調整反差，由 -100 至 100 (0 代表無)。"
-
-#~ msgid "Contrast of scan"
-#~ msgstr "掃描反差"
-
-#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
-#~ msgstr "調整亮度，由 -100 至 100 (0 代表無)。"
-
-#~ msgid "Brightness of scan"
-#~ msgstr "掃描亮度"
-
-#~ msgid ""
-#~ "The directory to save files to. Defaults to the documents directory if unset."
-#~ msgstr "儲存檔案到何目錄。如果沒有預設值的話，設值會是「文件」目錄。"
-
-#~ msgid "Quality value to use for JPEG compression."
-#~ msgstr "JPEG 壓縮品質。"
-
-#~ msgid "Quality value to use for JPEG compression"
-#~ msgstr "JPEG 壓縮品質"